Feature/sc code master

.github/workflows/gcc.yml

@@ -17,6 +17,12 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libconfig-dev
+        sudo apt-get install -qq libcap-dev
+        sudo apt-get install -qq libssl-dev
+        #sudo apt-get install -qq libwebsockets-dev
+        git clone https://libwebsockets.org/repo/libwebsockets
+        bash -c 'cd libwebsockets;git checkout v4.3-stable;mkdir build;cd build;cmake ..;make'
+        sudo bash -c 'cd libwebsockets;cd build;make install'
     - name: Build Demo Apps GNU89
       run: |
         gcc --version
@@ -43,6 +49,12 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libconfig-dev
+        sudo apt-get install -qq libcap-dev
+        sudo apt-get install -qq libssl-dev
+        #sudo apt-get install -qq libwebsockets-dev
+        git clone https://libwebsockets.org/repo/libwebsockets
+        bash -c 'cd libwebsockets;git checkout v4.3-stable;mkdir build;cd build;cmake ..;make'
+        sudo bash -c 'cd libwebsockets;cd build;make install'
     - name: Build Demo Apps BBMD=none
       run: |
         gcc --version
@@ -57,6 +69,12 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libconfig-dev
+        sudo apt-get install -qq libcap-dev
+        sudo apt-get install -qq libssl-dev
+        #sudo apt-get install -qq libwebsockets-dev
+        git clone https://libwebsockets.org/repo/libwebsockets
+        bash -c 'cd libwebsockets;git checkout v4.3-stable;mkdir build;cd build;cmake ..;make'
+        sudo bash -c 'cd libwebsockets;cd build;make install'
     - name: Build Demo Apps BBMD=client
       run: |
         gcc --version
@@ -71,12 +89,38 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libconfig-dev
+        sudo apt-get install -qq libcap-dev
+        sudo apt-get install -qq libssl-dev
+        #sudo apt-get install -qq libwebsockets-dev
+        git clone https://libwebsockets.org/repo/libwebsockets
+        bash -c 'cd libwebsockets;git checkout v4.3-stable;mkdir build;cd build;cmake ..;make'
+        sudo bash -c 'cd libwebsockets;cd build;make install'
     - name: Build Gateway Demo
       run: |
         gcc --version
         make clean
         make LEGACY=true gateway
 
+  bacnet-sc-hub:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Create BACnet/SC Build Environment
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get install -qq libconfig-dev
+        sudo apt-get install -qq libcap-dev
+        sudo apt-get install -qq libssl-dev
+        #sudo apt-get install -qq libwebsockets-dev
+        git clone https://libwebsockets.org/repo/libwebsockets
+        bash -c 'cd libwebsockets;git checkout v4.3-stable;mkdir build;cd build;cmake ..;make'
+        sudo bash -c 'cd libwebsockets;cd build;make install'
+    - name: Build BACnet/SC Hub Demo
+      run: |
+        gcc --version
+        make clean
+        make sc-hub
+
   router:
     runs-on: ubuntu-latest
     steps:
@@ -85,6 +129,12 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libconfig-dev
+        sudo apt-get install -qq libcap-dev
+        sudo apt-get install -qq libssl-dev
+        #sudo apt-get install -qq libwebsockets-dev #Ubuntu 24
+        git clone https://libwebsockets.org/repo/libwebsockets
+        bash -c 'cd libwebsockets;git checkout v4.3-stable;mkdir build;cd build;cmake ..;make'
+        sudo bash -c 'cd libwebsockets;cd build;make install'
     - name: Build Router Demo
       run: |
         gcc --version
@@ -99,6 +149,12 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libconfig-dev
+        sudo apt-get install -qq libcap-dev
+        sudo apt-get install -qq libssl-dev
+        #sudo apt-get install -qq libwebsockets-dev
+        git clone https://libwebsockets.org/repo/libwebsockets
+        bash -c 'cd libwebsockets;git checkout v4.3-stable;mkdir build;cd build;cmake ..;make'
+        sudo bash -c 'cd libwebsockets;cd build;make install'
     - name: Build Router IPv6 Demo
       run: |
         gcc --version
