Added BBMD environment setting for demo applications epics, server.

bacnet-stack/demo/epics/main.c

@@ -244,6 +244,92 @@ static uint8_t Read_Properties(
     return invoke_id;
 }
 
+static void Init_DataLink(void)
+{
+    char *pEnv = NULL;
+#if defined(BACDL_BIP) && BBMD_ENABLED
+    long bbmd_port = 0xBAC0;
+    long bbmd_address = 0;
+    long bbmd_timetolive_seconds = 60000;
+#endif
+
+#if defined(BACDL_ALL)
+    pEnv = getenv("BACNET_DATALINK");
+    if (pEnv) {
+        datalink_set(pEnv));
+    } else {
+        datalink_set(NULL);
+    }
+#endif
+    
+#if defined(BACDL_BIP)
+    pEnv = getenv("BACNET_IP_PORT");
+    if (pEnv) {
+        bip_set_port(strtol(pEnv, NULL, 0));
+    } else {
+        bip_set_port(0xBAC0);
+    }
+#elif defined(BACDL_MSTP)
+    pEnv = getenv("BACNET_MAX_INFO_FRAMES");
+    if (pEnv) {
+        dlmstp_set_max_info_frames(strtol(pEnv, NULL, 0));
+    } else {
+        dlmstp_set_max_info_frames(1);
+    }
+    pEnv = getenv("BACNET_MAX_MASTER");
+    if (pEnv) {
+        dlmstp_set_max_master(strtol(pEnv, NULL, 0));
+    } else {
+        dlmstp_set_max_master(127);
+    }
+    pEnv = getenv("BACNET_MSTP_BAUD");
+    if (pEnv) {
+        RS485_Set_Baud_Rate(strtol(pEnv, NULL, 0));
+    } else {
+        RS485_Set_Baud_Rate(38400);
+    }
+    pEnv = getenv("BACNET_MSTP_MAC");
+    if (pEnv) {
+        dlmstp_set_mac_address(strtol(pEnv, NULL, 0));
+    } else {
+        dlmstp_set_mac_address(127);
+    }
+#endif
+    if (!datalink_init(getenv("BACNET_IFACE"))) {
+        exit(1);
+    }
+#if defined(BACDL_BIP) && BBMD_ENABLED
+    pEnv = getenv("BACNET_BBMD_PORT");
+    if (pEnv) {
+        bbmd_port = strtol(pEnv, NULL, 0);
+        if (bbmd_port > 0xFFFF) {
+            bbmd_port = 0xBAC0;
+        }
+    }
+    pEnv = getenv("BACNET_BBMD_TIMETOLIVE");
+    if (pEnv) {
+        bbmd_timetolive_seconds = strtol(pEnv, NULL, 0);
+        if (bbmd_timetolive_seconds > 0xFFFF) {
+            bbmd_timetolive_seconds = 0xFFFF;
+        }
+    }
+    pEnv = getenv("BACNET_BBMD_ADDRESS");
+    if (pEnv) {
+        bbmd_address = bip_getaddrbyname(pEnv);
+        if (bbmd_address) {
+            struct in_addr addr;
+            addr.s_addr = bbmd_address;
+            printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
+                inet_ntoa(addr),bbmd_port, bbmd_timetolive_seconds);
+            bvlc_register_with_bbmd(
+                bbmd_address,
+                bbmd_port,
+                bbmd_timetolive_seconds);
+        }
+    }
+#endif
+}
+
 int main(
     int argc,
     char *argv[])
