Forgot the header update for BBMD getter and setters.
Revised gateway demo to use the new device_init(NULL) way. Eliminated triplicate I-Am responses and deprecated the offending routed_ I-Am and I-Have senders (don't see any other usages; scheduled for deletion in 2/2012). Fixed I-Am sender to not always zero out dest->net, because if a src->net was given in Who-Is, need to have it or else global bcast in the I-Am response.
This commit is contained in:
@@ -110,7 +110,7 @@ void handler_who_has(
|
||||
}
|
||||
|
||||
|
||||
#ifdef BAC_ROUTING
|
||||
#ifdef DEPRECATED /* was for BAC_ROUTING - delete in 2/2012 if still unused */
|
||||
/** Handler for Who-Has requests in the virtual routing setup,
|
||||
* with broadcast I-Have response.
|
||||
* Will respond if the device Object ID matches, and we have
|
||||
|
||||
@@ -95,6 +95,7 @@ void handler_who_is_unicast(
|
||||
len =
|
||||
whois_decode_service_request(service_request, service_len, &low_limit,
|
||||
&high_limit);
|
||||
/* If no limits, then always respond */
|
||||
if (len == 0)
|
||||
Send_I_Am_Unicast(&Handler_Transmit_Buffer[0], src);
|
||||
else if (len != -1) {
|
||||
@@ -112,7 +113,7 @@ void handler_who_is_unicast(
|
||||
}
|
||||
|
||||
|
||||
#ifdef BAC_ROUTING
|
||||
#ifdef DEPRECATED /* was for BAC_ROUTING - delete in 2/2012 if still unused */
|
||||
/** Local function to check Who-Is requests against our Device IDs.
|
||||
* Will check the gateway (root Device) and all virtual routed
|
||||
* Devices against the range and respond for each that matches.
|
||||
|
||||
@@ -133,7 +133,7 @@ int iam_unicast_encode_pdu(
|
||||
BACNET_ADDRESS my_address;
|
||||
/* The destination will be the same as the src, so copy it over. */
|
||||
memcpy(dest, src, sizeof(BACNET_ADDRESS));
|
||||
dest->net = 0;
|
||||
/* dest->net = 0; - no, must direct back to src->net to meet BTL tests */
|
||||
|
||||
datalink_get_my_address(&my_address);
|
||||
/* encode the NPDU portion of the packet */
|
||||
|
||||
Reference in New Issue
Block a user