wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30 from lategoodbye/master

Browse Source 
Context options, improved hex convertion, clean up
This commit is contained in:
Robert Johansson 2012-12-17 03:23:56 -08:00
commit 6f2986ee79
17 changed files with 153 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/mbus-serial-request-data-multi-reply.c
View File

@ -8,10 +8,6 @@
//
//------------------------------------------------------------------------------
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>

4
bin/mbus-serial-request-data.c
View File

@ -8,10 +8,6 @@
//
//------------------------------------------------------------------------------
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>

6
bin/mbus-serial-scan-secondary.c
View File

@ -8,10 +8,6 @@
//
//------------------------------------------------------------------------------
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>
@ -90,7 +86,7 @@ main(int argc, char **argv)
device = argv[3];
addr_mask = strdup("FFFFFFFFFFFFFFFF");
}
else if (argc == 5 && strcmp(argv[1], "-d") == 0)
else if (argc == 5 && strcmp(argv[1], "-d") == 0 && strcmp(argv[2], "-b") == 0)
{
baudrate = atoi(argv[3]);
device = argv[4];

4
bin/mbus-serial-scan.c
View File

@ -8,10 +8,6 @@
//
//------------------------------------------------------------------------------
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>

4
bin/mbus-serial-select-secondary.c
View File

@ -8,10 +8,6 @@
//
//------------------------------------------------------------------------------
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>

4
bin/mbus-serial-switch-baudrate.c
View File

@ -11,10 +11,6 @@
//
//------------------------------------------------------------------------------
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>

44
bin/mbus-tcp-raw-send.c
View File

@ -8,10 +8,6 @@
//
//------------------------------------------------------------------------------
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>
@ -30,8 +26,10 @@ main(int argc, char **argv)
mbus_handle *handle = NULL;
char *host, *addr_str, matching_addr[16], *file = NULL;
int port, address, fd, len, i, result;
u_char raw_buff[4096], buff[4096], *ptr, *endptr;
int port, address, result;
FILE *fp = NULL;
size_t buff_len, len;
u_char raw_buff[4096], buff[4096];
memset((void *)&reply, 0, sizeof(mbus_frame));
memset((void *)&reply_data, 0, sizeof(mbus_frame_data));
@ -88,7 +86,7 @@ main(int argc, char **argv)
if (mbus_connect(handle) == -1)
{
fprintf(stderr, "Failed to setup connection to M-bus gateway\n");
fprintf(stderr, "Failed to setup connection to M-bus gateway\n%s\n", mbus_error_str());
return 1;
}
@ -127,41 +125,35 @@ main(int argc, char **argv)
//
if (file != NULL)
{
if ((fd = open(file, O_RDONLY, 0)) == -1)
if ((fp = fopen(file, "r")) == NULL)
{
fprintf(stderr, "%s: failed to open '%s'\n", __PRETTY_FUNCTION__, file);
fprintf(stderr, "%s: failed to open '%s'\n", __PRETTY_FUNCTION__, file);
return 1;
}
}
else
{
fd = 0; // stdin
fp = stdin;
}
memset(raw_buff, 0, sizeof(raw_buff));
len = read(fd, raw_buff, sizeof(raw_buff));
close(fd);
memset(raw_buff, 0, sizeof(raw_buff));
len = fread(raw_buff, 1, sizeof(raw_buff), fp);
ptr = 0;
endptr = raw_buff;
for (i = 0; i < sizeof(buff)-1; i++)
if (fp != stdin)
{
ptr = endptr;
buff[i] = (u_char)strtol(ptr, (char **)&endptr, 16);
// abort at non hex value
if (ptr == endptr)
break;
fclose(fp);
}
buff_len = mbus_hex2bin(buff,sizeof(buff),raw_buff,sizeof(raw_buff));
//
// attempt to parse the input data
//
result = mbus_parse(&request, buff, i);
result = mbus_parse(&request, buff, buff_len);
if (result < 0)
{
fprintf(stderr, "mbus_parse: %s\n", mbus_error_str());
if (result < 0)
{
fprintf(stderr, "mbus_parse: %s\n", mbus_error_str());
return 1;
}
else if (result > 0)

4
bin/mbus-tcp-request-data-multi-reply.c
View File

@ -8,10 +8,6 @@
//
//------------------------------------------------------------------------------
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>

4
bin/mbus-tcp-request-data.c
View File

@ -8,10 +8,6 @@
//
//------------------------------------------------------------------------------
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>

4
bin/mbus-tcp-scan-secondary.c
View File

@ -8,10 +8,6 @@
//
//------------------------------------------------------------------------------
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>

4
bin/mbus-tcp-scan.c
View File

@ -8,10 +8,6 @@
//
//------------------------------------------------------------------------------
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>

4
bin/mbus-tcp-select-secondary.c
View File

@ -8,10 +8,6 @@
//
//------------------------------------------------------------------------------
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>

80
mbus/mbus-protocol-aux.c
View File

@ -17,6 +17,7 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include <math.h>
#define MBUS_ERROR(...) fprintf (stderr, __VA_ARGS__)
@ -1484,6 +1485,38 @@ mbus_disconnect(mbus_handle * handle)
return handle->close(handle);
}
int
mbus_context_set_option(mbus_handle * handle, mbus_context_option option, long value)
{
if (handle == NULL)
{
MBUS_ERROR("%s: Invalid M-Bus handle to set option.\n", __PRETTY_FUNCTION__);
return -1;
}
switch (option)
{
case MBUS_OPTION_MAX_RETRY:
if ((value >= 0) && (value <= 9))
{
handle->max_retry = value;
return 0;
}
break;
case MBUS_OPTION_PURGE_FIRST_FRAME:
if ((value == MBUS_FRAME_PURGE_NONE) ||
(value == MBUS_FRAME_PURGE_M2S) ||
(value == MBUS_FRAME_PURGE_S2M))
{
handle->purge_first_frame = value;
return 0;
}
break;
}
return -1; // unable to set option
}
int
mbus_recv_frame(mbus_handle * handle, mbus_frame *frame)
{
@ -2152,3 +2185,50 @@ mbus_scan_2nd_address_range(mbus_handle * handle, int pos, char *addr_mask)
free(mask);
return 0;
}
//------------------------------------------------------------------------------
// Convert a buffer with hex values into a buffer with binary values.
// - invalid character stops convertion
// - whitespaces will be ignored
//------------------------------------------------------------------------------
size_t
mbus_hex2bin(u_char * dst, size_t dst_len, const u_char * src, size_t src_len)
{
size_t i, result = 0;
unsigned long val;
u_char *ptr, *end, buf[3];
if (!src || !dst)
{
return 0;
}
memset(buf, 0, sizeof(buf));
memset(dst, 0, dst_len);
for (i = 0; i+1 < src_len; i++)
{
// ignore whitespace
if (isspace(src[i]))
continue;
buf[0] = src[i];
buf[1] = src[++i];
end = buf;
ptr = end;
val = strtoul(ptr, (char **)&end, 16);
// abort at non hex value
if (ptr == end)
break;
// abort at end of buffer
if (result >= dst_len)
break;
dst[result++] = (u_char) val;
}
return result;
}

34
mbus/mbus-protocol-aux.h
View File

@ -24,6 +24,8 @@
* or
* mbus_handle = mbus_context_tcp(host, port);
*
* mbus_context_set_option(mbus_handle,option,value); // optional
*
* mbus_connect(mbus_handle);
*
* ...
@ -140,6 +142,15 @@ typedef struct _mbus_record {
char *quantity; /**< Quantity type (e.g. Energy) */
} mbus_record;
/**
* MBus handle option type
*/
enum _mbus_context_option {
MBUS_OPTION_MAX_RETRY,
MBUS_OPTION_PURGE_FIRST_FRAME
};
typedef enum _mbus_context_option mbus_context_option;
/**
* Event callback functions
@ -198,6 +209,17 @@ int mbus_connect(mbus_handle * handle);
*/
int mbus_disconnect(mbus_handle * handle);
/**
* Set option of a M-Bus context.
*
* @param handle Initialized handle
* @param option option to set
* @param value value to set
*
* @return Zero when successful.
*/
int mbus_context_set_option(mbus_handle * handle, mbus_context_option option, long value);
/**
* Receives a frame using "unified" handle
*
@ -437,6 +459,18 @@ char * mbus_frame_data_xml_normalized(mbus_frame_data *data);
*/
int mbus_scan_2nd_address_range(mbus_handle * handle, int pos, char *addr_mask);
/**
* Convert a buffer with hex values into a buffer with binary values.
*
* @param dst destination buffer with binary values
* @param dst_len byte count of destination buffer
* @param src source buffer with hex values
* @param src_len byte count of source buffer
*
* @return byte count of successful converted values
*/
size_t mbus_hex2bin(u_char * dst, size_t dst_len, const u_char * src, size_t src_len);
#ifdef __cplusplus
}
#endif