@@ -278,8 +364,7 @@ int main(
     Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
     address_init();
     Init_Service_Handlers();
-    if (!datalink_init(getenv("BACNET_IFACE")))
+    Init_DataLink();
-        return 1;
     /* configure the timeout values */
     last_seconds = time(NULL);
     timeout_seconds =

bacnet-stack/demo/server/main.c

@@ -98,6 +98,92 @@ static void cleanup(
     datalink_cleanup();
 }
 
+static void Init_DataLink(void)
+{
+    char *pEnv = NULL;
+#if defined(BACDL_BIP) && BBMD_ENABLED
+    long bbmd_port = 0xBAC0;
+    long bbmd_address = 0;
+    long bbmd_timetolive_seconds = 60000;
+#endif
+
+#if defined(BACDL_ALL)
+    pEnv = getenv("BACNET_DATALINK");
+    if (pEnv) {
+        datalink_set(pEnv));
+    } else {
+        datalink_set(NULL);
+    }
+#endif
+    
+#if defined(BACDL_BIP)
+    pEnv = getenv("BACNET_IP_PORT");
+    if (pEnv) {
+        bip_set_port(strtol(pEnv, NULL, 0));
+    } else {
+        bip_set_port(0xBAC0);
+    }
+#elif defined(BACDL_MSTP)
+    pEnv = getenv("BACNET_MAX_INFO_FRAMES");
+    if (pEnv) {
+        dlmstp_set_max_info_frames(strtol(pEnv, NULL, 0));
+    } else {
+        dlmstp_set_max_info_frames(1);
+    }
+    pEnv = getenv("BACNET_MAX_MASTER");
+    if (pEnv) {
+        dlmstp_set_max_master(strtol(pEnv, NULL, 0));
+    } else {
+        dlmstp_set_max_master(127);
+    }
+    pEnv = getenv("BACNET_MSTP_BAUD");
+    if (pEnv) {
+        RS485_Set_Baud_Rate(strtol(pEnv, NULL, 0));
+    } else {
+        RS485_Set_Baud_Rate(38400);
+    }
+    pEnv = getenv("BACNET_MSTP_MAC");
+    if (pEnv) {
+        dlmstp_set_mac_address(strtol(pEnv, NULL, 0));
+    } else {
+        dlmstp_set_mac_address(127);
+    }
+#endif
+    if (!datalink_init(getenv("BACNET_IFACE"))) {
+        exit(1);
+    }
+#if defined(BACDL_BIP) && BBMD_ENABLED
+    pEnv = getenv("BACNET_BBMD_PORT");
+    if (pEnv) {
+        bbmd_port = strtol(pEnv, NULL, 0);
+        if (bbmd_port > 0xFFFF) {
+            bbmd_port = 0xBAC0;
+        }
+    }
+    pEnv = getenv("BACNET_BBMD_TIMETOLIVE");
+    if (pEnv) {
+        bbmd_timetolive_seconds = strtol(pEnv, NULL, 0);
+        if (bbmd_timetolive_seconds > 0xFFFF) {
+            bbmd_timetolive_seconds = 0xFFFF;
+        }
+    }
+    pEnv = getenv("BACNET_BBMD_ADDRESS");
+    if (pEnv) {
+        bbmd_address = bip_getaddrbyname(pEnv);
+        if (bbmd_address) {
+            struct in_addr addr;
+            addr.s_addr = bbmd_address;
+            printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
+                inet_ntoa(addr),bbmd_port, bbmd_timetolive_seconds);
+            bvlc_register_with_bbmd(
+                bbmd_address,
+                bbmd_port,
+                bbmd_timetolive_seconds);
+        }
+    }
+#endif
+}
+
 int main(
     int argc,
     char *argv[])
@@ -109,59 +195,16 @@ int main(
     time_t current_seconds = 0;
     uint32_t elapsed_seconds = 0;
     uint32_t elapsed_milliseconds = 0;
-    char *pEnv = NULL;
 
     /* allow the device ID to be set */
     if (argc > 1)
         Device_Set_Object_Instance_Number(strtol(argv[1], NULL, 0));
-#if defined(BACDL_ALL)
-    pEnv = getenv("BACNET_DATALINK");
-    if (pEnv) {
-        datalink_set(pEnv));
-    } else {
-        datalink_set(NULL);
-    }
-#endif
-#if defined(BACDL_BIP)
-        pEnv = getenv("BACNET_IP_PORT");
-        if (pEnv) {
-            bip_set_port(strtol(pEnv, NULL, 0));
-        } else {
-            bip_set_port(0xBAC0);
-        }
-#elif defined(BACDL_MSTP)
-        pEnv = getenv("BACNET_MAX_INFO_FRAMES");
-        if (pEnv) {
-            dlmstp_set_max_info_frames(strtol(pEnv, NULL, 0));
-        } else {
-            dlmstp_set_max_info_frames(1);
-        }
-        pEnv = getenv("BACNET_MAX_MASTER");
-        if (pEnv) {
-            dlmstp_set_max_master(strtol(pEnv, NULL, 0));
-        } else {
-            dlmstp_set_max_master(127);
-        }
-        pEnv = getenv("BACNET_MSTP_BAUD");
-        if (pEnv) {
-            RS485_Set_Baud_Rate(strtol(pEnv, NULL, 0));
-        } else {
-            RS485_Set_Baud_Rate(38400);
-        }
-        pEnv = getenv("BACNET_MSTP_MAC");
-        if (pEnv) {
-            dlmstp_set_mac_address(strtol(pEnv, NULL, 0));
-        } else {
-            dlmstp_set_mac_address(127);
-        }
-#endif
         printf("BACnet Server Demo\n" "BACnet Stack Version %s\n"
             "BACnet Device ID: %u\n" "Max APDU: %d\n", BACnet_Version,
             Device_Object_Instance_Number(), MAX_APDU);
         Init_Service_Handlers();
         BIP_Debug = true;
-        if (!datalink_init(getenv("BACNET_IFACE")))
+        Init_DataLink();
-            return 1;
         atexit(cleanup);
         /* configure the timeout values */
         last_seconds = time(NULL);

bacnet-stack/demo/whois/main.c

@@ -139,6 +139,92 @@ static void print_address_cache(
     }
 }
 
