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

Fixed I-Am-Router-To-Network handling in cases of a malformed packet. The packet seen in the field was a I-Am-Router-To-Network but there was an extra "Data" byte of 0x55 at the end. Thank you, Ettore.

Browse Source
This commit is contained in:
skarg
2015-03-20 19:47:57 +00:00
parent e98f74424d
commit 9631b65fc5
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_routed_npdu.c
+24 -24
View File
@@ -22,7 +22,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* *
*********************************************************************/ *********************************************************************/
/* Acknowledging the contribution of code and ideas used here that /* Acknowledging the contribution of code and ideas used here that
* came from Paul Chapman's vmac demo project. */ * came from Paul Chapman's vmac demo project. */
#include <stdbool.h> #include <stdbool.h>
@@ -48,17 +48,17 @@
#endif #endif
/** @file h_routed_npdu.c Handles messages at the NPDU level of the BACnet stack, /** @file h_routed_npdu.c Handles messages at the NPDU level of the BACnet stack,
* including routing and network control messages. */ * including routing and network control messages. */
/** Handler to manage the Network Layer Control Messages received in a packet. /** Handler to manage the Network Layer Control Messages received in a packet.
* This handler is called if the NCPI bit 7 indicates that this packet is a * This handler is called if the NCPI bit 7 indicates that this packet is a
* network layer message and there is no further DNET to pass it to. * network layer message and there is no further DNET to pass it to.
* The NCPI has already been decoded into the npdu_data structure. * The NCPI has already been decoded into the npdu_data structure.
* @ingroup MISCHNDLR * @ingroup MISCHNDLR
* *
* @param src [in] The routing source information, if any. * @param src [in] The routing source information, if any.
* If src->net and src->len are 0, there is no * If src->net and src->len are 0, there is no
* routing source information. * routing source information.
* @param DNET_list [in] List of our reachable downstream BACnet Network numbers. * @param DNET_list [in] List of our reachable downstream BACnet Network numbers.
@@ -111,12 +111,12 @@ static void network_control_handler(
debug_printf("%s for Networks: ", debug_printf("%s for Networks: ",
bactext_network_layer_msg_name bactext_network_layer_msg_name
(NETWORK_MESSAGE_I_AM_ROUTER_TO_NETWORK)); (NETWORK_MESSAGE_I_AM_ROUTER_TO_NETWORK));
while (npdu_len) { while (npdu_len >= 2) {
len = decode_unsigned16(&npdu[npdu_offset], &dnet); len = decode_unsigned16(&npdu[npdu_offset], &dnet);
debug_printf("%hu", dnet); debug_printf("%hu", dnet);
npdu_len -= len; npdu_len -= len;
npdu_offset += len; npdu_offset += len;
if (npdu_len) { if (npdu_len >= 2) {
debug_printf(", "); debug_printf(", ");
} }
} }
@@ -139,7 +139,7 @@ static void network_control_handler(
/* Do nothing - don't support upstream traffic congestion control */ /* Do nothing - don't support upstream traffic congestion control */
break; break;
case NETWORK_MESSAGE_INIT_RT_TABLE: case NETWORK_MESSAGE_INIT_RT_TABLE:
/* If sent with Number of Ports == 0, we respond with /* If sent with Number of Ports == 0, we respond with
* NETWORK_MESSAGE_INIT_RT_TABLE_ACK and a list of all our * NETWORK_MESSAGE_INIT_RT_TABLE_ACK and a list of all our
* reachable networks. * reachable networks.
*/ */
@@ -159,7 +159,7 @@ static void network_control_handler(
} }
/* Else, fall through to do nothing. */ /* Else, fall through to do nothing. */
case NETWORK_MESSAGE_INIT_RT_TABLE_ACK: case NETWORK_MESSAGE_INIT_RT_TABLE_ACK:
/* Do nothing with the routing table info, since don't support /* Do nothing with the routing table info, since don't support
* upstream traffic congestion control */ * upstream traffic congestion control */
break; break;
case NETWORK_MESSAGE_ESTABLISH_CONNECTION_TO_NETWORK: case NETWORK_MESSAGE_ESTABLISH_CONNECTION_TO_NETWORK:
@@ -175,15 +175,15 @@ static void network_control_handler(
} }
} }
/** An APDU pre-handler that makes sure that the subsequent APDU handler call /** An APDU pre-handler that makes sure that the subsequent APDU handler call
* operates on the right Device Object(s), as addressed by the destination * operates on the right Device Object(s), as addressed by the destination
* (routing) information. * (routing) information.
* *
* @note Even when the destination is "routed" to our virtual BACnet network, * @note Even when the destination is "routed" to our virtual BACnet network,
* the src information does not need to change to reflect that (as it normally * the src information does not need to change to reflect that (as it normally
* would for a routed message) because the reply will be sent from the level * would for a routed message) because the reply will be sent from the level
* of the gateway Device. * of the gateway Device.
* *
* @param src [in] The BACNET_ADDRESS of the message's source. * @param src [in] The BACNET_ADDRESS of the message's source.
* @param dest [in] The BACNET_ADDRESS of the message's destination. * @param dest [in] The BACNET_ADDRESS of the message's destination.
* @param DNET_list [in] List of our reachable downstream BACnet Network numbers. * @param DNET_list [in] List of our reachable downstream BACnet Network numbers.
@@ -205,8 +205,8 @@ static void routed_apdu_handler(
/* We don't know how to reach this one. /* We don't know how to reach this one.
* The protocol doesn't specifically state this, but if this message * The protocol doesn't specifically state this, but if this message
* was broadcast to us, we should assume "someone else" is handling * was broadcast to us, we should assume "someone else" is handling
* it and not get involved (ie, send a Reject-Message). * it and not get involved (ie, send a Reject-Message).
* Since we can't reach other routers that src couldn't already reach, * Since we can't reach other routers that src couldn't already reach,
* we don't try the standard path of asking Who-Is-Router-to-Network. */ * we don't try the standard path of asking Who-Is-Router-to-Network. */
#if defined(BACDL_BIP) #if defined(BACDL_BIP)
/* If wasn't unicast to us, must have been one of the bcast types. /* If wasn't unicast to us, must have been one of the bcast types.
@@ -239,7 +239,7 @@ static void routed_apdu_handler(
/** Handler for the NPDU portion of a received packet, which may have routing. /** Handler for the NPDU portion of a received packet, which may have routing.
* This is a fuller handler than the regular npdu_handler, as it manages * This is a fuller handler than the regular npdu_handler, as it manages
* - Decoding of the NCPI byte * - Decoding of the NCPI byte
* - Further processing by network_control_handler() if this is a network * - Further processing by network_control_handler() if this is a network
* layer message. * layer message.
* - Further processing by routed_apdu_handler() if it contains an APDU * - Further processing by routed_apdu_handler() if it contains an APDU
* - Normally (no routing) by apdu_handler() * - Normally (no routing) by apdu_handler()
@@ -249,16 +249,16 @@ static void routed_apdu_handler(
* @note The npdu_data->data_expecting_reply status is discarded. * @note The npdu_data->data_expecting_reply status is discarded.
* @see npdu_handler * @see npdu_handler
* @ingroup NMRC * @ingroup NMRC
* *
* @param src [out] Returned with routing source information if the NPDU * @param src [out] Returned with routing source information if the NPDU
* has any and if this points to non-null storage for it. * has any and if this points to non-null storage for it.
* If src->net and src->len are 0 on return, there is no * If src->net and src->len are 0 on return, there is no
* routing source information. * routing source information.
* This src describes the original source of the message when * This src describes the original source of the message when
* it had to be routed to reach this BACnet Device, and this * it had to be routed to reach this BACnet Device, and this
* is passed down into the apdu_handler; however, I don't * is passed down into the apdu_handler; however, I don't
* think this project's code has any use for the src info * think this project's code has any use for the src info
* on return from this handler, since the response has * on return from this handler, since the response has
* already been sent via the apdu_handler. * already been sent via the apdu_handler.
* @param DNET_list [in] List of our reachable downstream BACnet Network numbers. * @param DNET_list [in] List of our reachable downstream BACnet Network numbers.
* Normally just one valid entry; terminated with a -1 value. * Normally just one valid entry; terminated with a -1 value.
bacnet-stack/demo/whoisrouter/main.c
+5 -2
View File
@@ -108,16 +108,19 @@ static void My_Router_Handler(
} }
} }
printf("\nNetworks: "); printf("\nNetworks: ");
while (npdu_len) { while (npdu_len >= 2) {
len = decode_unsigned16(&npdu[npdu_offset], &dnet); len = decode_unsigned16(&npdu[npdu_offset], &dnet);
printf("%hu", dnet); printf("%hu", dnet);
npdu_len -= len; npdu_len -= len;
npdu_offset += len; npdu_offset += len;
if (npdu_len) { if (npdu_len >= 2) {
printf(", "); printf(", ");
} }
} }
printf("\n"); printf("\n");
if (npdu_len) {
printf("Warning! Extra byte received!\n");
}
break; break;
case NETWORK_MESSAGE_I_COULD_BE_ROUTER_TO_NETWORK: case NETWORK_MESSAGE_I_COULD_BE_ROUTER_TO_NETWORK:
case NETWORK_MESSAGE_REJECT_MESSAGE_TO_NETWORK: case NETWORK_MESSAGE_REJECT_MESSAGE_TO_NETWORK: