mirror/bacnet-stack
1
0
Fork 0
mirror of https://github.com/stargieg/bacnet-stack synced 2025-10-26 23:35:52 +08:00
Code Issues Releases Wiki Activity

[r3135] Fixed Initialize-Routing-Table demo handling of ACK.

Browse Source
This commit is contained in:
Steve Karg 2017-05-30 23:43:48 +02:00 committed by Patrick Grimm
parent d33bec7472
commit 92d9ec7340
1 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
demo/initrouter/main.c
View File

@ -126,41 +126,44 @@ static void My_Router_Handler(
printf("%02X", src->mac[j]); printf("%02X", src->mac[j]);
} }
} }
port_mappings = npdu[0]; if (npdu_len >= 1) {
port_mappings = npdu[npdu_offset];
printf("\nPort Mappings: %u\n", port_mappings); printf("\nPort Mappings: %u\n", port_mappings);
npdu_offset = 1; npdu_offset++;
npdu_len--; npdu_len--;
}
while (npdu_len) { while (npdu_len) {
if (npdu_len >= 2) {
len = decode_unsigned16(&npdu[npdu_offset], &dnet); len = decode_unsigned16(&npdu[npdu_offset], &dnet);
printf("DNET=%hu, ", dnet); printf("DNET=%hu, ", dnet);
npdu_offset += len; npdu_offset += len;
npdu_len -= len; npdu_len -= len;
if (!npdu_len) {
break;
} }
if (npdu_len >= 1) {
port_id = npdu[npdu_offset]; port_id = npdu[npdu_offset];
printf("Port ID=%u, ", port_id); printf("Port ID=%u, ", port_id);
npdu_offset++; npdu_offset++;
npdu_len--; npdu_len--;
if (!npdu_len) {
break;
} }
if (npdu_len >= 1) {
port_info_len = npdu[npdu_offset]; port_info_len = npdu[npdu_offset];
printf("Port Info Length=%u, ", port_info_len); printf("Port Info Length=%u, ", port_info_len);
npdu_offset++; npdu_offset++;
npdu_len--; npdu_len--;
printf("Port Info=\""); } else {
for (j = 0; j < 255; j++) { port_info_len = 0;
if (!npdu_len) {
break;
} }
if (j < port_info_len) { if (port_info_len) {
printf("Port Info=\"");
while (port_info_len) {
if (npdu_len >= 1) {
printf("%02X", npdu[npdu_offset]); printf("%02X", npdu[npdu_offset]);
npdu_offset++; npdu_offset++;
npdu_len--; npdu_len--;
} }
} }
printf("\""); printf("\"");
}
if (npdu_len) { if (npdu_len) {
printf("\n"); printf("\n");
} }
@ -187,8 +190,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) {
if (apdu_offset <= pdu_len) {
My_Router_Handler(src, &npdu_data, &pdu[apdu_offset], My_Router_Handler(src, &npdu_data, &pdu[apdu_offset],
(uint16_t) (pdu_len - 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))) {