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

Changed API: encode_tagged is now encode_application since we are encoding an application tag.

Browse Source
This commit is contained in:
skarg
2007-10-13 12:26:16 +00:00
parent fe2c7cd00a
commit 3d6158443c
36 changed files with 466 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/arf.c
+11 -11
View File
@@ -53,22 +53,22 @@ int arf_encode_apdu(uint8_t * apdu,
apdu[2] = invoke_id;
apdu[3] = SERVICE_CONFIRMED_ATOMIC_READ_FILE; /* service choice */
apdu_len = 4;
apdu_len += encode_tagged_object_id(&apdu[apdu_len],
apdu_len += encode_application_object_id(&apdu[apdu_len],
data->object_type, data->object_instance);
switch (data->access) {
case FILE_STREAM_ACCESS:
apdu_len += encode_opening_tag(&apdu[apdu_len], 0);
apdu_len += encode_tagged_signed(&apdu[apdu_len],
apdu_len += encode_application_signed(&apdu[apdu_len],
data->type.stream.fileStartPosition);
apdu_len += encode_tagged_unsigned(&apdu[apdu_len],
apdu_len += encode_application_unsigned(&apdu[apdu_len],
data->type.stream.requestedOctetCount);
apdu_len += encode_closing_tag(&apdu[apdu_len], 0);
break;
case FILE_RECORD_ACCESS:
apdu_len += encode_opening_tag(&apdu[apdu_len], 1);
apdu_len += encode_tagged_signed(&apdu[apdu_len],
apdu_len += encode_application_signed(&apdu[apdu_len],
data->type.record.fileStartRecord);
apdu_len += encode_tagged_unsigned(&apdu[apdu_len],
apdu_len += encode_application_unsigned(&apdu[apdu_len],
data->type.record.RecordCount);
apdu_len += encode_closing_tag(&apdu[apdu_len], 1);
break;
@@ -193,23 +193,23 @@ int arf_ack_encode_apdu(uint8_t * apdu,
apdu_len = 3;
/* endOfFile */
apdu_len +=
encode_tagged_boolean(&apdu[apdu_len], data->endOfFile);
encode_application_boolean(&apdu[apdu_len], data->endOfFile);
switch (data->access) {
case FILE_STREAM_ACCESS:
apdu_len += encode_opening_tag(&apdu[apdu_len], 0);
apdu_len += encode_tagged_signed(&apdu[apdu_len],
apdu_len += encode_application_signed(&apdu[apdu_len],
data->type.stream.fileStartPosition);
apdu_len += encode_tagged_octet_string(&apdu[apdu_len],
apdu_len += encode_application_octet_string(&apdu[apdu_len],
&data->fileData);
apdu_len += encode_closing_tag(&apdu[apdu_len], 0);
break;
case FILE_RECORD_ACCESS:
apdu_len += encode_opening_tag(&apdu[apdu_len], 1);
apdu_len += encode_tagged_signed(&apdu[apdu_len],
apdu_len += encode_application_signed(&apdu[apdu_len],
data->type.record.fileStartRecord);
apdu_len += encode_tagged_unsigned(&apdu[apdu_len],
apdu_len += encode_application_unsigned(&apdu[apdu_len],
data->type.record.RecordCount);
apdu_len += encode_tagged_octet_string(&apdu[apdu_len],
apdu_len += encode_application_octet_string(&apdu[apdu_len],
&data->fileData);
apdu_len += encode_closing_tag(&apdu[apdu_len], 1);
break;
bacnet-stack/src/awf.c
+6 -6
View File
@@ -53,24 +53,24 @@ int awf_encode_apdu(uint8_t * apdu,
apdu[2] = invoke_id;
apdu[3] = SERVICE_CONFIRMED_ATOMIC_WRITE_FILE; /* service choice */
apdu_len = 4;
apdu_len += encode_tagged_object_id(&apdu[apdu_len],
apdu_len += encode_application_object_id(&apdu[apdu_len],
data->object_type, data->object_instance);
switch (data->access) {
case FILE_STREAM_ACCESS:
apdu_len += encode_opening_tag(&apdu[apdu_len], 0);
apdu_len += encode_tagged_signed(&apdu[apdu_len],
apdu_len += encode_application_signed(&apdu[apdu_len],
data->type.stream.fileStartPosition);
apdu_len += encode_tagged_octet_string(&apdu[apdu_len],
apdu_len += encode_application_octet_string(&apdu[apdu_len],
&data->fileData);
apdu_len += encode_closing_tag(&apdu[apdu_len], 0);
break;
case FILE_RECORD_ACCESS:
apdu_len += encode_opening_tag(&apdu[apdu_len], 1);
apdu_len += encode_tagged_signed(&apdu[apdu_len],
apdu_len += encode_application_signed(&apdu[apdu_len],
data->type.record.fileStartRecord);
apdu_len += encode_tagged_unsigned(&apdu[apdu_len],
apdu_len += encode_application_unsigned(&apdu[apdu_len],
data->type.record.returnedRecordCount);
apdu_len += encode_tagged_octet_string(&apdu[apdu_len],
apdu_len += encode_application_octet_string(&apdu[apdu_len],
&data->fileData);
apdu_len += encode_closing_tag(&apdu[apdu_len], 1);
break;
bacnet-stack/src/bacapp.c
+31 -31
View File
@@ -56,50 +56,50 @@ int bacapp_encode_application_data(uint8_t * apdu,
apdu_len++;
break;
case BACNET_APPLICATION_TAG_BOOLEAN:
apdu_len = encode_tagged_boolean(&apdu[0],
apdu_len = encode_application_boolean(&apdu[0],
value->type.Boolean);
break;
case BACNET_APPLICATION_TAG_UNSIGNED_INT:
apdu_len = encode_tagged_unsigned(&apdu[0],
apdu_len = encode_application_unsigned(&apdu[0],
value->type.Unsigned_Int);
break;
case BACNET_APPLICATION_TAG_SIGNED_INT:
apdu_len = encode_tagged_signed(&apdu[0],
apdu_len = encode_application_signed(&apdu[0],
value->type.Signed_Int);
break;
case BACNET_APPLICATION_TAG_REAL:
apdu_len = encode_tagged_real(&apdu[0], value->type.Real);
apdu_len = encode_application_real(&apdu[0], value->type.Real);
break;
case BACNET_APPLICATION_TAG_ENUMERATED:
apdu_len = encode_tagged_enumerated(&apdu[0],
apdu_len = encode_application_enumerated(&apdu[0],
value->type.Enumerated);
break;
case BACNET_APPLICATION_TAG_DATE:
apdu_len = encode_tagged_date(&apdu[0], &value->type.Date);
apdu_len = encode_application_date(&apdu[0], &value->type.Date);
break;
case BACNET_APPLICATION_TAG_TIME:
apdu_len = encode_tagged_time(&apdu[0], &value->type.Time);
apdu_len = encode_application_time(&apdu[0], &value->type.Time);
break;
case BACNET_APPLICATION_TAG_OBJECT_ID:
apdu_len = encode_tagged_object_id(&apdu[0],
apdu_len = encode_application_object_id(&apdu[0],
value->type.Object_Id.type,
value->type.Object_Id.instance);
break;
case BACNET_APPLICATION_TAG_OCTET_STRING:
apdu_len = encode_tagged_octet_string(&apdu[0],
apdu_len = encode_application_octet_string(&apdu[0],
&value->type.Octet_String);
break;
case BACNET_APPLICATION_TAG_CHARACTER_STRING:
apdu_len = encode_tagged_character_string(&apdu[0],
apdu_len = encode_application_character_string(&apdu[0],
&value->type.Character_String);
break;
case BACNET_APPLICATION_TAG_BIT_STRING:
apdu_len = encode_tagged_bitstring(&apdu[0],
apdu_len = encode_application_bitstring(&apdu[0],
&value->type.Bit_String);
break;
case BACNET_APPLICATION_TAG_DOUBLE:
/* FIXME: double is not implemented yet.
apdu_len = encode_tagged_double(&apdu[0],
apdu_len = encode_application_double(&apdu[0],
value->type.Double);
*/
default:
@@ -797,7 +797,7 @@ void testBACnetApplicationDataLength(Test * pTest)
apdu_len = 0;
len = encode_opening_tag(&apdu[apdu_len], 3);
apdu_len += len;
len = encode_tagged_unsigned(&apdu[apdu_len], 4194303);
len = encode_application_unsigned(&apdu[apdu_len], 4194303);
test_len += len;
apdu_len += len;
len = encode_closing_tag(&apdu[apdu_len], 3);
@@ -811,52 +811,52 @@ void testBACnetApplicationDataLength(Test * pTest)
apdu_len = 0;
len = encode_opening_tag(&apdu[apdu_len], 3);
apdu_len += len;
len = encode_tagged_null(&apdu[apdu_len]);
len = encode_application_null(&apdu[apdu_len]);
test_len += len;
apdu_len += len;
len = encode_tagged_null(&apdu[apdu_len]);
len = encode_application_null(&apdu[apdu_len]);
test_len += len;
apdu_len += len;
len = encode_tagged_unsigned(&apdu[apdu_len], 1);
len = encode_application_unsigned(&apdu[apdu_len], 1);
test_len += len;
apdu_len += len;
len = encode_tagged_unsigned(&apdu[apdu_len], 42);
len = encode_application_unsigned(&apdu[apdu_len], 42);
test_len += len;
apdu_len += len;
len = encode_tagged_unsigned(&apdu[apdu_len], 91);
len = encode_application_unsigned(&apdu[apdu_len], 91);
test_len += len;
apdu_len += len;
len = encode_tagged_null(&apdu[apdu_len]);
len = encode_application_null(&apdu[apdu_len]);
test_len += len;
apdu_len += len;
len = encode_tagged_null(&apdu[apdu_len]);
len = encode_application_null(&apdu[apdu_len]);
test_len += len;
apdu_len += len;
len = encode_tagged_null(&apdu[apdu_len]);
len = encode_application_null(&apdu[apdu_len]);
test_len += len;
apdu_len += len;
len = encode_tagged_null(&apdu[apdu_len]);
len = encode_application_null(&apdu[apdu_len]);
test_len += len;
apdu_len += len;
len = encode_tagged_null(&apdu[apdu_len]);
len = encode_application_null(&apdu[apdu_len]);
test_len += len;
apdu_len += len;
len = encode_tagged_null(&apdu[apdu_len]);
len = encode_application_null(&apdu[apdu_len]);
test_len += len;
apdu_len += len;
len = encode_tagged_null(&apdu[apdu_len]);
len = encode_application_null(&apdu[apdu_len]);
test_len += len;
apdu_len += len;
len = encode_tagged_null(&apdu[apdu_len]);
len = encode_application_null(&apdu[apdu_len]);
test_len += len;
apdu_len += len;
len = encode_tagged_null(&apdu[apdu_len]);
len = encode_application_null(&apdu[apdu_len]);
test_len += len;
apdu_len += len;
len = encode_tagged_null(&apdu[apdu_len]);
len = encode_application_null(&apdu[apdu_len]);
test_len += len;
apdu_len += len;
len = encode_tagged_null(&apdu[apdu_len]);
len = encode_application_null(&apdu[apdu_len]);
test_len += len;
apdu_len += len;
len = encode_closing_tag(&apdu[apdu_len], 3);
@@ -877,14 +877,14 @@ void testBACnetApplicationDataLength(Test * pTest)
local_date.month = 4; /* 1=Jan */
local_date.day = 1; /* 1..31 */
local_date.wday = 6; /* 1=Monday */
len = encode_tagged_date(&apdu[apdu_len], &local_date);
len = encode_application_date(&apdu[apdu_len], &local_date);
test_len += len;
apdu_len += len;
local_time.hour = 7;
local_time.min = 0;
local_time.sec = 3;
local_time.hundredths = 1;
len = encode_tagged_time(&apdu[apdu_len], &local_time);
len = encode_application_time(&apdu[apdu_len], &local_time);
test_len += len;
apdu_len += len;
len = encode_closing_tag(&apdu[apdu_len], 3);
bacnet-stack/src/bacdcode.c
+28 -28
View File
@@ -412,7 +412,7 @@ bool decode_is_closing_tag_number(uint8_t * apdu, uint8_t tag_number)
/* from clause 20.2.3 Encoding of a Boolean Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */
int encode_tagged_boolean(uint8_t * apdu, bool boolean_value)
int encode_application_boolean(uint8_t * apdu, bool boolean_value)
{
int len = 0;
uint32_t len_value = 0;
@@ -465,7 +465,7 @@ bool decode_boolean(uint32_t len_value)
/* from clause 20.2.2 Encoding of a Null Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */
int encode_tagged_null(uint8_t * apdu)
int encode_application_null(uint8_t * apdu)
{
return encode_tag(&apdu[0], BACNET_APPLICATION_TAG_NULL, false, 0);
}
@@ -556,7 +556,7 @@ int encode_bitstring(uint8_t * apdu, BACNET_BIT_STRING * bit_string)
return len;
}
int encode_tagged_bitstring(uint8_t * apdu, BACNET_BIT_STRING * bit_string)
int encode_application_bitstring(uint8_t * apdu, BACNET_BIT_STRING * bit_string)
{
int len = 0;
int bit_string_encoded_length = 1; /* 1 for the bits remaining octet */
@@ -641,7 +641,7 @@ int encode_bacnet_real(float value, uint8_t * apdu)
/* from clause 20.2.6 Encoding of a Real Number Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */
int encode_tagged_real(uint8_t * apdu, float value)
int encode_application_real(uint8_t * apdu, float value)
{
int len = 0;
@@ -720,7 +720,7 @@ int encode_context_object_id(uint8_t * apdu,
/* from clause 20.2.14 Encoding of an Object Identifier Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */
int encode_tagged_object_id(uint8_t * apdu,
int encode_application_object_id(uint8_t * apdu,
int object_type, uint32_t instance)
{
int len = 0;
@@ -757,7 +757,7 @@ int encode_octet_string(uint8_t * apdu, BACNET_OCTET_STRING * octet_string)
/* from clause 20.2.8 Encoding of an Octet String Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */
int encode_tagged_octet_string(uint8_t * apdu,
int encode_application_octet_string(uint8_t * apdu,
BACNET_OCTET_STRING * octet_string)
{
int apdu_len = 0;
@@ -834,7 +834,7 @@ int encode_bacnet_character_string(uint8_t * apdu,
/* from clause 20.2.9 Encoding of a Character String Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */
int encode_tagged_character_string(uint8_t * apdu,
int encode_application_character_string(uint8_t * apdu,
BACNET_CHARACTER_STRING * char_string)
{
int len = 0;
@@ -959,7 +959,7 @@ int encode_context_unsigned(uint8_t * apdu, int tag_number, uint32_t value)
/* from clause 20.2.4 Encoding of an Unsigned Integer Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */
int encode_tagged_unsigned(uint8_t * apdu, uint32_t value)
int encode_application_unsigned(uint8_t * apdu, uint32_t value)
{
int len = 0;
@@ -996,7 +996,7 @@ int encode_bacnet_enumerated(uint8_t * apdu, int value)
/* from clause 20.2.11 Encoding of an Enumerated Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */
int encode_tagged_enumerated(uint8_t * apdu, int value)
int encode_application_enumerated(uint8_t * apdu, int value)
{
int len = 0; /* return value */
@@ -1082,7 +1082,7 @@ int encode_bacnet_signed(uint8_t * apdu, int32_t value)
/* from clause 20.2.5 Encoding of a Signed Integer Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */
int encode_tagged_signed(uint8_t * apdu, int32_t value)
int encode_application_signed(uint8_t * apdu, int32_t value)
{
int len = 0; /* return value */
@@ -1128,7 +1128,7 @@ int encode_bacnet_time(uint8_t * apdu, BACNET_TIME * btime)
/* from clause 20.2.13 Encoding of a Time Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */
int encode_tagged_time(uint8_t * apdu, BACNET_TIME * btime)
int encode_application_time(uint8_t * apdu, BACNET_TIME * btime)
{
int len = 0;
@@ -1197,7 +1197,7 @@ int encode_bacnet_date(uint8_t * apdu, BACNET_DATE * bdate)
/* from clause 20.2.12 Encoding of a Date Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */
int encode_tagged_date(uint8_t * apdu, BACNET_DATE * bdate)
int encode_application_date(uint8_t * apdu, BACNET_DATE * bdate)
{
int len = 0;
@@ -1393,7 +1393,7 @@ void testBACDCodeReal(Test * pTest)
sizeof(real_array)) == 0);
/* a real will take up 4 octects plus a one octet tag */
apdu_len = encode_tagged_real(&apdu[0], value);
apdu_len = encode_application_real(&apdu[0], value);
ct_test(pTest, apdu_len == 5);
/* len tells us how many octets were used for encoding the value */
len = decode_tag_number_and_value(&apdu[0], &tag_number, &long_value);
@@ -1420,7 +1420,7 @@ void testBACDCodeEnumerated(Test * pTest)
uint32_t len_value = 0;
for (i = 0; i < 31; i++) {
apdu_len = encode_tagged_enumerated(&array[0], value);
apdu_len = encode_application_enumerated(&array[0], value);
len =
decode_tag_number_and_value(&array[0], &tag_number,
&len_value);
@@ -1429,12 +1429,12 @@ void testBACDCodeEnumerated(Test * pTest)
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_ENUMERATED);
ct_test(pTest, len == apdu_len);
/* encode back the value */
encode_tagged_enumerated(&encoded_array[0], decoded_value);
encode_application_enumerated(&encoded_array[0], decoded_value);
ct_test(pTest, memcmp(&array[0], &encoded_array[0],
sizeof(array)) == 0);
/* an enumerated will take up to 4 octects */
/* plus a one octet for the tag */
apdu_len = encode_tagged_enumerated(&apdu[0], value);
apdu_len = encode_application_enumerated(&apdu[0], value);
len = decode_tag_number_and_value(&apdu[0], &tag_number, NULL);
ct_test(pTest, len == 1);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_ENUMERATED);
@@ -1462,7 +1462,7 @@ void testBACDCodeUnsignedValue(Test * pTest, uint32_t value)
uint8_t tag_number = 0;
uint32_t len_value = 0;
len_value = encode_tagged_unsigned(&array[0], value);
len_value = encode_application_unsigned(&array[0], value);
len = decode_tag_number_and_value(&array[0], &tag_number, &len_value);
len = decode_unsigned(&array[len], len_value, &decoded_value);
ct_test(pTest, decoded_value == value);
@@ -1470,12 +1470,12 @@ void testBACDCodeUnsignedValue(Test * pTest, uint32_t value)
printf("value=%u decoded_value=%u\n", value, decoded_value);
print_apdu(&array[0], sizeof(array));
}
encode_tagged_unsigned(&encoded_array[0], decoded_value);
encode_application_unsigned(&encoded_array[0], decoded_value);
ct_test(pTest, memcmp(&array[0], &encoded_array[0],
sizeof(array)) == 0);
/* an unsigned will take up to 4 octects */
/* plus a one octet for the tag */
apdu_len = encode_tagged_unsigned(&apdu[0], value);
apdu_len = encode_application_unsigned(&apdu[0], value);
/* apdu_len varies... */
/*ct_test(pTest, apdu_len == 5); */
len = decode_tag_number_and_value(&apdu[0], &tag_number, NULL);
@@ -1526,7 +1526,7 @@ void testBACDCodeSignedValue(Test * pTest, int32_t value)
uint32_t len_value = 0;
int diff = 0;
len = encode_tagged_signed(&array[0], value);
len = encode_application_signed(&array[0], value);
len = decode_tag_number_and_value(&array[0], &tag_number, &len_value);
len = decode_signed(&array[len], len_value, &decoded_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_SIGNED_INT);
@@ -1535,7 +1535,7 @@ void testBACDCodeSignedValue(Test * pTest, int32_t value)
printf("value=%d decoded_value=%d\n", value, decoded_value);
print_apdu(&array[0], sizeof(array));
}
encode_tagged_signed(&encoded_array[0], decoded_value);
encode_application_signed(&encoded_array[0], decoded_value);
diff = memcmp(&array[0], &encoded_array[0], sizeof(array));
ct_test(pTest, diff == 0);
if (diff) {
@@ -1545,7 +1545,7 @@ void testBACDCodeSignedValue(Test * pTest, int32_t value)
}
/* a signed int will take up to 4 octects */
/* plus a one octet for the tag */
apdu_len = encode_tagged_signed(&apdu[0], value);
apdu_len = encode_application_signed(&apdu[0], value);
len = decode_tag_number_and_value(&apdu[0], &tag_number, NULL);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_SIGNED_INT);
ct_test(pTest, decode_is_context_specific(&apdu[0]) == false);
@@ -1614,7 +1614,7 @@ void testBACDCodeOctetString(Test * pTest)
status = octetstring_init(&octet_string, NULL, 0);
ct_test(pTest, status == true);
apdu_len = encode_tagged_octet_string(&array[0], &octet_string);
apdu_len = encode_application_octet_string(&array[0], &octet_string);
len = decode_tag_number_and_value(&array[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OCTET_STRING);
len += decode_octet_string(&array[len], len_value, &test_octet_string);
@@ -1628,7 +1628,7 @@ void testBACDCodeOctetString(Test * pTest)
status = octetstring_init(&octet_string, test_value, i);
ct_test(pTest, status == true);
apdu_len =
encode_tagged_octet_string(&encoded_array[0], &octet_string);
encode_application_octet_string(&encoded_array[0], &octet_string);
len =
decode_tag_number_and_value(&encoded_array[0], &tag_number,
&len_value);
@@ -1668,7 +1668,7 @@ void testBACDCodeCharacterString(Test * pTest)
status = characterstring_init(&char_string,
CHARACTER_ANSI_X34, NULL, 0);
ct_test(pTest, status == true);
apdu_len = encode_tagged_character_string(&array[0], &char_string);
apdu_len = encode_application_character_string(&array[0], &char_string);
len = decode_tag_number_and_value(&array[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_CHARACTER_STRING);
len +=
@@ -1683,7 +1683,7 @@ void testBACDCodeCharacterString(Test * pTest)
status = characterstring_init_ansi(&char_string, test_value);
ct_test(pTest, status == true);
apdu_len =
encode_tagged_character_string(&encoded_array[0],
encode_application_character_string(&encoded_array[0],
&char_string);
len =
decode_tag_number_and_value(&encoded_array[0], &tag_number,
@@ -1787,7 +1787,7 @@ void testBACDCodeBitString(Test * pTest)
ct_test(pTest, bitstring_bits_used(&bit_string) == (bit + 1));
ct_test(pTest, bitstring_bit(&bit_string, bit) == true);
/* encode */
len = encode_tagged_bitstring(&apdu[0], &bit_string);
len = encode_application_bitstring(&apdu[0], &bit_string);
/* decode */
len =
decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
@@ -1805,7 +1805,7 @@ void testBACDCodeBitString(Test * pTest)
ct_test(pTest, bitstring_bits_used(&bit_string) == (bit + 1));
ct_test(pTest, bitstring_bit(&bit_string, bit) == false);
/* encode */
len = encode_tagged_bitstring(&apdu[0], &bit_string);
len = encode_application_bitstring(&apdu[0], &bit_string);
/* decode */
len =
decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
bacnet-stack/src/bacerror.c
+2 -2
View File
@@ -50,8 +50,8 @@ int bacerror_encode_apdu(uint8_t * apdu,
apdu[2] = service;
apdu_len = 3;
/* service parameters */
apdu_len += encode_tagged_enumerated(&apdu[apdu_len], error_class);
apdu_len += encode_tagged_enumerated(&apdu[apdu_len], error_code);
apdu_len += encode_application_enumerated(&apdu[apdu_len], error_class);
apdu_len += encode_application_enumerated(&apdu[apdu_len], error_code);
}
return apdu_len;
bacnet-stack/src/iam/iam_server.c
+4 -4
View File
@@ -53,14 +53,14 @@ int iam_encode_apdu(uint8_t * apdu,
apdu[0] = PDU_TYPE_UNCONFIRMED_SERVICE_REQUEST;
apdu[1] = SERVICE_UNCONFIRMED_I_AM; /* service choice */
apdu_len = 2;
len = encode_tagged_object_id(&apdu[apdu_len],
len = encode_application_object_id(&apdu[apdu_len],
OBJECT_DEVICE, device_id);
apdu_len += len;
len = encode_tagged_unsigned(&apdu[apdu_len], max_apdu);
len = encode_application_unsigned(&apdu[apdu_len], max_apdu);
apdu_len += len;
len = encode_tagged_enumerated(&apdu[apdu_len], segmentation);
len = encode_application_enumerated(&apdu[apdu_len], segmentation);
apdu_len += len;
len = encode_tagged_unsigned(&apdu[apdu_len], vendor_id);
len = encode_application_unsigned(&apdu[apdu_len], vendor_id);
apdu_len += len;
}
bacnet-stack/src/ihave.c
+3 -3
View File
@@ -47,15 +47,15 @@ int ihave_encode_apdu(uint8_t * apdu, BACNET_I_HAVE_DATA * data)
apdu[1] = SERVICE_UNCONFIRMED_I_HAVE;
apdu_len = 2;
/* deviceIdentifier */
len = encode_tagged_object_id(&apdu[apdu_len],
len = encode_application_object_id(&apdu[apdu_len],
data->device_id.type, data->device_id.instance);
apdu_len += len;
/* objectIdentifier */
len = encode_tagged_object_id(&apdu[apdu_len],
len = encode_application_object_id(&apdu[apdu_len],
data->object_id.type, data->object_id.instance);
apdu_len += len;
/* objectName */
len = encode_tagged_character_string(&apdu[apdu_len],
len = encode_application_character_string(&apdu[apdu_len],
&data->object_name);
apdu_len += len;
}
bacnet-stack/src/rpm.c
+2 -2
View File
@@ -259,8 +259,8 @@ int rpm_ack_encode_apdu_object_property_error(uint8_t * apdu,
if (apdu) {
/* Tag 5: propertyAccessError */
apdu_len += encode_opening_tag(&apdu[apdu_len], 5);
apdu_len += encode_tagged_enumerated(&apdu[apdu_len], error_class);
apdu_len += encode_tagged_enumerated(&apdu[apdu_len], error_code);
apdu_len += encode_application_enumerated(&apdu[apdu_len], error_class);
apdu_len += encode_application_enumerated(&apdu[apdu_len], error_code);
apdu_len += encode_closing_tag(&apdu[apdu_len], 5);
}
bacnet-stack/src/timesync.c
+2 -2
View File
@@ -50,9 +50,9 @@ int timesync_encode_apdu_service(uint8_t * apdu,
apdu[0] = PDU_TYPE_UNCONFIRMED_SERVICE_REQUEST;
apdu[1] = service;
apdu_len = 2;
len = encode_tagged_date(&apdu[apdu_len], my_date);
len = encode_application_date(&apdu[apdu_len], my_date);
apdu_len += len;
len = encode_tagged_time(&apdu[apdu_len], my_time);
len = encode_application_time(&apdu[apdu_len], my_time);
apdu_len += len;
}