awslabs
diff --git a/‎.github/ISSUE_TEMPLATE/bug_report.yml
Lines changed: 22 additions & 1 deletion b/‎.github/ISSUE_TEMPLATE/bug_report.yml
Lines changed: 22 additions & 1 deletion
diff --git a/‎.github/ISSUE_TEMPLATE/questions-help.md
Lines changed: 0 additions & 18 deletions b/‎.github/ISSUE_TEMPLATE/questions-help.md
Lines changed: 0 additions & 18 deletions
diff --git a/‎.github/build_windows.bat
Lines changed: 0 additions & 6 deletions b/‎.github/build_windows.bat
Lines changed: 0 additions & 6 deletions
diff --git a/‎.github/build_windows_openssl.bat
Lines changed: 1 addition & 1 deletion b/‎.github/build_windows_openssl.bat
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/ci.yml
Lines changed: 95 additions & 9 deletions b/‎.github/workflows/ci.yml
Lines changed: 95 additions & 9 deletions
diff --git a/‎CMake/Dependencies/libawscpp-CMakeLists.txt
Lines changed: 2 additions & 2 deletions b/‎CMake/Dependencies/libawscpp-CMakeLists.txt
Lines changed: 2 additions & 2 deletions
diff --git a/‎CMake/Dependencies/libkvsCommonLws-CMakeLists.txt
Lines changed: 1 addition & 1 deletion b/‎CMake/Dependencies/libkvsCommonLws-CMakeLists.txt
Lines changed: 1 addition & 1 deletion
diff --git a/‎CMake/Dependencies/libmbedtls-CMakeLists.txt
Lines changed: 1 addition & 1 deletion b/‎CMake/Dependencies/libmbedtls-CMakeLists.txt
Lines changed: 1 addition & 1 deletion
diff --git a/‎CMake/Dependencies/libusrsctp-CMakeLists.txt
Lines changed: 2 additions & 1 deletion b/‎CMake/Dependencies/libusrsctp-CMakeLists.txt
Lines changed: 2 additions & 1 deletion
diff --git a/‎CMake/Dependencies/libwebsockets-CMakeLists.txt
Lines changed: 3 additions & 2 deletions b/‎CMake/Dependencies/libwebsockets-CMakeLists.txt
Lines changed: 3 additions & 2 deletions
diff --git a/‎CMake/Dependencies/libwebsockets-old-gcc-fix-cast-cmakelists.patch
Lines changed: 18 additions & 27 deletions b/‎CMake/Dependencies/libwebsockets-old-gcc-fix-cast-cmakelists.patch
Lines changed: 18 additions & 27 deletions
@@ -6,13 +6,22 @@ labels: ["bug", "needs-triage"]
 assignees: []
 body:
   - type: checkboxes
+    id: confirm
     attributes:
       label: Please confirm you have already done the following
       options:
         - label: I have searched the repository for related/existing bug reports
         - label: I have all the details the issue requires
     validations:
       required: true
+  - type: checkboxes
+    id: prompt
+    attributes:
+      label: Please answer the following prompt
+      options:
+        - label: This issue is replicable using the unmodified sample application
+    validations:
+      required: false
   - type: textarea
     id: description
     attributes:
@@ -37,14 +46,20 @@ body:
         
         Please include full errors, uncaught exceptions, stack traces, and relevant VERBOSE logs.
         To get relevant VERBOSE logs from the SDK, you can retrieve by running `export AWS_KVS_LOG_LEVEL=1`
