refactored the Who-Is and I-Am handling, and cleaned up some comments.

bacnet-stack/demo/handler/h_whois.c

@@ -33,9 +33,8 @@
 #include "bacdcode.h"
 #include "whois.h"
 #include "device.h"
-
+#include "client.h"
-/* global flag to send an I-Am */
+#include "txbuf.h"
-bool I_Am_Request = true;
 
 void handler_who_is(uint8_t * service_request,
     uint16_t service_len, BACNET_ADDRESS * src)
@@ -50,11 +49,15 @@ void handler_who_is(uint8_t * service_request,
     /* in our simple system, we just set a flag and let the main loop
        send the I-Am request. */
     if (len == 0)
-        I_Am_Request = true;
+        iam_send(&Handler_Transmit_Buffer[0]);
     else if (len != -1) {
-        if ((Device_Object_Instance_Number() >= (uint32_t) low_limit) &&
+        /* is my device id within the limits? */
-            (Device_Object_Instance_Number() <= (uint32_t) high_limit))
+        if (((Device_Object_Instance_Number() >= (uint32_t) low_limit) &&
-            I_Am_Request = true;
+            (Device_Object_Instance_Number() <= (uint32_t) high_limit)) ||
+            /* BACnet wildcard is the max instance number - everyone responds */
+            ((BACNET_MAX_INSTANCE >= (uint32_t) low_limit) &&
+             (BACNET_MAX_INSTANCE <= (uint32_t) high_limit)))
+            iam_send(&Handler_Transmit_Buffer[0]);
     }
 
     return;

bacnet-stack/demo/handler/handlers.h

@@ -32,9 +32,6 @@
 #include "apdu.h"
 #include "bacapp.h"
 
-/* flag requesting main loop to send an I-Am */
-extern bool I_Am_Request;
-
 #ifdef __cplusplus
 extern "C" {
 #endif                          /* __cplusplus */

bacnet-stack/demo/object/device.c

@@ -609,9 +609,6 @@ int Device_Encode_Property_APDU(uint8_t * apdu,
     return apdu_len;
 }
 
-/* we can send an I-Am when our device ID changes */
-extern bool I_Am_Request;
-
 /* returns true if successful */
 bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
     BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code)
@@ -630,7 +627,7 @@ bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
             if ((wp_data->value.type.Object_Id.type == OBJECT_DEVICE) &&
                 (Device_Set_Object_Instance_Number(wp_data->value.type.
                         Object_Id.instance))) {
-                I_Am_Request = true;
+                /* we could send an I-Am broadcast to let the world know */
                 status = true;
             } else {
                 *error_class = ERROR_CLASS_PROPERTY;
@@ -808,8 +805,6 @@ uint32_t bacfile_index_to_instance(unsigned find_index)
     return find_index;
 }
 
-bool I_Am_Request = false;
-
 int main(void)
 {
     Test *pTest;

bacnet-stack/demo/readfile/readfile.c

@@ -23,7 +23,7 @@
 *
 *********************************************************************/
 
-/* READFILE: command line tool that reads a file from a BACnet device. */
+/* command line tool that sends a BACnet service, and displays the reply */
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -335,10 +335,6 @@ int main(int argc, char *argv[])
                         last_seconds) * 1000));
         if (End_Of_File_Detected || Error_Detected)
             break;
-        if (I_Am_Request) {
-            I_Am_Request = false;
-            iam_send(&Handler_Transmit_Buffer[0]);
-        } else {
         /* wait until the device is bound, or timeout and quit */
         found = address_bind_request(Target_Device_Object_Instance,
             &max_apdu, &Target_Address);
@@ -372,7 +368,6 @@ int main(int argc, char *argv[])
             if (elapsed_seconds > timeout_seconds)
                 break;
         }
-        }
         /* keep track of time for next check */
         last_seconds = current_seconds;
     }

bacnet-stack/demo/readprop/readprop.c

@@ -23,7 +23,7 @@
 *
 *********************************************************************/
 
-/* READPROP: command line tool that reads a property from a BACnet device. */
+/* command line tool that sends a BACnet service, and displays the reply */
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -183,8 +183,6 @@ int main(int argc, char *argv[])
     last_seconds = time(NULL);
     timeout_seconds = (Device_APDU_Timeout() / 1000) *
         Device_Number_Of_APDU_Retries();
-    /* no need to spam the world */
-    I_Am_Request = false;
     /* try to bind with the device */
     Send_WhoIs(Target_Device_Object_Instance,
         Target_Device_Object_Instance);
@@ -206,10 +204,6 @@ int main(int argc, char *argv[])
                         last_seconds) * 1000));
         if (Error_Detected)
             break;