@@ -113,6 +169,12 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libconfig-dev
+        sudo apt-get install -qq libcap-dev
+        sudo apt-get install -qq libssl-dev
+        #sudo apt-get install -qq libwebsockets-dev
+        git clone https://libwebsockets.org/repo/libwebsockets
+        bash -c 'cd libwebsockets;git checkout v4.3-stable;mkdir build;cd build;cmake ..;make'
+        sudo bash -c 'cd libwebsockets;cd build;make install'
     - name: Build Router MSTP Demo
       run: |
         gcc --version
@@ -127,6 +189,12 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libconfig-dev
+        sudo apt-get install -qq libcap-dev
+        sudo apt-get install -qq libssl-dev
+        #sudo apt-get install -qq libwebsockets-dev
+        git clone https://libwebsockets.org/repo/libwebsockets
+        bash -c 'cd libwebsockets;git checkout v4.3-stable;mkdir build;cd build;cmake ..;make'
+        sudo bash -c 'cd libwebsockets;cd build;make install'
     - name: Build BACnet/IPv6 Demo Apps
       run: |
         gcc --version
@@ -141,6 +209,12 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libconfig-dev
+        sudo apt-get install -qq libcap-dev
+        sudo apt-get install -qq libssl-dev
+        #sudo apt-get install -qq libwebsockets-dev
+        git clone https://libwebsockets.org/repo/libwebsockets
+        bash -c 'cd libwebsockets;git checkout v4.3-stable;mkdir build;cd build;cmake ..;make'
+        sudo bash -c 'cd libwebsockets;cd build;make install'
     - name: Build MSTP Demo Apps
       run: |
         gcc --version
@@ -156,6 +230,11 @@ jobs:
         sudo apt-get update -qq
         sudo apt-get install -qq libconfig-dev
         sudo apt-get install -qq libcap-dev
+        sudo apt-get install -qq libssl-dev
+        #sudo apt-get install -qq libwebsockets-dev
+        git clone https://libwebsockets.org/repo/libwebsockets
+        bash -c 'cd libwebsockets;git checkout v4.3-stable;mkdir build;cd build;cmake ..;make'
+        sudo bash -c 'cd libwebsockets;cd build;make install'
     - name: Build Ethernet Demo Apps
       run: |
         gcc --version

.github/workflows/lint.yml

@@ -88,5 +88,11 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq lcov
+        sudo apt-get install -qq libconfig-dev
+        sudo apt-get install -qq libcap-dev
+        sudo apt-get install -qq libssl-dev
+        git clone https://libwebsockets.org/repo/libwebsockets
+        bash -c 'cd libwebsockets;git checkout v4.3-stable;mkdir build;cd build;cmake ..;make'
+        sudo bash -c 'cd libwebsockets;cd build;make install'
     - name: Run Unit Test with Code Coverage
       run: make test

.github/workflows/main.yml

@@ -30,11 +30,22 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Install Dependencies (Ubuntu)
-      if: matrix.os == 'ubuntu-latest' && matrix.project == 'root'
+      if: matrix.os == 'ubuntu-latest'
       run: |
         sudo apt-get update
         # apps/router needs libconfig-dev.
         sudo apt-get install -y libconfig-dev
+        sudo apt-get install -y libcap-dev
+        sudo apt-get install -y libssl-dev
+        #sudo apt-get install -qq libwebsockets-dev
+        git clone https://libwebsockets.org/repo/libwebsockets
+        bash -c 'cd libwebsockets;git checkout v4.3-stable;mkdir build;cd build;cmake ..;make'
+        sudo bash -c 'cd libwebsockets;cd build;make install'
+
+    - name: Install Dependencies (macOS)
+      if: matrix.os == 'macOS-latest'
+      run: |
+        brew install libwebsockets
 
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory

CMakeLists.txt

@@ -69,11 +69,17 @@ option(
   "compile with ipv6 datalink support"
   ON)
 
+option(
+  BACDL_BSC
+  "compile with secure-connect support"
+  OFF)
+
 if(NOT (BACDL_ETHERNET OR
         BACDL_MSTP OR
         BACDL_ARCNET OR
         BACDL_BIP OR
         BACDL_BIP6 OR
+        BACDL_BSC OR
         BACDL_CUSTOM))
   add_definitions(-DBACDL_NONE)
 endif()
@@ -206,6 +212,15 @@ if(UCI)
   endif()
 endif()
 