+
+        If you are reporting a memory leak, please provide sufficient evidence such as a `valgrind` output.
+        Note that the CI for this repository uses [Google Sanitizers](https://github.com/google/sanitizers) to minimize software issues and vulnerabilities.
     validations:
       required: true
   - type: textarea
     id: reproduction
     attributes:
       label: Reproduction Steps
       description: |
-        Provide a self-contained, concise snippet of code that can be used to reproduce the issue.
+        Provide a self-contained, concise snippet of code that can be used to
+        reproduce the issue, or the command used to run the unmodified sample application. Please share
+        which SDK you are using as master and as viewer, and also any timing-related information, if
+        applicable.
         For more complex issues provide a repo with the smallest sample that reproduces the bug.
         Avoid including business logic or unrelated code, it makes diagnosis more difficult.
     validations:
@@ -55,6 +70,12 @@ body:
       label: WebRTC C SDK version being used
     validations:
       required: true
+  - type: input
+    id: sdk-previous-version
+    attributes:
+      label: If it was working in a previous version, which one?
+    validations:
+      required: false
   - type: input
     id: compiler-version
     attributes:
 
@@ -2,5 +2,5 @@ call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Buil
 mkdir build
 cd build
 cmd.exe /c cmake -G "NMake Makefiles" ..
-cmake -G "NMake Makefiles" -DBUILD_TEST=TRUE -DENABLE_AWS_SDK_IN_TESTS=OFF -DEXT_PTHREAD_INCLUDE_DIR="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/include/" -DEXT_PTHREAD_LIBRARIES="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/lib/x64/libpthreadGC2.a" ..
+cmake -G "NMake Makefiles" -DBUILD_TEST=TRUE -DENABLE_AWS_SDK_IN_TESTS=OFF -DPKG_CONFIG_EXECUTABLE="D:\\gstreamer\\1.0\\x86_64\\bin\\pkg-config.exe" -DEXT_PTHREAD_INCLUDE_DIR="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/include/" -DEXT_PTHREAD_LIBRARIES="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/lib/x64/libpthreadGC2.a" ..
 nmake
@@ -11,7 +11,7 @@ on:
       - master
 jobs:
   clang-format-check:
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
@@ -74,6 +74,31 @@ jobs:
         run:  |
           cd build
           ./tst/webrtc_client_test
+  mac-os-m1-build-clang:
+    runs-on: macos-13-xlarge
+    env:
+      AWS_KVS_LOG_LEVEL: 2
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+          aws-region: ${{ secrets.AWS_REGION }}
+      - name: Build repository
+        run: |
+          brew unlink openssl
+          mkdir build && cd build
+          sh -c 'cmake .. -DBUILD_TEST=TRUE -DCMAKE_C_COMPILER=$(brew --prefix llvm@15)/bin/clang -DCMAKE_CXX_COMPILER=$(brew --prefix llvm@15)/bin/clang++'
+          make
+      - name: Run tests
+        run:  |
+          cd build
+          ./tst/webrtc_client_test
   static-build-mac:
     runs-on: macos-11
     env:
@@ -137,7 +162,7 @@ jobs:
   undefined-behavior-sanitizer:
     runs-on: ubuntu-20.04
     env:
-      UBSAN_OPTIONS: halt_on_error=1
+      UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
       CC: clang
       CXX: clang++
       AWS_KVS_LOG_LEVEL: 2
@@ -356,6 +381,39 @@ jobs:
         run:  |
           cd build
           timeout --signal=SIGABRT 60m ./tst/webrtc_client_test
+  
+  mbedtls-ubuntu-gcc-4_4-build:
+    runs-on: ubuntu-20.04
+    env:
+      AWS_KVS_LOG_LEVEL: 2
+      CC: gcc-4.4
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+          aws-region: ${{ secrets.AWS_REGION }}
+      - name: Install deps
+        run: |
+          sudo apt clean && sudo apt update
+          sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
+          sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+          sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ trusty main'
+          sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ trusty universe'
+          sudo apt-get -q update
+          sudo apt-get -y install gcc-4.4
+          sudo apt-get -y install gdb
+      - name: Build repository
+        run: |
+          mkdir build && cd build
+          cmake .. -DUSE_OPENSSL=OFF -DUSE_MBEDTLS=ON
+          make
+          
   mbedtls-ubuntu-clang:
     runs-on: ubuntu-20.04
     env:
@@ -391,27 +449,55 @@ jobs:
           timeout --signal=SIGABRT 60m ./tst/webrtc_client_test
   sample-check:
     if: github.repository == 'awslabs/amazon-kinesis-video-streams-webrtc-sdk-c'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       AWS_KVS_LOG_LEVEL: 2
     permissions:
       id-token: write
       contents: read
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
           aws-region: ${{ secrets.AWS_REGION }}
+          role-duration-seconds: 10800
       - name: Build repository
         run: |
           sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
           mkdir build && cd build
           cmake ..
           make
-          cd ..
+      - name: Sample check
+        run: |
+          ./scripts/check-sample.sh
+  sample-check-no-data-channel:
+    if: github.repository == 'awslabs/amazon-kinesis-video-streams-webrtc-sdk-c'
+    runs-on: ubuntu-latest
+    env:
+      AWS_KVS_LOG_LEVEL: 2
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+          aws-region: ${{ secrets.AWS_REGION }}
+          role-duration-seconds: 10800
+      - name: Build repository
+        run: |
+          sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
+          mkdir build && cd build
+          cmake .. -DENABLE_DATA_CHANNEL=OFF
+          make
+      - name: Sample check without data channel
+        run: |
           ./scripts/check-sample.sh
   ubuntu-os-build:
     runs-on: ubuntu-20.04
@@ -493,8 +579,8 @@ jobs:
       - name: Run tests
         shell: powershell
         run: |
-          $env:Path += ';C:\webrtc\open-source\bin;C:\tools\pthreads-w32-2-9-1-release\Pre-built.2\dll\x64'
-          & "C:\webrtc\build\tst\webrtc_client_test.exe" --gtest_filter="-DataChannelFunctionalityTest.*:IceApiTest.*:IceFunctionalityTest.*:PeerConnectionFunctionalityTest.*:SignalingApiFunctionalityTest.*:TurnConnectionFunctionalityTest.*:RtpFunctionalityTest.marshallUnmarshallH264Data:RtpFunctionalityTest.packingUnpackingVerifySameH264Frame:RtcpFunctionalityTest.onRtcpPacketCompound:RtcpFunctionalityTest.twcc3"
+          $env:Path += ';C:\webrtc\open-source\bin;C:\tools\pthreads-w32-2-9-1-release\Pre-built.2\dll\x64;C:\webrtc\build'
+          & "C:\webrtc\build\tst\webrtc_client_test.exe" --gtest_filter="-SignalingApiFunctionalityTest.receivingIceConfigOffer_SlowClockSkew:SignalingApiFunctionalityTest.iceServerConfigRefreshConnectedAuthExpiration:SignalingApiFunctionalityTest.receivingIceConfigOffer_FastClockSkew:SignalingApiFunctionalityTest.receivingIceConfigOffer_FastClockSkew_VerifyOffsetRemovedWhenClockFixed:DataChannelFunctionalityTest.*:DtlsApiTest.*:IceApiTest.*:IceFunctionalityTest.*:PeerConnectionFunctionalityTest.*:TurnConnectionFunctionalityTest.*:RtpFunctionalityTest.marshallUnmarshallH264Data:RtpFunctionalityTest.packingUnpackingVerifySameH264Frame:RtcpFunctionalityTest.onRtcpPacketCompound:RtcpFunctionalityTest.twcc3"
   # windows-msvc-mbedtls:
   #   runs-on: windows-2022
   #   env:
@@ -576,4 +662,4 @@ jobs:
           sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
           mkdir build && cd build
           cmake .. -DBUILD_OPENSSL=TRUE -DBUILD_OPENSSL_PLATFORM=linux-generic32 -DBUILD_LIBSRTP_HOST_PLATFORM=x86_64-unknown-linux-gnu -DBUILD_LIBSRTP_DESTINATION_PLATFORM=arm-unknown-linux-uclibcgnueabi
-          make
+          make
@@ -4,11 +4,11 @@ include(ExternalProject)
 
 ExternalProject_Add(libawscpp-download
     GIT_REPOSITORY    https://github.com/aws/aws-sdk-cpp.git
-    GIT_TAG           1.11.157
+    GIT_TAG           1.11.217
     LIST_SEPARATOR    "|"
     CMAKE_ARGS       -DBUILD_SHARED_LIBS=OFF
                      -DBUILD_ONLY=kinesisvideo|kinesis-video-webrtc-storage
                      -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX}
     BUILD_ALWAYS      TRUE
     TEST_COMMAND      ""
-)
+)
@@ -6,7 +6,7 @@ include(ExternalProject)
 
 ExternalProject_Add(libkvsCommonLws-download
     GIT_REPOSITORY    https://github.com/awslabs/amazon-kinesis-video-streams-producer-c.git
-    GIT_TAG           178109a5dbfc5288ba5cf7fab1dc1afd5e2e182b
+    GIT_TAG           v1.5.2
     PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/build
     CMAKE_ARGS        
       -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX}
 