+static void Init_DataLink(void)
+{
+    char *pEnv = NULL;
+#if defined(BACDL_BIP) && BBMD_ENABLED
+    long bbmd_port = 0xBAC0;
+    long bbmd_address = 0;
+    long bbmd_timetolive_seconds = 60000;
+#endif
+
+#if defined(BACDL_ALL)
+    pEnv = getenv("BACNET_DATALINK");
+    if (pEnv) {
+        datalink_set(pEnv));
+    } else {
+        datalink_set(NULL);
+    }
+#endif
+    
+#if defined(BACDL_BIP)
+    pEnv = getenv("BACNET_IP_PORT");
+    if (pEnv) {
+        bip_set_port(strtol(pEnv, NULL, 0));
+    } else {
+        bip_set_port(0xBAC0);
+    }
+#elif defined(BACDL_MSTP)
+    pEnv = getenv("BACNET_MAX_INFO_FRAMES");
+    if (pEnv) {
+        dlmstp_set_max_info_frames(strtol(pEnv, NULL, 0));
+    } else {
+        dlmstp_set_max_info_frames(1);
+    }
+    pEnv = getenv("BACNET_MAX_MASTER");
+    if (pEnv) {
+        dlmstp_set_max_master(strtol(pEnv, NULL, 0));
+    } else {
+        dlmstp_set_max_master(127);
+    }
+    pEnv = getenv("BACNET_MSTP_BAUD");
+    if (pEnv) {
+        RS485_Set_Baud_Rate(strtol(pEnv, NULL, 0));
+    } else {
+        RS485_Set_Baud_Rate(38400);
+    }
+    pEnv = getenv("BACNET_MSTP_MAC");
+    if (pEnv) {
+        dlmstp_set_mac_address(strtol(pEnv, NULL, 0));
+    } else {
+        dlmstp_set_mac_address(127);
+    }
+#endif
+    if (!datalink_init(getenv("BACNET_IFACE"))) {
+        exit(1);
+    }
+#if defined(BACDL_BIP) && BBMD_ENABLED
+    pEnv = getenv("BACNET_BBMD_PORT");
+    if (pEnv) {
+        bbmd_port = strtol(pEnv, NULL, 0);
+        if (bbmd_port > 0xFFFF) {
+            bbmd_port = 0xBAC0;
+        }
+    }
+    pEnv = getenv("BACNET_BBMD_TIMETOLIVE");
+    if (pEnv) {
+        bbmd_timetolive_seconds = strtol(pEnv, NULL, 0);
+        if (bbmd_timetolive_seconds > 0xFFFF) {
+            bbmd_timetolive_seconds = 0xFFFF;
+        }
+    }
+    pEnv = getenv("BACNET_BBMD_ADDRESS");
+    if (pEnv) {
+        bbmd_address = bip_getaddrbyname(pEnv);
+        if (bbmd_address) {
+            struct in_addr addr;
+            addr.s_addr = bbmd_address;
+            printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
+                inet_ntoa(addr),bbmd_port, bbmd_timetolive_seconds);
+            bvlc_register_with_bbmd(
+                bbmd_address,
+                bbmd_port,
+                bbmd_timetolive_seconds);
+        }
+    }
+#endif
+}
+
 int main(
     int argc,
     char *argv[])
@@ -151,12 +237,6 @@ int main(
     time_t last_seconds = 0;
     time_t current_seconds = 0;
     time_t timeout_seconds = 0;
-    char *pEnv = NULL;
-#if defined(BACDL_BIP) && BBMD_ENABLED
-    long bbmd_port = 0xBAC0;
-    long bbmd_address = 0;
-    long bbmd_timetolive_seconds = 60000;
-#endif
 
     if (argc < 2) {
         printf
@@ -196,47 +276,7 @@ int main(
     /* setup my info */
     Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
     Init_Service_Handlers();
-#if defined(BACDL_BIP)
+    Init_DataLink();
-    pEnv = getenv("BACNET_IP_PORT");
-    if (pEnv) {
-        bip_set_port(strtol(pEnv, NULL, 0));
-    } else {
-        bip_set_port(0xBAC0);
-    }
-#endif
-    if (!datalink_init(getenv("BACNET_IFACE"))) {
-        return 1;
-    }
-#if defined(BACDL_BIP) && BBMD_ENABLED
-    pEnv = getenv("BACNET_BBMD_PORT");
-    if (pEnv) {
-        bbmd_port = strtol(pEnv, NULL, 0);
-        if (bbmd_port > 0xFFFF) {
-            bbmd_port = 0xBAC0;
-        }
-    }
-    pEnv = getenv("BACNET_BBMD_TIMETOLIVE");
-    if (pEnv) {
-        bbmd_timetolive_seconds = strtol(pEnv, NULL, 0);
-        if (bbmd_timetolive_seconds > 0xFFFF) {
-            bbmd_timetolive_seconds = 0xFFFF;
-        }
-    }
-    pEnv = getenv("BACNET_BBMD_ADDRESS");
-    if (pEnv) {
-        bbmd_address = bip_getaddrbyname(pEnv);
-        if (bbmd_address) {
-            struct in_addr addr;
-            addr.s_addr = bbmd_address;
-            printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
-                inet_ntoa(addr),bbmd_port, bbmd_timetolive_seconds);
-            bvlc_register_with_bbmd(
-                bbmd_address,
-                bbmd_port,
-                bbmd_timetolive_seconds);
-        }
-    }
-#endif
     /* configure the timeout values */
     last_seconds = time(NULL);
     timeout_seconds = Device_APDU_Timeout() / 1000;