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

Added a hack for 5.4.5.1 - IDLE, when a ConfirmedBroadcastReceived, then enter IDLE - ignore the PDU.

Browse Source
This commit is contained in:
skarg
2013-07-12 22:43:37 +00:00
parent 5f3cba01fe
commit bf1c365795
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_npdu.c
+18 -10
View File
@@ -44,21 +44,21 @@
* Aside from error-checking, if the NPDU doesn't contain routing info, * Aside from error-checking, if the NPDU doesn't contain routing info,
* this handler doesn't do much besides stepping over the NPDU header * this handler doesn't do much besides stepping over the NPDU header
* and passing the remaining bytes to the apdu_handler. * and passing the remaining bytes to the apdu_handler.
* @note The routing (except src) and NCPI information, including * @note The routing (except src) and NCPI information, including
* npdu_data->data_expecting_reply, are discarded. * npdu_data->data_expecting_reply, are discarded.
* @see routing_npdu_handler * @see routing_npdu_handler
* *
* @ingroup MISCHNDLR * @ingroup MISCHNDLR
* *
* @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 pdu [in] Buffer containing the NPDU and APDU of the received packet. * @param pdu [in] Buffer containing the NPDU and APDU of the received packet.
* @param pdu_len [in] The size of the received message in the pdu[] buffer. * @param pdu_len [in] The size of the received message in the pdu[] buffer.
@@ -85,8 +85,16 @@ void npdu_handler(
/* only handle the version that we know how to handle */ /* only handle the version that we know how to handle */
/* and we are not a router, so ignore messages with /* and we are not a router, so ignore messages with
routing information cause they are not for us */ routing information cause they are not for us */
apdu_handler(src, &pdu[apdu_offset], if ((dest.net == BACNET_BROADCAST_NETWORK) &&
(uint16_t) (pdu_len - apdu_offset)); ((pdu[apdu_offset] & 0xF0) ==
PDU_TYPE_CONFIRMED_SERVICE_REQUEST)) {
/* hack for 5.4.5.1 - IDLE */
/* ConfirmedBroadcastReceived */
/* then enter IDLE - ignore the PDU */
} else {
apdu_handler(src, &pdu[apdu_offset],
(uint16_t) (pdu_len - apdu_offset));
}
} else { } else {
#if PRINT_ENABLED #if PRINT_ENABLED
printf("NPDU: DNET=%u. Discarded!\n", (unsigned) dest.net); printf("NPDU: DNET=%u. Discarded!\n", (unsigned) dest.net);