@@ -26,7 +26,7 @@ ExternalProject_Add(
   CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX}
     -DUSE_SHARED_MBEDTLS_LIBRARY=${BUILD_SHARED}
-    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     -DCMAKE_MACOSX_RPATH=${CMAKE_MACOSX_RPATH}
     -DENABLE_TESTING=OFF
     -DENABLE_PROGRAMS=OFF
 
@@ -8,7 +8,8 @@ ExternalProject_Add(project_libusrsctp
     GIT_REPOSITORY    https://github.com/sctplab/usrsctp.git
     GIT_TAG           1ade45cbadfd19298d2c47dc538962d4425ad2dd
     PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/build
-    CMAKE_ARGS        -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX} 
+    CMAKE_ARGS        -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX}
+                      -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                       "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -fPIC"
                       -Dsctp_werror=0
     BUILD_ALWAYS      TRUE
 
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.6.3)
 
 project(libwebsocket-download NONE)
 
-SET(PATCH_COMMAND git apply --ignore-whitespace ${CMAKE_CURRENT_LIST_DIR}/libwebsockets-old-gcc-fix-cast-cmakelists.patch ${CMAKE_CURRENT_LIST_DIR}/libwebsockets-leak-pipe-fix.patch)
+SET(PATCH_COMMAND git apply --verbose --ignore-whitespace ${CMAKE_CURRENT_LIST_DIR}/libwebsockets-old-gcc-fix-cast-cmakelists.patch)
 
 include(ExternalProject)
 if (BUILD_STATIC_LIBS)