-        if (I_Am_Request) {
-            I_Am_Request = false;
-            iam_send(&Handler_Transmit_Buffer[0]);
-        } else {
         /* wait until the device is bound, or timeout and quit */
         found = address_bind_request(Target_Device_Object_Instance,
             &max_apdu, &Target_Address);
@@ -228,7 +222,6 @@ int main(int argc, char *argv[])
             if (elapsed_seconds > timeout_seconds)
                 break;
         }
-        }
         /* keep track of time for next check */
         last_seconds = current_seconds;
     }

bacnet-stack/demo/reinit/main.c

@@ -23,7 +23,7 @@
 *
 *********************************************************************/
 
-/* WRITEPROP: command line tool that writes a property to a BACnet device. */
+/* command line tool that sends a BACnet service, and displays the reply */
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -213,8 +213,6 @@ int main(int argc, char *argv[])
     last_seconds = time(NULL);
     timeout_seconds = (Device_APDU_Timeout() / 1000) *
         Device_Number_Of_APDU_Retries();
-    /* don't send an I-Am unless asked */
-    I_Am_Request = false;
     /* try to bind with the device */
     Send_WhoIs(Target_Device_Object_Instance,
         Target_Device_Object_Instance);
@@ -236,10 +234,6 @@ int main(int argc, char *argv[])
                         last_seconds) * 1000));
         if (Error_Detected)
             break;
-        if (I_Am_Request) {
-            I_Am_Request = false;
-            iam_send(&Handler_Transmit_Buffer[0]);
-        } else {
         /* wait until the device is bound, or timeout and quit */
         found = address_bind_request(Target_Device_Object_Instance,
             &max_apdu, &Target_Address);
@@ -257,7 +251,6 @@ int main(int argc, char *argv[])
             if (elapsed_seconds > timeout_seconds)
                 break;
         }
-        }
         /* keep track of time for next check */
         last_seconds = current_seconds;
     }

bacnet-stack/demo/server/server.c

@@ -45,7 +45,7 @@
 #include "net.h"
 #include "txbuf.h"
 
-/* This is an example application using the BACnet Stack */
+/* This is an example server application using the BACnet Stack */
 
 /* buffers used for receiving */
 static uint8_t Rx_Buf[MAX_MPDU] = { 0 };
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
     /* configure the timeout values */
     last_seconds = time(NULL);
     /* broadcast an I-Am on startup */
-    I_Am_Request = true;
+    iam_send(&Handler_Transmit_Buffer[0]);
     /* loop forever */
     for (;;) {
         /* input */
@@ -151,11 +151,6 @@ int main(int argc, char *argv[])
         /* at least one second has passed */
         if (current_seconds != last_seconds)
             dcc_timer_seconds(current_seconds - last_seconds);
-        /* send out the I-Am if requested */
-        if (I_Am_Request) {
-            I_Am_Request = false;
-            iam_send(&Handler_Transmit_Buffer[0]);
-        }
         /* output */
 
         /* blink LEDs, Turn on or off outputs, etc */

bacnet-stack/demo/writefile/writefile.c

@@ -23,7 +23,7 @@
 *
 *********************************************************************/
 
-/* READFILE: command line tool that writes a file to a BACnet device. */
+/* command line tool that sends a BACnet service, and displays the reply */
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -299,10 +299,6 @@ int main(int argc, char *argv[])
             printf("\r\n");
             break;
         }
-        if (I_Am_Request) {
-            I_Am_Request = false;
-            iam_send(&Handler_Transmit_Buffer[0]);
-        } else {
         /* wait until the device is bound, or timeout and quit */
         found = address_bind_request(Target_Device_Object_Instance,
             &max_apdu, &Target_Address);
@@ -357,7 +353,6 @@ int main(int argc, char *argv[])
             if (elapsed_seconds > timeout_seconds)
                 break;
         }
-        }
         /* keep track of time for next check */
         last_seconds = current_seconds;
     }

bacnet-stack/demo/writeprop/writeprop.c

@@ -23,7 +23,7 @@
 *
 *********************************************************************/
 
-/* WRITEPROP: command line tool that writes a property to a BACnet device. */
+/* command line tool that sends a BACnet service, and displays the reply */
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -309,10 +309,6 @@ int main(int argc, char *argv[])
                         last_seconds) * 1000));
         if (Error_Detected)
             break;
-        if (I_Am_Request) {
-            I_Am_Request = false;
-            iam_send(&Handler_Transmit_Buffer[0]);
-        } else {
         /* wait until the device is bound, or timeout and quit */
         found = address_bind_request(Target_Device_Object_Instance,
             &max_apdu, &Target_Address);
@@ -333,7 +329,6 @@ int main(int argc, char *argv[])
             if (elapsed_seconds > timeout_seconds)
                 break;
         }
-        }
         /* keep track of time for next check */
         last_seconds = current_seconds;
     }