3.0

.github/workflows/nbnet.yml

@@ -52,9 +52,6 @@ jobs:
           cd tests
           cmake -G "NMake Makefiles" .
           nmake
-      # FIXME: string_tests hangs forever
-      # - name: Run tests
-      # run: ctest
 
   soak-test-linux-c:
     runs-on: ubuntu-latest
@@ -67,7 +64,7 @@ jobs:
           cd soak
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Debug ..
+          cmake -DCMAKE_BUILD_TYPE=Debug -DUDP=ON ..
           make
       - name: Run soak test
         run: timeout 240 ./bin/github-actions/run_soak.sh
@@ -83,7 +80,7 @@ jobs:
           cd soak
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Debug -DCPP_COMPILE=ON ..
+          cmake -DCMAKE_BUILD_TYPE=Debug -DUDP=ON -DCPP_COMPILE=ON ..
           make
       - name: Run soak test
         run: timeout 240 ./bin/github-actions/run_soak.sh
@@ -101,7 +98,7 @@ jobs:
           npm update
           npm install -g node-pre-gyp
           npm install -g node-gyp
-          cd net_drivers/webrtc
+          cd webrtc
           npm install --build-from-resource
       - name: Compile soak test
         run: ./bin/github-actions/build_soak_web.sh
@@ -123,7 +120,7 @@ jobs:
           cd soak
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Debug ..
+          cmake -DCMAKE_BUILD_TYPE=Debug -DUDP=ON ..
           make
       - name: Run soak test
         run: gtimeout 240 ./bin/github-actions/run_soak.sh
@@ -139,7 +136,7 @@ jobs:
           cd soak
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Debug -DCPP_COMPILE=ON ..
+          cmake -DCMAKE_BUILD_TYPE=Debug -DUDP=ON -DCPP_COMPILE=ON ..
           make
       - name: Run soak test
         run: gtimeout 240 ./bin/github-actions/run_soak.sh
@@ -157,7 +154,7 @@ jobs:
           npm update
           npm install -g node-pre-gyp
           npm install -g node-gyp
-          cd net_drivers/webrtc
+          cd webrtc
           npm install --build-from-resource
       - name: Compile soak test
         run: ./bin/github-actions/build_soak_web.sh 
@@ -178,7 +175,7 @@ jobs:
           cd soak
           mkdir build
           cd build
-          cmake -G "NMake Makefiles" ..
+          cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Debug -DUDP=ON ..
           nmake
       - name: Run soak test
         run: ./bin/github-actions/run_soak.sh
@@ -198,14 +195,16 @@ jobs:
           npm update
           npm install -g node-pre-gyp
           npm install -g node-gyp
-          cd net_drivers/webrtc
+          cd webrtc
           npm install --build-from-resource
       - name: Compile soak test (native)
         run: |
           cd soak
           mkdir build
           cd build
-          cmake -DLIBDATACHANNEL_LIBRARY_PATH=${{ github.workspace }}/libdatachannel/build/libdatachannel.so -DLIBDATACHANNEL_INCLUDE_PATH=${{ github.workspace }}/libdatachannel/include -DWEBRTC_NATIVE=ON ..
+          cmake -DLIBDATACHANNEL_LIBRARY_PATH=${{ github.workspace }}/libdatachannel/build/libdatachannel.so \
+            -DLIBDATACHANNEL_INCLUDE_PATH=${{ github.workspace }}/libdatachannel/include \
+          -DWEBRTC_NATIVE=ON -DUDP=ON -DCMAKE_BUILD_TYPE=Debug ..
           make
       - name: Compile soak test (web)
         run: ./bin/github-actions/build_soak_web.sh 
@@ -216,7 +215,7 @@ jobs:
           cd ..
           WEBRTC_NATIVE=1 timeout 240 ./bin/github-actions/run_soak.sh
 
-  compile-examples-linux-c:
+  compile-examples-udp-linux-c:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -225,10 +224,10 @@ jobs:
       - name: Compile examples
         run: |
           cd examples
-          cmake .
+          cmake -DEXAMPLES_UDP=ON .
           make
 
-  compile-examples-linux-cpp:
+  compile-examples-udp-linux-cpp:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -237,10 +236,10 @@ jobs:
       - name: Compile examples
         run: |
           cd examples
-          cmake -DCPP_COMPILE=ON .
+          cmake -DEXAMPLES_UDP=ON -DCPP_COMPILE=ON .
           make
 
-  compile-examples-osx-c:
+  compile-examples-udp-osx-c:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
@@ -249,10 +248,10 @@ jobs:
       - name: Compile examples
         run: |
           cd examples