1
mbus/mbus-protocol.h
View File

@ -19,7 +19,6 @@
#define _MBUS_PROTOCOL_H_
#include <stdlib.h>
#include <sys/types.h>
#include <time.h>
#ifdef __cplusplus

19
test/mbus_parse.c
View File

@ -8,23 +8,17 @@
//
//------------------------------------------------------------------------------
#include <sys/types.h>
#include <err.h>
#include <fcntl.h>
#include <stdio.h>
#include <termios.h>
#include <unistd.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <mbus/mbus-protocol.h>
int
main(int argc, char *argv[])
{
int fd, len;
FILE *fp = NULL;
size_t buff_len, len;
u_char buf[1024];
mbus_frame reply;
mbus_frame_data frame_data;
@ -36,16 +30,15 @@ main(int argc, char *argv[])
return 1;
}
if ((fd = open(argv[1], O_RDONLY, 0)) == -1)
if ((fp = fopen(argv[1], "r")) == NULL)
{
fprintf(stderr, "%s: failed to open '%s'", argv[0], argv[1]);
fprintf(stderr, "%s: failed to open '%s'\n", argv[0], argv[1]);
return 1;
}
memset(buf, 0, sizeof(buf));
len = read(fd, buf, sizeof(buf));
close(fd);
len = fread(buf, 1, sizeof(buf), fp);
fclose(fp);
memset(&reply, 0, sizeof(reply));
memset(&frame_data, 0, sizeof(frame_data));

