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

Reverted r2140 as this breaks MS/TP and non-BACnet/IP builds. If this functionality is indeed required, then we will need to change the APDU dispatcher to include information with the service so that this can be discerned.

Browse Source
This commit is contained in:
skarg
2012-01-09 22:52:59 +00:00
parent abf23e80e8
commit bf4cd368b0
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_whois.c
+6 -14
View File
@@ -76,13 +76,12 @@ void handler_who_is(
return; return;
} }
/** Handler for Who-Is requests, with Unicast I-Am response (per Addendum 135-2004q), /** Handler for Who-Is requests, with Unicast I-Am response (per Addendum 135-2004q).
* unless the Who-Is was an Original-Broadcast or Forwarded-NPDU.
* @ingroup DMDDB * @ingroup DMDDB
* @param service_request [in] The received message to be handled. * @param service_request [in] The received message to be handled.
* @param service_len [in] Length of the service_request message. * @param service_len [in] Length of the service_request message.
* @param src [in] The BACNET_ADDRESS of the message's source, that the * @param src [in] The BACNET_ADDRESS of the message's source that the
* response will be sent back to if unicast. * response will be sent back to.
*/ */
void handler_who_is_unicast( void handler_who_is_unicast(
uint8_t * service_request, uint8_t * service_request,
@@ -92,14 +91,13 @@ void handler_who_is_unicast(
int len = 0; int len = 0;
int32_t low_limit = 0; int32_t low_limit = 0;
int32_t high_limit = 0; int32_t high_limit = 0;
bool bOkToSend = false;
len = len =
whois_decode_service_request(service_request, service_len, &low_limit, whois_decode_service_request(service_request, service_len, &low_limit,
&high_limit); &high_limit);
/* If no limits, then always respond */ /* If no limits, then always respond */
if (len == 0) if (len == 0)
bOkToSend = true; Send_I_Am_Unicast(&Handler_Transmit_Buffer[0], src);
else if (len != -1) { else if (len != -1) {
/* is my device id within the limits? */ /* is my device id within the limits? */
if (((Device_Object_Instance_Number() >= (uint32_t) low_limit) && if (((Device_Object_Instance_Number() >= (uint32_t) low_limit) &&
@@ -107,16 +105,10 @@ void handler_who_is_unicast(
|| ||
/* BACnet wildcard is the max instance number - everyone responds */ /* BACnet wildcard is the max instance number - everyone responds */
((BACNET_MAX_INSTANCE >= (uint32_t) low_limit) && ((BACNET_MAX_INSTANCE >= (uint32_t) low_limit) &&
(BACNET_MAX_INSTANCE <= (uint32_t) high_limit))) (BACNET_MAX_INSTANCE <= (uint32_t) high_limit)))
bOkToSend = true; Send_I_Am_Unicast(&Handler_Transmit_Buffer[0], src);
} }
if ( bOkToSend ) {
if ( bvlc_get_function_code() == BVLC_ORIGINAL_UNICAST_NPDU )
Send_I_Am_Unicast(&Handler_Transmit_Buffer[0], src);
else
Send_I_Am(&Handler_Transmit_Buffer[0]);
}
return; return;
} }