-          cmake .
+          cmake -DEXAMPLES_UDP=ON .
           make
 
-  compile-examples-osx-cpp:
+  compile-examples-udp-osx-cpp:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
@@ -261,27 +260,27 @@ jobs:
       - name: Compile examples
         run: |
           cd examples
-          cmake -DCPP_COMPILE=ON .
+          cmake -DEXAMPLES_UDP=ON -DCPP_COMPILE=ON .
           make
 
-  compile-examples-windows-c:
+  compile-examples-udp-windows-c:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
       - uses: ilammy/msvc-dev-cmd@v1
       - name: Compile examples
         run: |
           cd examples
-          cmake -G "NMake Makefiles" .
+          cmake -G "NMake Makefiles" -DEXAMPLES_UDP=ON .
           nmake
 
-  compile-examples-windows-cpp:
+  compile-examples-udp-windows-cpp:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
       - uses: ilammy/msvc-dev-cmd@v1
       - name: Compile examples
         run: |
           cd examples
-          cmake -G "NMake Makefiles" -DCPP_COMPILE=ON .
+          cmake -G "NMake Makefiles" -DEXAMPLES_UDP=ON -DCPP_COMPILE=ON .
           nmake

.gitignore

@@ -1,4 +1,3 @@
-*.js
 *.wasm
 .vscode
 .ccls
@@ -18,3 +17,7 @@ _deps
 build
 build_web
 .DS_Store
+.clangd
+.clang-format
+.cache
+compile_flags.txt

bin/github-actions/build_soak_web.sh

@@ -5,7 +5,7 @@ source ./emsdk_env.sh
 cd ../soak
 mkdir build_web
 cd build_web
-emcmake cmake ..
+emcmake cmake -DCMAKE_BUILD_TYPE=Debug ..
 make
 cd ..
 npm install

bin/github-actions/run_soak.sh

@@ -5,95 +5,87 @@ PACKET_DUPLICATION=0.2
 PING=0.15
 JITTER=0.1
 CHANNEL_COUNT=3
-MESSAGE_COUNT=500
+MESSAGE_COUNT=5000
 NODE_CMD="$EMSDK_NODE"
 
