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

Merge pull request #23 from lategoodbye/master

Browse Source 
Bugfix XML 1.0 conformity
This commit is contained in:
Robert Johansson 2012-09-22 19:51:48 -07:00
commit 923858eaee
2 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
mbus/mbus-protocol.c
View File

@ -9,6 +9,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#include <assert.h> #include <assert.h>
#include <ctype.h>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -865,6 +866,15 @@ mbus_data_product_name(mbus_data_variable_header *header)
break; break;
} }
} }
else if (manufacturer == MBUS_VARIABLE_DATA_MAN_SEN)
{
switch (header->version)
{
case 0x19:
strcpy(buff,"Sensus PolluCom E");
break;
}
}
else if (manufacturer == MBUS_VARIABLE_DATA_MAN_SPX) else if (manufacturer == MBUS_VARIABLE_DATA_MAN_SPX)
{ {
switch (header->version) switch (header->version)
@ -3227,23 +3237,31 @@ mbus_str_xml_encode(u_char *dst, const u_char *src, size_t max_len)
break; break;
} }
switch (src[i]) if (iscntrl(src[i]))
{ {
case '&': // convert all control chars into spaces
len += snprintf(&dst[len], max_len - len, "&amp;"); dst[len++] = ' ';
break; }
case '<': else
len += snprintf(&dst[len], max_len - len, "&lt;"); {
break; switch (src[i])
case '>': {
len += snprintf(&dst[len], max_len - len, "&gt;"); case '&':
break; len += snprintf(&dst[len], max_len - len, "&amp;");
case '"': break;
len += snprintf(&dst[len], max_len - len, "&quot;"); case '<':
break; len += snprintf(&dst[len], max_len - len, "&lt;");
default: break;
dst[len++] = src[i]; case '>':
break; len += snprintf(&dst[len], max_len - len, "&gt;");
break;
case '"':
len += snprintf(&dst[len], max_len - len, "&quot;");
break;
default:
dst[len++] = src[i];
break;
}
} }
i++; i++;

1
mbus/mbus-protocol.h
View File

@ -484,6 +484,7 @@ typedef struct _mbus_data_secondary_address {
#define MBUS_VARIABLE_DATA_MAN_NZR 0x3B52 #define MBUS_VARIABLE_DATA_MAN_NZR 0x3B52
#define MBUS_VARIABLE_DATA_MAN_PAD 0x4024 #define MBUS_VARIABLE_DATA_MAN_PAD 0x4024
#define MBUS_VARIABLE_DATA_MAN_QDS 0x4493 #define MBUS_VARIABLE_DATA_MAN_QDS 0x4493
#define MBUS_VARIABLE_DATA_MAN_SEN 0x4CAE
#define MBUS_VARIABLE_DATA_MAN_SLB 0x4D82 #define MBUS_VARIABLE_DATA_MAN_SLB 0x4D82
#define MBUS_VARIABLE_DATA_MAN_SON 0x4DEE #define MBUS_VARIABLE_DATA_MAN_SON 0x4DEE
#define MBUS_VARIABLE_DATA_MAN_SPX 0x4E18 #define MBUS_VARIABLE_DATA_MAN_SPX 0x4E18