+if(BACDL_BSC)
+  find_package(libwebsockets CONFIG REQUIRED)
+  find_package(PkgConfig)
+  pkg_check_modules(LIB_WEBSOCKETS REQUIRED libwebsockets)
+  #libwebsocket need C99 with variadic-macros
+  add_compile_options(-Wno-variadic-macros)
+  find_package(OpenSSL)
+endif()
+
 add_library(${PROJECT_NAME}
   src/bacnet/abort.c
   src/bacnet/abort.h
@@ -266,6 +281,22 @@ add_library(${PROJECT_NAME}
   $<$<BOOL:${BACDL_BIP6}>:src/bacnet/basic/bbmd6/h_bbmd6.h>
   $<$<BOOL:${BACDL_BIP6}>:src/bacnet/basic/bbmd6/vmac.c>
   $<$<BOOL:${BACDL_BIP6}>:src/bacnet/basic/bbmd6/vmac.h>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bvlc-sc.c>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bvlc-sc.h>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bsc-socket.c>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bsc-socket.h>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bsc-util.h>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bsc-util.c>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bsc-hub-connector.h>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bsc-hub-connector.c>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bsc-hub-function.h>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bsc-hub-function.c>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bsc-node-switch.h>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bsc-node-switch.c>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bsc-node.h>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bsc-node.c>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bsc-datalink.h>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/datalink/bsc/bsc-datalink.c>
   src/bacnet/basic/binding/address.c
   src/bacnet/basic/binding/address.h
   src/bacnet/basic/npdu/h_npdu.c
@@ -343,6 +374,8 @@ add_library(${PROJECT_NAME}
   src/bacnet/basic/object/nc.h
   src/bacnet/basic/object/netport.c
   src/bacnet/basic/object/netport.h
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/basic/object/sc_netport.c>
+  $<$<BOOL:${BACDL_BSC}>:src/bacnet/basic/object/sc_netport.h>
   src/bacnet/basic/object/objects.c
   src/bacnet/basic/object/objects.h
   src/bacnet/basic/object/osv.c
@@ -620,6 +653,7 @@ target_compile_definitions(
   PUBLIC
   BACNET_PROTOCOL_REVISION=${BACNET_PROTOCOL_REVISION}
   $<$<BOOL:${BACDL_BIP}>:BACDL_BIP>
+  $<$<BOOL:${BACDL_BSC}>:BACDL_BSC>
   $<$<BOOL:${BACDL_BIP6}>:BACDL_BIP6>
   $<$<BOOL:${BACDL_ARCNET}>:BACDL_ARCNET>
   $<$<BOOL:${BACDL_MSTP}>:BACDL_MSTP>
@@ -631,7 +665,12 @@ target_compile_definitions(
   $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:BACNET_STACK_STATIC_DEFINE>
   PRIVATE
   PRINT_ENABLED=1)
-target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads)
+
+if(BACDL_BSC)
+  target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads ${LIB_WEBSOCKETS_LIBRARIES} )
+else()
+  target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads)
+endif()
 
 add_library(
   ${PROJECT_NAME}::${PROJECT_NAME}
@@ -662,6 +701,10 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     $<$<BOOL:${BACDL_MSTP}>:ports/linux/dlmstp.c>
     $<$<BOOL:${BACDL_MSTP}>:ports/linux/dlmstp_linux.c>
     $<$<BOOL:${BACDL_MSTP}>:ports/linux/dlmstp_linux.h>
+    $<$<BOOL:${BACDL_BSC}>:ports/linux/bsc-event.c>
+    $<$<BOOL:${BACDL_BSC}>:ports/linux/websocket-cli.c>
+    $<$<BOOL:${BACDL_BSC}>:ports/linux/websocket-srv.c>
+    $<$<BOOL:${BACDL_BSC}>:ports/linux/websocket-mutex.c>
     $<$<BOOL:${BACDL_ETHERNET}>:ports/linux/ethernet.c>
     ports/linux/mstimer-init.c)
 
@@ -727,6 +770,10 @@ elseif(APPLE)
     $<$<BOOL:${BACDL_MSTP}>:ports/bsd/rs485.c>
     $<$<BOOL:${BACDL_MSTP}>:ports/bsd/rs485.h>
     $<$<BOOL:${BACDL_MSTP}>:ports/bsd/dlmstp.c>
+    $<$<BOOL:${BACDL_BSC}>:ports/bsd/bsc-event.c>
+    $<$<BOOL:${BACDL_BSC}>:ports/bsd/websocket-cli.c>
+    $<$<BOOL:${BACDL_BSC}>:ports/bsd/websocket-srv.c>
+    $<$<BOOL:${BACDL_BSC}>:ports/bsd/websocket-mutex.c>
     ports/bsd/datetime-init.c
     ports/bsd/mstimer-init.c
     ports/bsd/stdbool.h)
