Secured I-Am request encoding and decoding, and updated the example apps and handlers to use secure version of I-Am decoder. (#1080)
This commit is contained in:
+6
-4
@@ -136,7 +136,7 @@ static void mstp_monitor_i_am(uint8_t mac, const uint8_t *pdu, uint16_t pdu_len)
|
||||
BACNET_ADDRESS dest = { 0 };
|
||||
BACNET_NPDU_DATA npdu_data = { 0 };
|
||||
int apdu_offset = 0;
|
||||
uint16_t apdu_len = 0;
|
||||
uint16_t apdu_len = 0, service_len = 0;
|
||||
const uint8_t *apdu = NULL;
|
||||
uint8_t pdu_type = 0;
|
||||
uint8_t service_choice = 0;
|
||||
@@ -156,10 +156,12 @@ static void mstp_monitor_i_am(uint8_t mac, const uint8_t *pdu, uint16_t pdu_len)
|
||||
(apdu_len >= 2)) {
|
||||
service_choice = apdu[1];
|
||||
service_request = &apdu[2];
|
||||
service_len = apdu_len - 2;
|
||||
if (service_choice == SERVICE_UNCONFIRMED_I_AM) {
|
||||
len = iam_decode_service_request(
|
||||
service_request, &device_id, NULL, NULL, NULL);
|
||||
if (len != -1) {
|
||||
len = bacnet_iam_request_decode(
|
||||
service_request, service_len, &device_id, NULL, NULL,
|
||||
NULL);
|
||||
if (len > 0) {
|
||||
MSTP_Statistics[mac].device_id = device_id;
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -109,9 +109,9 @@ static void my_i_am_handler(
|
||||
uint16_t vendor_id = 0;
|
||||
unsigned i = 0;
|
||||
|
||||
(void)service_len;
|
||||
len = iam_decode_service_request(
|
||||
service_request, &device_id, &max_apdu, &segmentation, &vendor_id);
|
||||
len = bacnet_iam_request_decode(
|
||||
service_request, service_len, &device_id, &max_apdu, &segmentation,
|
||||
&vendor_id);
|
||||
if (BACnet_Debug_Enabled) {
|
||||
fprintf(stderr, "Received I-Am Request");
|
||||
}
|
||||
|
||||
@@ -95,9 +95,9 @@ static void LocalIAmHandler(
|
||||
uint16_t vendor_id = 0;
|
||||
|
||||
(void)src;
|
||||
(void)service_len;
|
||||
len = iam_decode_service_request(
|
||||
service_request, &device_id, &max_apdu, &segmentation, &vendor_id);
|
||||
len = bacnet_iam_request_decode(
|
||||
service_request, service_len, &device_id, &max_apdu, &segmentation,
|
||||
&vendor_id);
|
||||
if (len != -1) {
|
||||
address_add(device_id, max_apdu, src);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user