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

Fixed Initialize-Routing-Table demo handling of ACK.

Browse Source
This commit is contained in:
skarg
2017-05-30 21:43:48 +00:00
parent 8af8043d49
commit 7df0b9c5ed
1 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/initrouter/main.c
+37 -32
View File
@@ -128,41 +128,44 @@ static void My_Router_Handler(
printf("%02X", src->mac[j]); printf("%02X", src->mac[j]);
} }
} }
port_mappings = npdu[0]; if (npdu_len >= 1) {
printf("\nPort Mappings: %u\n", port_mappings); port_mappings = npdu[npdu_offset];
npdu_offset = 1; printf("\nPort Mappings: %u\n", port_mappings);
npdu_len--; npdu_offset++;
npdu_len--;
}
while (npdu_len) { while (npdu_len) {
len = decode_unsigned16(&npdu[npdu_offset], &dnet); if (npdu_len >= 2) {
printf("DNET=%hu, ", dnet); len = decode_unsigned16(&npdu[npdu_offset], &dnet);
npdu_offset += len; printf("DNET=%hu, ", dnet);
npdu_len -= len; npdu_offset += len;
if (!npdu_len) { npdu_len -= len;
break;
} }
port_id = npdu[npdu_offset]; if (npdu_len >= 1) {
printf("Port ID=%u, ", port_id); port_id = npdu[npdu_offset];
npdu_offset++; printf("Port ID=%u, ", port_id);
npdu_len--; npdu_offset++;
if (!npdu_len) { npdu_len--;
break;
} }
port_info_len = npdu[npdu_offset]; if (npdu_len >= 1) {
printf("Port Info Length=%u, ", port_info_len); port_info_len = npdu[npdu_offset];
npdu_offset++; printf("Port Info Length=%u, ", port_info_len);
npdu_len--; npdu_offset++;
printf("Port Info=\""); npdu_len--;
for (j = 0; j < 255; j++) { } else {
if (!npdu_len) { port_info_len = 0;
break; }
} if (port_info_len) {
if (j < port_info_len) { printf("Port Info=\"");
printf("%02X", npdu[npdu_offset]); while (port_info_len) {
npdu_offset++; if (npdu_len >= 1) {
npdu_len--; printf("%02X", npdu[npdu_offset]);
npdu_offset++;
npdu_len--;
}
} }
printf("\"");
} }
printf("\"");
if (npdu_len) { if (npdu_len) {
printf("\n"); printf("\n");
} }
@@ -189,8 +192,10 @@ static void My_NPDU_Handler(
apdu_offset = npdu_decode(&pdu[0], &dest, src, &npdu_data); apdu_offset = npdu_decode(&pdu[0], &dest, src, &npdu_data);
if (npdu_data.network_layer_message) { if (npdu_data.network_layer_message) {
My_Router_Handler(src, &npdu_data, &pdu[apdu_offset], if (apdu_offset <= pdu_len) {
(uint16_t) (pdu_len - apdu_offset)); My_Router_Handler(src, &npdu_data, &pdu[apdu_offset],
(uint16_t) (pdu_len - apdu_offset));
}
} else if ((apdu_offset > 0) && (apdu_offset <= pdu_len)) { } else if ((apdu_offset > 0) && (apdu_offset <= pdu_len)) {
if ((npdu_data.protocol_version == BACNET_PROTOCOL_VERSION) && if ((npdu_data.protocol_version == BACNET_PROTOCOL_VERSION) &&
((dest.net == 0) || (dest.net == BACNET_BROADCAST_NETWORK))) { ((dest.net == 0) || (dest.net == BACNET_BROADCAST_NETWORK))) {