@@ -758,7 +805,11 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
 
   target_sources(${PROJECT_NAME} PRIVATE
     ports/bsd/bacport.h
-    ports/bsd/bip-init.c
+    $<$<BOOL:${BACDL_BIP}>:ports/bsd/bip-init.c>
+    $<$<BOOL:${BACDL_BSC}>:ports/bsd/bsc-event.c>
+    $<$<BOOL:${BACDL_BSC}>:ports/bsd/websocket-cli.c>
+    $<$<BOOL:${BACDL_BSC}>:ports/bsd/websocket-srv.c>
+    $<$<BOOL:${BACDL_BSC}>:ports/bsd/websocket-mutex.c>
     ports/bsd/datetime-init.c
     ports/bsd/mstimer-init.c
     ports/bsd/stdbool.h)
@@ -874,7 +925,7 @@ if(BACNET_STACK_BUILD_APPS)
     )
   endif(BACNET_BUILD_BACDISCOVER_APP)
 
-  if(BACDL_BIP)
+  if(BACDL_BIP AND (NOT BACDL_BSC))
     add_executable(readbdt apps/readbdt/main.c)
     target_link_libraries(readbdt PRIVATE ${PROJECT_NAME})
 
@@ -998,6 +1049,13 @@ if(BACNET_STACK_BUILD_APPS)
 
   add_executable(writepropm apps/writepropm/main.c)
   target_link_libraries(writepropm PRIVATE ${PROJECT_NAME})
+  if(BACDL_BSC)
+    #add_executable(sc-node apps/sc-node/main.c)
+    #target_link_libraries(sc-node PRIVATE ${PROJECT_NAME})
+
+    add_executable(sc-hub apps/sc-hub/main.c)
+    target_link_libraries(sc-hub PRIVATE ${PROJECT_NAME})
+  endif()
 endif()
 
 #
@@ -1058,6 +1116,7 @@ message(STATUS "BACNET: BACNET_PROTOCOL_REVISION:.......\"${BACNET_PROTOCOL_REVI
 message(STATUS "BACNET: Selected datalinks:")
 message(STATUS "BACNET: BACDL_BIP6:.....................\"${BACDL_BIP6}\"")
 message(STATUS "BACNET: BACDL_BIP:......................\"${BACDL_BIP}\"")
+message(STATUS "BACNET: BACDL_BSC:......................\"${BACDL_BSC}\"")
 message(STATUS "BACNET: BACDL_ARCNET:...................\"${BACDL_ARCNET}\"")
 message(STATUS "BACNET: BACDL_MSTP:.....................\"${BACDL_MSTP}\"")
 message(STATUS "BACNET: BACDL_ETHERNET:.................\"${BACDL_ETHERNET}\"")

Makefile

@@ -52,6 +52,10 @@ bip:
 bip-client:
 	$(MAKE) BACDL=bip BBMD=client -s -C apps all
 
+.PHONY: bsc
+bsc:
+	$(MAKE) BACDL=bsc -s -C apps all
+
 .PHONY: ethernet
 ethernet:
 	$(MAKE) BACDL=ethernet -s -C apps all
@@ -184,6 +188,10 @@ server-client:
 server-discover:
 	$(MAKE) LEGACY=true -s -C apps $@
 
+.PHONY: sc-hub
+sc-hub:
+	$(MAKE) BACDL=bsc -s -C apps $@
+
 .PHONY: mstpcap
 mstpcap:
 	$(MAKE) -s -C apps $@
@@ -438,6 +446,7 @@ clean: ports-clean
 	$(MAKE) -s -C apps/gateway clean
 	$(MAKE) -s -C apps/fuzz-afl clean
 	$(MAKE) -s -C apps/fuzz-libfuzzer clean
+	$(MAKE) -s -C apps/sc-hub clean
 	$(MAKE) -s -C ports/lwip clean
 	$(MAKE) -s -C test clean
 	rm -rf ./build