@@ -30,13 +30,14 @@ endif()
 
 ExternalProject_Add(project_libwebsockets
     GIT_REPOSITORY    https://github.com/warmcat/libwebsockets.git
-    GIT_TAG           v4.2.2
+    GIT_TAG           v4.3.3
     PATCH_COMMAND     ${PATCH_COMMAND}
     PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/build
     LIST_SEPARATOR    |
     CMAKE_ARGS
         -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX}
         -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DLWS_WITH_HTTP2=1
         -DLWS_HAVE_HMAC_CTX_new=1
         -DLWS_HAVE_SSL_EXTRA_CHAIN_CERTS=1
 
@@ -11,31 +11,22 @@ index 68629e6f..6ef628b8 100644
  				prev = h2n->hpack_pos;
  				h2n->hpack_pos = (uint16_t)huftable_decode(
  						(int)h2n->hpack_pos, b);
-diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt
-index b214df75..06eaf255 100644
---- a/lib/tls/CMakeLists.txt
-+++ b/lib/tls/CMakeLists.txt
-@@ -57,10 +57,10 @@ if (LWS_WITH_BORINGSSL)
- endif()
+diff --git a/lib/core/lws_map.c b/lib/core/lws_map.c
+index d149d86752..b319d79f49 100644
+--- a/lib/core/lws_map.c
++++ b/lib/core/lws_map.c
+@@ -29,11 +29,11 @@ typedef struct lws_map_hashtable {
+ 	lws_dll2_owner_t		ho;
+ } lws_map_hashtable_t;
 
- if (LWS_WITH_SSL AND NOT LWS_WITH_WOLFSSL AND NOT LWS_WITH_MBEDTLS)
--	if ("${LWS_OPENSSL_LIBRARIES}" STREQUAL "" OR "${LWS_OPENSSL_INCLUDE_DIRS}" STREQUAL "")
-+	if (("${LWS_OPENSSL_LIBRARIES}" STREQUAL "" AND ("${LWS_OPENSSL_SSL_LIBRARY}" STREQUAL "" OR "${LWS_OPENSSL_CRYPTO_LIBRARY}" STREQUAL "")) OR "${LWS_OPENSSL_INCLUDE_DIRS}" STREQUAL "")
- 	else()
- 		if (NOT LWS_PLAT_FREERTOS)
--			set(OPENSSL_LIBRARIES ${LWS_OPENSSL_LIBRARIES})
-+			list(APPEND OPENSSL_LIBRARIES ${LWS_OPENSSL_LIBRARIES} ${LWS_OPENSSL_SSL_LIBRARY} ${LWS_OPENSSL_CRYPTO_LIBRARY})
- 		endif()
- 		set(OPENSSL_INCLUDE_DIRS ${LWS_OPENSSL_INCLUDE_DIRS})
- 		set(OPENSSL_FOUND 1)
-@@ -248,7 +248,9 @@ if (LWS_WITH_SSL)
- 				find_package(PkgConfig QUIET)
- 				pkg_check_modules(PC_OPENSSL openssl QUIET)
- 				find_package(OpenSSL REQUIRED)
--				list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LIBRARIES})
-+				if (NOT LWS_WITH_STATIC)
-+					list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LIBRARIES})
-+				endif()
- 				set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} PARENT_SCOPE)
- 			endif()
- 			set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")
+-typedef struct lws_map {
++struct lws_map {
+ 	lws_map_info_t			info;
+ 
+ 	/* array of info.modulo x lws_map_hashtable_t overallocated */
+-} lws_map_t;
++};
+ 
+ typedef struct lws_map_item {
+ 	lws_dll2_t			list; /* owned by hashtable */
+