pre-commit

CMakeLists.txt

@@ -68,7 +68,7 @@ option(
   BACDL_BSC
   "compile with secure-connect support"
   OFF)
-  
+
 if(NOT (BACDL_ETHERNET OR
         BACDL_MSTP OR
         BACDL_ARCNET OR
@@ -1080,6 +1080,12 @@ if(BACDL_BSC)
 endif()
 endif()
 
+add_subdirectory(test/bacnet/datalink/bsc-datalink)
+add_subdirectory(test/bacnet/datalink/bsc-node)
+add_subdirectory(test/bacnet/datalink/bsc-socket)
+add_subdirectory(test/bacnet/datalink/bvlc-sc)
+add_subdirectory(test/bacnet/datalink/hub-sc)
+add_subdirectory(test/bacnet/datalink/websockets)
 #
 # install
 #

apps/sc-hub/main.c

@@ -89,22 +89,30 @@ static void print_usage(const char *filename)
 
 static void print_help(const char *filename)
 {
-    printf("Simulate a BACnet/SC HUB device\n"
+    printf(
+        "Simulate a BACnet/SC HUB device\n"
         "device-instance: BACnet Device Object Instance number that you are\n"
         "trying simulate.\n"
         "device-name: The Device name in ASCII for this device.\n"
         "\n");
     printf("Other parameters are passing over environment variables:\n"
-        "- BACNET_SC_ISSUER_1_CERTIFICATE_FILE: Filename of CA certificate\n"
-        "- BACNET_SC_OPERATIONAL_CERTIFICATE_FILE: Filename of device certificate\n"
-        "- BACNET_SC_OPERATIONAL_CERTIFICATE_PRIVATE_KEY_FILE: Filename of device certificate key\n"
-        "- BACNET_SC_HUB_FUNCTION_BINDING: Local port or pair \"interface name:port number\"\n"
-        "For additional information see file bin/bsc-server.sh\n");
-    printf("\nExample:\n"
+           "- BACNET_SC_ISSUER_1_CERTIFICATE_FILE: Filename of CA certificate\n"
+           "- BACNET_SC_OPERATIONAL_CERTIFICATE_FILE: Filename of device "
+           "certificate\n"
+           "- BACNET_SC_OPERATIONAL_CERTIFICATE_PRIVATE_KEY_FILE: Filename of "
+           "device certificate key\n"
+           "- BACNET_SC_HUB_FUNCTION_BINDING: Local port or pair \"interface "
+           "name:port number\"\n"
+           "For additional information see file bin/bsc-server.sh\n");
+    printf(
+        "\nExample:\n"
         "To simulate Device 111, use following command:\n"
-        "%s 111\n", filename);
-    printf("To simulate Device 111 named NoFred, use following command:\n"
-        "%s 111 NoFred\n", filename);
+        "%s 111\n",
+        filename);
+    printf(
+        "To simulate Device 111 named NoFred, use following command:\n"
+        "%s 111 NoFred\n",
+        filename);
 }
 
 /** Main function of server demo.
@@ -157,8 +165,9 @@ int main(int argc, char *argv[])
 
 #if defined(BAC_UCI)
     ctx = ucix_init("bacnet_dev");
-    if (!ctx)
+    if (!ctx) {
         fprintf(stderr, "Failed to load config file bacnet_dev\n");
+    }
     uciId = ucix_get_option_int(ctx, "bacnet_dev", "0", "Id", 0);
     if (uciId != 0) {
         Device_Set_Object_Instance_Number(uciId);
@@ -174,10 +183,11 @@ int main(int argc, char *argv[])
     ucix_cleanup(ctx);
 #endif /* defined(BAC_UCI) */
 
-    printf("BACnet SC Hub Demo\n"
-           "BACnet Stack Version %s\n"
-           "BACnet Device ID: %u\n"
-           "Max APDU: %d\n",
+    printf(
+        "BACnet SC Hub Demo\n"
+        "BACnet Stack Version %s\n"
+        "BACnet Device ID: %u\n"
+        "Max APDU: %d\n",
         BACnet_Version, Device_Object_Instance_Number(), MAX_APDU);
     /* load any static address bindings to show up
        in our device bindings list */
@@ -186,8 +196,9 @@ int main(int argc, char *argv[])
 #if defined(BAC_UCI)
     const char *uciname;
     ctx = ucix_init("bacnet_dev");
-    if (!ctx)
+    if (!ctx) {
         fprintf(stderr, "Failed to load config file bacnet_dev\n");
+    }
     uciname = ucix_get_option(ctx, "bacnet_dev", "0", "Name");
     if (uciname != 0) {
         Device_Object_Name_ANSI_Init(uciname);
@@ -200,7 +211,7 @@ int main(int argc, char *argv[])
     }
     ucix_cleanup(ctx);
 #endif /* defined(BAC_UCI) */
-    if (Device_Object_Name(Device_Object_Instance_Number(),&DeviceName)) {
+    if (Device_Object_Name(Device_Object_Instance_Number(), &DeviceName)) {
         printf("BACnet Device Name: %s\n", DeviceName.value);
     }
     dlenv_init();

ports/bsd/websocket-global.c

@@ -109,4 +109,3 @@ void bsc_websocket_init_log(void)
     }
     bsc_websocket_global_unlock();
 }
-

ports/bsd/websocket-global.h

@@ -1,11 +1,11 @@
 /**
- * @file 
+ * @file
  * @brief Global websocket functions
  * @author Kirill Neznamov
  * @date May 2022
  * @section LICENSE
  *
- * Copyright (C) 2022 Legrand North America, LLC 
+ * Copyright (C) 2022 Legrand North America, LLC
  * as an unpublished work.
  *
  * SPDX-License-Identifier: MIT

ports/linux/bsc-event.c

@@ -100,10 +100,9 @@ void bsc_event_wait(BSC_EVENT *ev)
     if (!ev->counter) {
         ev->v = false;
         DEBUG_PRINTF("bsc_event_wait() reset ev\n");
-    }
-    else {
-       DEBUG_PRINTF("bsc_event_wait() wake up other waiting threads\n");
-       pthread_cond_broadcast(&ev->cond);
+    } else {
+        DEBUG_PRINTF("bsc_event_wait() wake up other waiting threads\n");
+        pthread_cond_broadcast(&ev->cond);
     }
     DEBUG_PRINTF("bsc_event_wait() <<< ev = %p\n", ev);
     pthread_mutex_unlock(&ev->mutex);
@@ -120,8 +119,9 @@ bool bsc_event_timedwait(BSC_EVENT *ev, unsigned int ms_timeout)
     to.tv_sec += to.tv_nsec / 1000000000;
     to.tv_nsec %= 1000000000;
 
-    DEBUG_PRINTF("bsc_event_timedwait() >>> before lock ev = %p ev->v = %d\n",
-        ev, ev->v);
+    DEBUG_PRINTF(
+        "bsc_event_timedwait() >>> before lock ev = %p ev->v = %d\n", ev,
+        ev->v);
 
     pthread_mutex_lock(&ev->mutex);
 
@@ -138,8 +138,8 @@ bool bsc_event_timedwait(BSC_EVENT *ev, unsigned int ms_timeout)
         }
     }
 
-    if(ev->v) {
-        if(r!=0) {
+    if (ev->v) {
+        if (r != 0) {
             DEBUG_PRINTF("Fired!!! r = %d\n", r);
         }
         r = 0;
@@ -149,13 +149,11 @@ bool bsc_event_timedwait(BSC_EVENT *ev, unsigned int ms_timeout)
     DEBUG_PRINTF("bsc_event_timedwait() counter %zu\n", ev->counter);
 
     if (!ev->counter) {
-        DEBUG_PRINTF(
-            "bsc_event_timedwait() event is reset, err = %d\n", r);
+        DEBUG_PRINTF("bsc_event_timedwait() event is reset, err = %d\n", r);
         ev->v = false;
-    }
-    else {
-       DEBUG_PRINTF("bsc_event_timedwait() wake up other waiting threads\n");
-       pthread_cond_broadcast(&ev->cond);
+    } else {
+        DEBUG_PRINTF("bsc_event_timedwait() wake up other waiting threads\n");
+        pthread_cond_broadcast(&ev->cond);
     }
 
     DEBUG_PRINTF(