46
test/mbus_parse_hex.c
View File

@ -8,24 +8,19 @@
//
//------------------------------------------------------------------------------
#include <sys/types.h>
#include <err.h>
#include <fcntl.h>
#include <stdio.h>
#include <termios.h>
#include <unistd.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <mbus/mbus-protocol.h>
int
main(int argc, char *argv[])
{
int fd, len, i, result;
u_char raw_buff[4096], buff[4096], *ptr, *endptr;
FILE *fp = NULL;
size_t buff_len, len;
int result;
u_char raw_buff[4096], buff[4096];
mbus_frame reply;
mbus_frame_data frame_data;
char *xml_result = NULL;
@ -35,38 +30,25 @@ main(int argc, char *argv[])
fprintf(stderr, "usage: %s hex-file\n", argv[0]);
return 1;
}
if ((fd = open(argv[1], O_RDONLY, 0)) == -1)
if ((fp = fopen(argv[1], "r")) == NULL)
{
fprintf(stderr, "%s: failed to open '%s'", argv[0], argv[1]);
fprintf(stderr, "%s: failed to open '%s'\n", argv[0], argv[1]);
return 1;
}
memset(raw_buff, 0, sizeof(raw_buff));
len = read(fd, raw_buff, sizeof(raw_buff));
close(fd);
i = 0;
ptr = 0;
endptr = raw_buff;
while (i < sizeof(buff)-1)
{
ptr = endptr;
buff[i] = (u_char)strtol(ptr, (char **)&endptr, 16);
// abort at non hex value
if (ptr == endptr)
break;
i++;
}
memset(raw_buff, 0, sizeof(raw_buff));
len = fread(raw_buff, 1, sizeof(raw_buff), fp);
fclose(fp);
buff_len = mbus_hex2bin(buff,sizeof(buff),raw_buff,sizeof(raw_buff));
memset(&reply, 0, sizeof(reply));
memset(&frame_data, 0, sizeof(frame_data));
//mbus_parse_set_debug(1);
result = mbus_parse(&reply, buff, i);
result = mbus_parse(&reply, buff, buff_len);
if (result < 0)
{