-run_client () {
-    node_client=$1
-    echo "Running soak client (run in mode: $node_client)..."
-
-    if [ $node_client -eq 1 ]
-    then
-        # WASM WebRTC client
-        $NODE_CMD build_web/client.js --message_count=$MESSAGE_COUNT --channel_count=$CHANNEL_COUNT --packet_loss=$PACKET_LOSS --packet_duplication=$PACKET_DUPLICATION --ping=$PING --jitter=$JITTER &> soak_cli_out
-    elif [ $node_client -eq 2 ]
-    then
-        # native WebRTC client
-        ./build/client --webrtc --message_count=$MESSAGE_COUNT --channel_count=$CHANNEL_COUNT --packet_loss=$PACKET_LOSS --packet_duplication=$PACKET_DUPLICATION --ping=$PING --jitter=$JITTER &> soak_cli_out
-    else
-        # UDP client
-        ./build/client --message_count=$MESSAGE_COUNT --channel_count=$CHANNEL_COUNT --packet_loss=$PACKET_LOSS --packet_duplication=$PACKET_DUPLICATION --ping=$PING --jitter=$JITTER &> soak_cli_out
-    fi
-
-    RESULT=$?
-
-    # when running the soak test in the latest version of emscripten with node 16
-    # the client aborts at the end when calling emscripten_force_exit
-    # I could not figure out why, hence the condition
-    [[ $node_client -eq 1 ]] && EXPECTED_RESULT=7 || EXPECTED_RESULT=0
-
-    if [ $RESULT -eq $EXPECTED_RESULT ]
-    then
-        echo "Soak test completed with success!"
-        echo "Printing the end of client logs..."
-
-        tail -n 150 soak_cli_out
-
-        return 0
-    else
-        echo "Soak test failed! (code: $RESULT)"
-        echo "Printing the end of client logs..."
-        tail -n 150 soak_cli_out
-        echo "Printing the end of server logs..."
-        tail -n 150 soak_serv_out
-
-        return 1
-    fi
+run_client() {
+  client_mode=$1
+  echo "Running soak client (run in mode: $client_mode)..."
+
+  if [ "$client_mode" = "WEBRTC_EMSCRIPTEN" ]; then
+    # WASM WebRTC client
+    $NODE_CMD build_web/client.js --message_count=$MESSAGE_COUNT --channel_count=$CHANNEL_COUNT --packet_loss=$PACKET_LOSS --packet_duplication=$PACKET_DUPLICATION --ping=$PING --jitter=$JITTER &>soak_cli_out
+  elif [ "$client_mode" = "UDP" ]; then
+    # UDP client
+    ./build/client --message_count=$MESSAGE_COUNT --channel_count=$CHANNEL_COUNT --packet_loss=$PACKET_LOSS --packet_duplication=$PACKET_DUPLICATION --ping=$PING --jitter=$JITTER &>soak_cli_out
+  else
+    echo "Unknown client mode"
+    return 1
+  fi
+
+  RESULT=$?
+
+  # when running the soak test in the latest version of emscripten with node 16
+  # the client aborts at the end when calling emscripten_force_exit
+  # I could not figure out why, hence the condition
+  [[ "$client_mode" = "WEBRTC_EMSCRIPTEN" ]] && EXPECTED_RESULT=7 || EXPECTED_RESULT=0
+
+  if [ $RESULT -eq $EXPECTED_RESULT ]; then
+    echo "Soak test completed with success!"
+
+    return 0
+  else
+    echo "Soak test failed! (code: $RESULT)"
+    echo "Printing the end of client logs..."
+    tail -n 150 soak_cli_out
+    echo "Printing the end of server logs..."
+    tail -n 150 soak_serv_out
+
+    return 1
+  fi
 }
 
-exit_soak () {
-    kill -SIGINT $SERV_PID 2> /dev/null
+exit_soak() {
+  kill -SIGINT $SERV_PID 2>/dev/null
 
-    exit $1
+  exit $1
 }
 
 cd soak
 echo "Starting soak server..."
 
-if [ -n "$WEBRTC" ]
-then
-     $NODE_CMD build_web/server.js --channel_count=$CHANNEL_COUNT --packet_loss=$PACKET_LOSS --packet_duplication=$PACKET_DUPLICATION --ping=$PING --jitter=$JITTER &> soak_serv_out &
+if [ -n "$WEBRTC" ]; then
+  $NODE_CMD build_web/server.js --channel_count=$CHANNEL_COUNT --packet_loss=$PACKET_LOSS --packet_duplication=$PACKET_DUPLICATION --ping=$PING --jitter=$JITTER &>soak_serv_out &
 else
-    ./build/server --channel_count=$CHANNEL_COUNT --packet_loss=$PACKET_LOSS --packet_duplication=$PACKET_DUPLICATION --ping=$PING --jitter=$JITTER &> soak_serv_out &
+  ./build/server --channel_count=$CHANNEL_COUNT --packet_loss=$PACKET_LOSS --packet_duplication=$PACKET_DUPLICATION --ping=$PING --jitter=$JITTER &>soak_serv_out &
 fi
 
-if [ $? -eq 0 ]
-then
-    SERV_PID=$!
+if [ $? -eq 0 ]; then
+  SERV_PID=$!
 
-    echo "Server started (PID: $SERV_PID)"
-    echo "Running soak test..."
+  echo "Server started (PID: $SERV_PID)"
+  echo "Running soak test..."
 else
-    echo "Failed to start soak server!"
-    exit 1
+  echo "Failed to start soak server!"
+  exit 1
 fi
 
 sleep 3
 
-if [ -n "$WEBRTC" ]
-then
-    run_client 1
+if [ -n "$WEBRTC" ]; then
+  run_client "WEBRTC_EMSCRIPTEN"
 
-    exit_soak $?
+  exit_soak $?
+elif [ -n "$WEBRTC_NATIVE" ]; then
+  # run a UDP client, a webrtc WASM client (emscripten) and a native webrtc client (all connecting to the same server)
+
+  if run_client "UDP" && run_client "WEBRTC_EMSCRIPTEN"; then
+    exit_soak 0
+  else
+    exit_soak 1
+  fi
 else
-    if [ -n "$WEBRTC_NATIVE" ]
-    then
-        # run a UDP client, a webrtc WASM client (emscripten) and a native webrtc client (all connecting to the same server)
-
-        if run_client 0 && run_client 1 && run_client 2; then
-            exit_soak 0
-        else
-            exit_soak 1
-        fi
-    fi
+  run_client "UDP"
+
+  exit_soak $?
 fi

examples/CMakeLists.txt

@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.5)
 project(nbnet_examples)
 
-add_subdirectory(echo)
-add_subdirectory(echo_bytes)
+option(EXAMPLES_UDP OFF)
+
+if (EXAMPLES_UDP)
+    set(UDP ON)
+endif (EXAMPLES_UDP)
 
-if (NOT DEFINED CPP_COMPILE)
-    # not supported in CPP
-    add_subdirectory(rpc)
-endif (NOT DEFINED CPP_COMPILE)
+add_subdirectory(echo)