dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrected the tag decoding, and the string encoding.

Browse Source
This commit is contained in:
skarg
2004-11-17 16:22:29 +00:00
parent 0fb6ba8871
commit f7fa9d525c
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/bacdcode.c
+14 -9
View File
@@ -200,7 +200,7 @@ int decode_tag_value(uint8_t * apdu, uint32_t * value)
} long_data; } long_data;
// the value is large // the value is large
if ((apdu[0] & 5) == 5) { if ((apdu[0] & 0x07) == 5) {
// offset if there is an extended tag number // offset if there is an extended tag number
if ((apdu[0] & 0xF0) == 0xF0) if ((apdu[0] & 0xF0) == 0xF0)
len++; len++;
@@ -236,8 +236,9 @@ int decode_tag_value(uint8_t * apdu, uint32_t * value)
len++; len++;
} }
} else } else {
*value = (int) (apdu[0] & 5); *value = apdu[0] & 0x07;
}
return len; return len;
} }
@@ -329,8 +330,8 @@ int decode_object_id(uint8_t * apdu, int *object_type, int *instance)
my_data.byte[3] = apdu[0]; my_data.byte[3] = apdu[0];
} }
*object_type = (int) ((my_data.value >> 22) & 0x3FF); *object_type = ((my_data.value >> 22) & 0x3FF);
*instance = (int) (my_data.value & 0x3FFFFF); *instance = (my_data.value & 0x3FFFFF);
return 4; return 4;
} }
@@ -435,7 +436,7 @@ int encode_character_string(uint8_t * apdu, const char *char_string)
len = encode_tag(&apdu[0], BACNET_APPLICATION_TAG_CHARACTER_STRING, len = encode_tag(&apdu[0], BACNET_APPLICATION_TAG_CHARACTER_STRING,
false, string_len); false, string_len);
assert((len + string_len) < MAX_APDU); assert((len + string_len) < MAX_APDU);
len += encode_bacnet_character_string(&apdu[1], char_string); len += encode_bacnet_character_string(&apdu[len], char_string);
return len; return len;
} }
@@ -448,6 +449,7 @@ int decode_character_string(uint8_t * apdu, char *char_string)
int len = 0, i = 0; int len = 0, i = 0;
uint32_t len_value = 0; uint32_t len_value = 0;
len = decode_tag_value(&apdu[0], &len_value);
len = decode_tag_value(&apdu[0], &len_value); len = decode_tag_value(&apdu[0], &len_value);
if (len_value) { if (len_value) {
// decode ANSI X3.4 // decode ANSI X3.4
@@ -852,9 +854,9 @@ void testBACDCodeString(Test * pTest)
apdu_len = encode_character_string(&array[0], &test_string0[0]); apdu_len = encode_character_string(&array[0], &test_string0[0]);
decode_character_string(&array[0], &decoded_string[0]); decode_character_string(&array[0], &decoded_string[0]);
ct_test(pTest, apdu_len == 3); ct_test(pTest, apdu_len == 2);
ct_test(pTest, strcmp(&test_string0[0], &decoded_string[0]) == 0); ct_test(pTest, strcmp(&test_string0[0], &decoded_string[0]) == 0);
for (i = 0; i < (MAX_APDU - 5); i++) { for (i = 0; i < (MAX_APDU - 6); i++) {
test_string[i] = 'S'; test_string[i] = 'S';
test_string[i + 1] = '\0'; test_string[i + 1] = '\0';
apdu_len = apdu_len =
@@ -863,9 +865,12 @@ void testBACDCodeString(Test * pTest)
decode_character_string(&encoded_array[0], &decoded_string[0]); decode_character_string(&encoded_array[0], &decoded_string[0]);
len = strlen(test_string); len = strlen(test_string);
if (apdu_len != test_apdu_len) { if (apdu_len != test_apdu_len) {
printf("test string=%d\n", i); printf("test string=#%d\n", i);
} }
ct_test(pTest, apdu_len == test_apdu_len); ct_test(pTest, apdu_len == test_apdu_len);
if (strcmp(&test_string[0], &decoded_string[0]) != 0) {
printf("test string=#%d\n", i);
}
ct_test(pTest, strcmp(&test_string[0], &decoded_string[0]) == 0); ct_test(pTest, strcmp(&test_string[0], &decoded_string[0]) == 0);
} }