Added .travis.yml

.clang-format

@@ -10,7 +10,5 @@ AccessModifierOffset: -4
 ColumnLimit: 100
 ---
 Language: JavaScript
-IndentWidth: 2
-UseTab: Never
-ColumnLimit: 100
+ColumnLimit: 80
 ...

.editorconfig

@@ -9,13 +9,3 @@ insert_final_newline = true
 indent_style = tab
 indent_size = 4
 
-[*.js]
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.py]
-insert_final_newline = false
-indent_style = space
-indent_size = 4
-

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-github: ['paullouisageneau']
-custom: ['https://paypal.me/paullouisageneau']
-

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "npm"
-    directory: "examples/web"
-    schedule:
-      interval: "weekly"

.github/workflows/build-gnutls.yml

@@ -1,37 +0,0 @@
-name: Build with GnuTLS
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
-jobs:
-  build-linux:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: install packages
-      run: sudo apt update && sudo apt install libgnutls28-dev nettle-dev
-    - name: submodules
-      run: git submodule update --init --recursive
-    - name: cmake
-      run: cmake -B build -DUSE_GNUTLS=1 -DWARNINGS_AS_ERRORS=1
-    - name: make
-      run: (cd build; make -j2)
-    - name: test
-      run: ./build/tests
-  build-macos:
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: install packages
-      run: brew install gnutls nettle
-    - name: submodules
-      run: git submodule update --init --recursive
-    - name: cmake
-      run: cmake -B build -DUSE_GNUTLS=1 -DWARNINGS_AS_ERRORS=1
-    - name: make
-      run: (cd build; make -j2)
-    - name: test
-      run: ./build/tests

.github/workflows/build-nice.yml

@@ -1,24 +0,0 @@
-name: Build with libnice
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
-jobs:
-  build-linux:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: install packages
-      run: sudo apt update && sudo apt install libgnutls28-dev libnice-dev
-    - name: submodules
-      run: git submodule update --init --recursive
-    - name: cmake
-      run: cmake -B build -DUSE_GNUTLS=1 -DUSE_NICE=1 -DWARNINGS_AS_ERRORS=1
-    - name: make
-      run: (cd build; make -j2)
-    - name: test
-      run: ./build/tests
-

.github/workflows/build-openssl.yml

@@ -1,58 +0,0 @@
-name: Build with OpenSSL
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
-jobs:
-  build-linux:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: install packages
-      run: sudo apt update && sudo apt install libssl-dev
-    - name: submodules
-      run: git submodule update --init --recursive
-    - name: cmake
-      run: cmake -B build -DUSE_GNUTLS=0 -DWARNINGS_AS_ERRORS=1
-    - name: make
-      run: (cd build; make -j2)
-    - name: test
-      run: ./build/tests
-  build-macos:
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: install packages
-      run: HOMEBREW_NO_INSTALL_CLEANUP=1 brew reinstall openssl@1.1
-    - name: submodules
-      run: git submodule update --init --recursive
-    - name: cmake
-      run: cmake -B build -DUSE_GNUTLS=0 -WARNINGS_AS_ERRORS=1
-      env:
-        OPENSSL_ROOT_DIR: /usr/local/opt/openssl
-        OPENSSL_LIBRARIES: /usr/local/opt/openssl/lib
-    - name: make
-      run: (cd build; make -j2)
-    - name: test
-      run: ./build/tests
-  build-windows:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ilammy/msvc-dev-cmd@v1
-    - name: install packages
-      run: choco install openssl
-    - name: submodules
-      run: git submodule update --init --recursive
-    - name: cmake
-      run: cmake -B build -G "NMake Makefiles" -DUSE_GNUTLS=0 -WARNINGS_AS_ERRORS=1
-    - name: nmake
-      run: |
-        cd build
-        nmake
-    - name: test
-      run: build/tests.exe
-

.github/workflows/build.yml

@@ -0,0 +1,21 @@
+name: Build and test
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v2
+    - name: install packages
+      run: sudo apt update && sudo apt install libgnutls28-dev nettle-dev
+    - name: submodules
+      run: git submodule update --init --recursive
+    - name: cmake
+      run: cmake -B build -DUSE_JUICE=1 -DUSE_GNUTLS=1
+    - name: make
+      run: (cd build; make)
+    - name: test
+      run: ./build/tests
+

.gitignore

@@ -1,10 +1,8 @@
 build/
-node_modules/
 *.d
 *.o
 *.a
 *.so
 compile_commands.json
 tests
-.DS_Store
 

.gitmodules

@@ -1,12 +1,9 @@
 [submodule "deps/plog"]
 	path = deps/plog
-	url = https://github.com/paullouisageneau/plog
+	url = https://github.com/SergiusTheBest/plog
 [submodule "usrsctp"]
 	path = deps/usrsctp
 	url = https://github.com/sctplab/usrsctp.git
 [submodule "deps/libjuice"]
 	path = deps/libjuice
 	url = https://github.com/paullouisageneau/libjuice
-[submodule "deps/json"]
-	path = deps/json
-	url = https://github.com/nlohmann/json.git

.travis.yml

@@ -0,0 +1,4 @@
+os: osx
+osx_image: xcode11.3
+language: cpp
+script: cmake -B build -DUSE_JUICE=1 -DUSE_GNUTLS=1 && cd build && make && ./tests

CMakeLists.txt

@@ -1,22 +1,11 @@
-cmake_minimum_required(VERSION 3.7)
-project(libdatachannel
-	DESCRIPTION "WebRTC Data Channels Library"
-	VERSION 0.9.1
+cmake_minimum_required (VERSION 3.7)
+project (libdatachannel
+	DESCRIPTION "WebRTC DataChannels Library"
+	VERSION 0.4.9
 	LANGUAGES CXX)
 
-# Options
 option(USE_GNUTLS "Use GnuTLS instead of OpenSSL" OFF)
-option(USE_NICE "Use libnice instead of libjuice" OFF)
-option(NO_WEBSOCKET "Disable WebSocket support" OFF)
-option(NO_EXAMPLES "Disable examples" OFF)
-option(NO_TESTS "Disable tests build" OFF)
-option(WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
-
-if(USE_NICE)
-	option(USE_JUICE "Use libjuice" OFF)
-else()
-	option(USE_JUICE "Use libjuice" ON)
-endif()
+option(USE_JUICE "Use libjuice instead of libnice" OFF)
 
 if(USE_GNUTLS)
 	option(USE_NETTLE "Use Nettle instead of OpenSSL in libjuice" ON)
@@ -29,10 +18,8 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
 
 if(WIN32)
 	add_definitions(-DWIN32_LEAN_AND_MEAN)
-	if (MSVC)
-		add_definitions(-DNOMINMAX)
-		add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-		add_definitions(-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)
+	if (MSYS OR MINGW)
+		add_definitions(-DSCTP_STDINT_INCLUDE=<stdint.h>)
 	endif()
 endif()
 
@@ -43,29 +30,13 @@ set(LIBDATACHANNEL_SOURCES
 	${CMAKE_CURRENT_SOURCE_DIR}/src/configuration.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/datachannel.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/description.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/src/dtlssrtptransport.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/dtlstransport.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/icetransport.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/init.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/log.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/src/message.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/peerconnection.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/src/rtcp.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/src/rtc.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/sctptransport.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/src/threadpool.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/src/tls.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/src/track.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/src/processor.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/src/capi.cpp
-)
-
-set(LIBDATACHANNEL_WEBSOCKET_SOURCES
-	${CMAKE_CURRENT_SOURCE_DIR}/src/base64.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/src/tcptransport.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/src/tlstransport.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/src/verifiedtlstransport.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/src/websocket.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/src/wstransport.cpp
 )
 
 set(LIBDATACHANNEL_HEADERS
@@ -75,7 +46,6 @@ set(LIBDATACHANNEL_HEADERS
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/configuration.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/datachannel.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/description.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/rtcp.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/include.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/init.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/log.hpp
@@ -85,33 +55,26 @@ set(LIBDATACHANNEL_HEADERS
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/reliability.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/rtc.h
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/rtc.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/track.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/websocket.hpp
 )
 
 set(TESTS_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/test/main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test/connectivity.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test/track.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test/capi_connectivity.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test/capi_track.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test/websocket.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test/benchmark.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test/capi.cpp
 )
 
-set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+set(TESTS_OFFERER_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/test/p2p/offerer.cpp
+)
+
+set(TESTS_ANSWERER_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/test/p2p/answerer.cpp
+)
+
+set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
-set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
-add_subdirectory(deps/plog)
-
-option(sctp_build_programs 0)
 add_subdirectory(deps/usrsctp EXCLUDE_FROM_ALL)
-if (MSYS OR MINGW)
-	target_compile_definitions(usrsctp PUBLIC -DSCTP_STDINT_INCLUDE=<stdint.h>)
-	target_compile_definitions(usrsctp-static PUBLIC -DSCTP_STDINT_INCLUDE=<stdint.h>)
-endif()
 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation)
 	target_compile_options(usrsctp-static PRIVATE -Wno-error=format-truncation)
@@ -119,66 +82,31 @@ endif()
 add_library(Usrsctp::Usrsctp ALIAS usrsctp)
 add_library(Usrsctp::UsrsctpStatic ALIAS usrsctp-static)
 
-if (NO_WEBSOCKET)
-	add_library(datachannel SHARED
-		${LIBDATACHANNEL_SOURCES})
-	add_library(datachannel-static STATIC EXCLUDE_FROM_ALL
-		${LIBDATACHANNEL_SOURCES})
-	target_compile_definitions(datachannel PUBLIC RTC_ENABLE_WEBSOCKET=0)
-	target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_WEBSOCKET=0)
-else()
-	add_library(datachannel SHARED
-		${LIBDATACHANNEL_SOURCES}
-		${LIBDATACHANNEL_WEBSOCKET_SOURCES})
-	add_library(datachannel-static STATIC EXCLUDE_FROM_ALL
-		${LIBDATACHANNEL_SOURCES}
-		${LIBDATACHANNEL_WEBSOCKET_SOURCES})
-	target_compile_definitions(datachannel PUBLIC RTC_ENABLE_WEBSOCKET=1)
-	target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_WEBSOCKET=1)
-endif()
-
+add_library(datachannel SHARED ${LIBDATACHANNEL_SOURCES})
 set_target_properties(datachannel PROPERTIES
 	VERSION ${PROJECT_VERSION}
 	CXX_STANDARD 17)
-set_target_properties(datachannel-static PROPERTIES
-	VERSION ${PROJECT_VERSION}
-	CXX_STANDARD 17)
 
 target_include_directories(datachannel PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
 target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
-target_link_libraries(datachannel PUBLIC Threads::Threads plog::plog)
-target_link_libraries(datachannel PRIVATE Usrsctp::UsrsctpStatic)
+target_include_directories(datachannel PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/plog/include)
+target_link_libraries(datachannel Threads::Threads Usrsctp::UsrsctpStatic)
+
+add_library(datachannel-static STATIC EXCLUDE_FROM_ALL ${LIBDATACHANNEL_SOURCES})
+set_target_properties(datachannel-static PROPERTIES
+	VERSION ${PROJECT_VERSION}
+	CXX_STANDARD 17)
 
 target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
 target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
-target_link_libraries(datachannel-static PUBLIC Threads::Threads plog::plog)
-target_link_libraries(datachannel-static PRIVATE Usrsctp::UsrsctpStatic)
+target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/plog/include)
+target_link_libraries(datachannel-static Threads::Threads Usrsctp::UsrsctpStatic)
 
 if(WIN32)
-	target_link_libraries(datachannel PRIVATE wsock32 ws2_32) # winsock2
-	target_link_libraries(datachannel-static PRIVATE wsock32 ws2_32) # winsock2
-endif()
-
-find_package(SRTP)
-if(SRTP_FOUND)
-	if(NOT TARGET SRTP::SRTP)
-		add_library(SRTP::SRTP UNKNOWN IMPORTED)
-		set_target_properties(SRTP::SRTP PROPERTIES
-			INTERFACE_INCLUDE_DIRECTORIES ${SRTP_INCLUDE_DIRS}
-			IMPORTED_LINK_INTERFACE_LANGUAGES C
-			IMPORTED_LOCATION ${SRTP_LIBRARIES})
-	endif()
-	message(STATUS "LibSRTP found, compiling with media transport")
-	target_compile_definitions(datachannel PUBLIC RTC_ENABLE_MEDIA=1)
-	target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_MEDIA=1)
-	target_link_libraries(datachannel PRIVATE SRTP::SRTP)
-	target_link_libraries(datachannel-static PRIVATE SRTP::SRTP)
-else()
-	message(STATUS "LibSRTP NOT found, compiling WITHOUT media transport")
-	target_compile_definitions(datachannel PUBLIC RTC_ENABLE_MEDIA=0)
-	target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_MEDIA=0)
+	target_link_libraries(datachannel "wsock32" "ws2_32") # winsock2
+	target_link_libraries(datachannel-static "wsock32" "ws2_32") # winsock2
 endif()
 
 if (USE_GNUTLS)
@@ -188,33 +116,33 @@ if (USE_GNUTLS)
 		set_target_properties(GnuTLS::GnuTLS PROPERTIES
 			INTERFACE_INCLUDE_DIRECTORIES "${GNUTLS_INCLUDE_DIRS}"
 			INTERFACE_COMPILE_DEFINITIONS "${GNUTLS_DEFINITIONS}"
-			IMPORTED_LINK_INTERFACE_LANGUAGES C
+			IMPORTED_LINK_INTERFACE_LANGUAGES "C"
 			IMPORTED_LOCATION "${GNUTLS_LIBRARIES}")
 	endif()
 	target_compile_definitions(datachannel PRIVATE USE_GNUTLS=1)
+	target_link_libraries(datachannel GnuTLS::GnuTLS)
 	target_compile_definitions(datachannel-static PRIVATE USE_GNUTLS=1)
-	target_link_libraries(datachannel PRIVATE GnuTLS::GnuTLS)
-	target_link_libraries(datachannel-static PRIVATE GnuTLS::GnuTLS)
+	target_link_libraries(datachannel-static GnuTLS::GnuTLS)
 else()
 	find_package(OpenSSL REQUIRED)
 	target_compile_definitions(datachannel PRIVATE USE_GNUTLS=0)
+	target_link_libraries(datachannel OpenSSL::SSL)
 	target_compile_definitions(datachannel-static PRIVATE USE_GNUTLS=0)
-	target_link_libraries(datachannel PRIVATE OpenSSL::SSL)
-	target_link_libraries(datachannel-static PRIVATE OpenSSL::SSL)
+	target_link_libraries(datachannel-static OpenSSL::SSL)
 endif()
 
-if (USE_NICE OR NOT USE_JUICE)
-	find_package(LibNice REQUIRED)
-	target_compile_definitions(datachannel PRIVATE USE_NICE=1)
-	target_compile_definitions(datachannel-static PRIVATE USE_NICE=1)
-	target_link_libraries(datachannel PRIVATE LibNice::LibNice)
-	target_link_libraries(datachannel-static PRIVATE LibNice::LibNice)
-else()
+if (USE_JUICE)
 	add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL)
-	target_compile_definitions(datachannel PRIVATE USE_NICE=0)
-	target_compile_definitions(datachannel-static PRIVATE USE_NICE=0)
-	target_link_libraries(datachannel PRIVATE LibJuice::LibJuiceStatic)
-	target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuiceStatic)
+	target_compile_definitions(datachannel PRIVATE USE_JUICE=1)
+	target_link_libraries(datachannel LibJuice::LibJuiceStatic)
+	target_compile_definitions(datachannel-static PRIVATE USE_JUICE=1)
+	target_link_libraries(datachannel-static LibJuice::LibJuiceStatic)
+else()
+	find_package(LibNice REQUIRED)
+	target_compile_definitions(datachannel PRIVATE USE_JUICE=0)
+	target_link_libraries(datachannel LibNice::LibNice)
+	target_compile_definitions(datachannel-static PRIVATE USE_JUICE=0)
+	target_link_libraries(datachannel-static LibNice::LibNice)
 endif()
 
 add_library(LibDataChannel::LibDataChannel ALIAS datachannel)
@@ -223,57 +151,28 @@ add_library(LibDataChannel::LibDataChannelStatic ALIAS datachannel-static)
 install(TARGETS datachannel LIBRARY DESTINATION lib)
 install(FILES ${LIBDATACHANNEL_HEADERS} DESTINATION include/rtc)
 
-if(NOT MSVC)
-	target_compile_options(datachannel PRIVATE -Wall -Wextra)
-	target_compile_options(datachannel-static PRIVATE -Wall -Wextra)
-endif()
+# Main Test
+add_executable(datachannel-tests ${TESTS_SOURCES})
+set_target_properties(datachannel-tests PROPERTIES
+	VERSION ${PROJECT_VERSION}
+	CXX_STANDARD 17)
+set_target_properties(datachannel-tests PROPERTIES OUTPUT_NAME tests)
+target_include_directories(datachannel-tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
+target_link_libraries(datachannel-tests datachannel)
 
-if(WARNINGS_AS_ERRORS)
-	if(MSVC)
-		target_compile_options(datachannel PRIVATE /WX)
-		target_compile_options(datachannel-static PRIVATE /WX)
-	else()
-		target_compile_options(datachannel PRIVATE -Werror)
-		target_compile_options(datachannel-static PRIVATE -Werror)
-	endif()
-endif()
+# P2P Test: offerer
+add_executable(datachannel-offerer ${TESTS_OFFERER_SOURCES})
+set_target_properties(datachannel-offerer PROPERTIES
+	VERSION ${PROJECT_VERSION}
+	CXX_STANDARD 17)
+set_target_properties(datachannel-offerer PROPERTIES OUTPUT_NAME offerer)
+target_link_libraries(datachannel-offerer datachannel)
 
-# Tests
-if(NOT NO_TESTS)
-	add_executable(datachannel-tests ${TESTS_SOURCES})
-	set_target_properties(datachannel-tests PROPERTIES
-		VERSION ${PROJECT_VERSION}
-		CXX_STANDARD 17)
-	set_target_properties(datachannel-tests PROPERTIES OUTPUT_NAME tests)
-	target_include_directories(datachannel-tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
-	if(WIN32)
-		target_link_libraries(datachannel-tests datachannel-static) # DLL exports only the C API
-	else()
-		target_link_libraries(datachannel-tests datachannel)
-	endif()
-
-	# Benchmark
-	add_executable(datachannel-benchmark test/benchmark.cpp)
-	set_target_properties(datachannel-benchmark PROPERTIES
-		VERSION ${PROJECT_VERSION}
-		CXX_STANDARD 17)
-	set_target_properties(datachannel-benchmark PROPERTIES OUTPUT_NAME benchmark)
-	target_compile_definitions(datachannel-benchmark PRIVATE BENCHMARK_MAIN=1)
-	target_include_directories(datachannel-benchmark PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
-	if(WIN32)
-		target_link_libraries(datachannel-benchmark datachannel-static) # DLL exports only the C API
-	else()
-		target_link_libraries(datachannel-benchmark datachannel)
-	endif()
-endif()
-
-# Examples
-if(NOT NO_EXAMPLES)
-	set(JSON_BuildTests OFF CACHE INTERNAL "")
-	add_subdirectory(deps/json)
-	add_subdirectory(examples/client)
-	add_subdirectory(examples/media)
-	add_subdirectory(examples/copy-paste)
-	add_subdirectory(examples/copy-paste-capi)
-endif()
+# P2P Test: answerer
+add_executable(datachannel-answerer ${TESTS_ANSWERER_SOURCES})
+set_target_properties(datachannel-answerer PROPERTIES
+	VERSION ${PROJECT_VERSION}
+	CXX_STANDARD 17)
+set_target_properties(datachannel-answerer PROPERTIES OUTPUT_NAME answerer)
+target_link_libraries(datachannel-answerer datachannel)
 

Jamfile

@@ -1,40 +1,23 @@
-import feature : feature ;
-
 project libdatachannel ;
 path-constant CWD : . ;
 
-feature gnutls : off on : composite propagated ;
-feature.compose <gnutls>off
-    : <define>USE_GNUTLS=0 ;
-feature.compose <gnutls>on
-    : <define>USE_GNUTLS=1 ;
-
 lib libdatachannel
 	: # sources
 	[ glob ./src/*.cpp ]
 	: # requirements
-	<cxxstd>17
 	<include>./include/rtc
-	<define>USE_NICE=0
-	<define>RTC_ENABLE_MEDIA=0
-	<define>RTC_ENABLE_WEBSOCKET=0
-	<toolset>msvc:<define>WIN32_LEAN_AND_MEAN
-	<toolset>msvc:<define>NOMINMAX
-	<toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
-	<toolset>msvc:<define>_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
+	<define>USE_GNUTLS=0
+	<define>USE_JUICE=1
+	<cxxflags>"`pkg-config --cflags openssl`"
 	<library>/libdatachannel//usrsctp
 	<library>/libdatachannel//juice
-	<library>/libdatachannel//plog
-	<gnutls>on:<library>gnutls/<link>shared
-	<gnutls>off:<library>ssl
-	<gnutls>off:<library>crypto
 	: # default build
 	<link>static
 	: # usage requirements
 	<include>./include
 	<library>/libdatachannel//plog
-	<toolset>gcc:<cxxflags>"-pthread -Wno-pedantic -Wno-unused-parameter -Wno-unused-variable"
-	<toolset>clang:<cxxflags>"-pthread -Wno-pedantic -Wno-unused-parameter -Wno-unused-variable"
+	<cxxflags>-pthread
+	<linkflags>"`pkg-config --libs openssl`"
 	;
 
 alias plog
@@ -51,16 +34,7 @@ alias usrsctp
     : # no default build
     : # usage requirements
     <include>./deps/usrsctp/usrsctplib
-    <library>libusrsctp.a
-    ;
-
-alias usrsctp
-    : # no sources
-    : <toolset>msvc
-    : # no default build
-    : # usage requirements
-    <include>./deps/usrsctp/usrsctplib
-    <library>usrsctp.lib
+	<library>libusrsctp.a
     ;
 
 alias juice
@@ -69,190 +43,23 @@ alias juice
     : # no default build
     : # usage requirements
     <include>./deps/libjuice/include
-    <gnutls>on:<library>libjuice-gnutls.a
-    <gnutls>on:<library>nettle/<link>shared
-    <gnutls>off:<library>libjuice-openssl.a
-    ;
-
-alias juice
-    : # no sources
-    : <toolset>msvc
-    : # no default build
-    : # usage requirements
-    <include>./deps/libjuice/include
-    <library>juice-static.lib
+	<library>libjuice.a
     ;
 
 make libusrsctp.a : : @make_libusrsctp ;
-make usrsctp.lib : : @make_libusrsctp_msvc ;
-
-rule make_libusrsctp ( targets * : sources * : properties * )
-{
-	local VARIANT = [ feature.get-values <variant> : $(properties) ] ;
-	VARIANT on $(targets) = $(VARIANT) ;
-	BUILD_DIR on $(targets) = "build-$(VARIANT)" ;
-}
 actions make_libusrsctp
 {
-    (cd $(CWD)/deps/usrsctp && mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && cmake -DCMAKE_BUILD_TYPE=$(VARIANT) -DCMAKE_C_FLAGS="-fPIC -Wno-unknown-warning-option -Wno-format-truncation" .. && make -j2 usrsctp-static)
-    cp $(CWD)/deps/usrsctp/$(BUILD_DIR)/usrsctplib/libusrsctp.a $(<)
+	(cd $(CWD)/deps/usrsctp && \
+		./bootstrap && \
+		./configure --enable-static --disable-debug CFLAGS="-fPIC -Wno-address-of-packed-member" && \
+		make)
+    cp $(CWD)/deps/usrsctp/usrsctplib/.libs/libusrsctp.a $(<)
 }
-rule make_libusrsctp_msvc ( targets * : sources * : properties * )
+
+make libjuice.a : : @make_libjuice ;
+actions make_libjuice
 {
-	local VARIANT = [ feature.get-values <variant> : $(properties) ] ;
-	VARIANT on $(targets) = $(VARIANT) ;
-	BUILD_DIR on $(targets) = "build-$(VARIANT)" ;
-}
-actions make_libusrsctp_msvc
-{
-	SET OLDD=%CD%
-    cd $(CWD)/deps/usrsctp
-    mkdir $(BUILD_DIR)
-    cd $(BUILD_DIR)
-    cmake -G "Visual Studio 16 2019" ..
-    msbuild usrsctplib.sln /property:Configuration=$(VARIANT)
-    cd %OLDD%
-    cp $(CWD)/deps/usrsctp/$(BUILD_DIR)/usrsctplib/Release/usrsctp.lib $(<)
+	(cd $(CWD)/deps/libjuice && make USE_NETTLE=0)
+    cp $(CWD)/deps/libjuice/libjuice.a $(<)
 }
 
-make libjuice-gnutls.a : : @make_libjuice_gnutls ;
-make libjuice-openssl.a : : @make_libjuice_openssl ;
-make juice-static.lib : : @make_libjuice_msvc ;
-
-rule make_libjuice_gnutls ( targets * : sources * : properties * )
-{
-	local VARIANT = [ feature.get-values <variant> : $(properties) ] ;
-	BUILD_DIR on $(targets) = "build-gnutls-$(VARIANT)" ;
-	CMAKEOPTS on $(targets) = "-DCMAKE_C_FLAGS=\"-fPIC\" -DCMAKE_BUILD_TYPE=$(VARIANT) -DUSE_NETTLE=1" ;
-}
-actions make_libjuice_gnutls
-{
-    (cd $(CWD)/deps/libjuice && mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && cmake $(CMAKEOPTS) .. && make -j2 juice-static)
-    cp $(CWD)/deps/libjuice/$(BUILD_DIR)/libjuice-static.a $(<)
-}
-rule make_libjuice_openssl ( targets * : sources * : properties * )
-{
-	local VARIANT = [ feature.get-values <variant> : $(properties) ] ;
-	BUILD_DIR on $(targets) = "build-openssl-$(VARIANT)" ;
-	CMAKEOPTS on $(targets) = "-DCMAKE_C_FLAGS=\"-fPIC\" -DCMAKE_BUILD_TYPE=$(VARIANT) -DUSE_NETTLE=0" ;
-
-	local OPENSSL_INCLUDE = [ feature.get-values <openssl-include> : $(properties) ] ;
-	if <target-os>darwin in $(properties) && $(OPENSSL_INCLUDE) = ""
-	{
-		# on macOS, default to pick up openssl from the homebrew installation
-		# brew install openssl
-		OPENSSL_INCLUDE = /usr/local/opt/openssl/include ;
-	}
-
-	if $(OPENSSL_INCLUDE) != ""
-	{ CMAKEOPTS on $(targets) += " -DOPENSSL_ROOT_DIR=$(OPENSSL_INCLUDE)/.." ; }
-}
-actions make_libjuice_openssl
-{
-    (cd $(CWD)/deps/libjuice && mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && cmake $(CMAKEOPTS) .. && make -j2 juice-static)
-    cp $(CWD)/deps/libjuice/$(BUILD_DIR)/libjuice-static.a $(<)
-}
-rule make_libjuice_msvc ( targets * : sources * : properties * )
-{
-	local VARIANT = [ feature.get-values <variant> : $(properties) ] ;
-	VARIANT on $(targets) = $(VARIANT) ;
-	if <gnutls>on in $(properties)
-	{
-		BUILD_DIR on $(targets) += "build-gnutls-$(VARIANT)" ;
-		CMAKEOPTS on $(targets) = "-DUSE_NETTLE=1" ;
-	}
-	else
-	{
-		BUILD_DIR on $(targets) += "build-openssl-$(VARIANT)" ;
-		CMAKEOPTS on $(targets) = "-DUSE_NETTLE=0" ;
-	}
-}
-actions make_libjuice_msvc
-{
-	SET OLDD=%CD%
-    cd $(CWD)/deps/libjuice
-    mkdir $(BUILD_DIR)
-    cd $(BUILD_DIR)
-    cmake -G "Visual Studio 16 2019" $(CMAKEOPTS) ..
-    msbuild libjuice.sln /property:Configuration=$(VARIANT)
-    cd %OLDD%
-    cp $(CWD)/deps/libjuice/$(BUILD_DIR)/Release/juice-static.lib $(<)
-}
-
-# the search path to pick up the openssl libraries from. This is the <search>
-# property of those libraries
-rule openssl-lib-path ( properties * )
-{
-    local OPENSSL_LIB = [ feature.get-values <openssl-lib> : $(properties) ] ;
-
-    if <target-os>darwin in $(properties) && $(OPENSSL_LIB) = ""
-    {
-        # on macOS, default to pick up openssl from the homebrew installation
-        # brew install openssl
-        OPENSSL_LIB = /usr/local/opt/openssl/lib ;
-    }
-    else if <target-os>windows in $(properties) && $(OPENSSL_LIB) = ""
-    {
-        # on windows, assume openssl is installed to c:\OpenSSL-Win32
-        if <address-model>64 in $(properties)
-        { OPENSSL_LIB = c:\\OpenSSL-Win64\\lib ; }
-        else
-        { OPENSSL_LIB = c:\\OpenSSL-Win32\\lib ; }
-    }
-
-    local result ;
-    result += <search>$(OPENSSL_LIB) ;
-    return $(result) ;
-}
-
-# the include path to pick up openssl headers from. This is the
-# usage-requirement for the openssl-related libraries
-rule openssl-include-path ( properties * )
-{
-    local OPENSSL_INCLUDE = [ feature.get-values <openssl-include> : $(properties) ] ;
-
-    if <target-os>darwin in $(properties) && $(OPENSSL_INCLUDE) = ""
-    {
-        # on macOS, default to pick up openssl from the homebrew installation
-        # brew install openssl
-        OPENSSL_INCLUDE = /usr/local/opt/openssl/include ;
-    }
-    else if <target-os>windows in $(properties) && $(OPENSSL_INCLUDE) = ""
-    {
-        # on windows, assume openssl is installed to c:\OpenSSL-Win32
-        if <address-model>64 in $(properties)
-        { OPENSSL_INCLUDE = c:\\OpenSSL-Win64\\include ; }
-        else
-        { OPENSSL_INCLUDE = c:\\OpenSSL-Win32\\include ; }
-    }
-
-    local result ;
-    result += <include>$(OPENSSL_INCLUDE) ;
-    return $(result) ;
-}
-
-# libraries for OpenSSL on Windows
-lib advapi32 : : <name>advapi32 ;
-lib user32 : : <name>user32 ;
-lib shell32 : : <name>shell32 ;
-lib gdi32 : : <name>gdi32 ;
-lib bcrypt : : <name>bcrypt ;
-lib z : : <link>shared <name>z ;
-alias ssl-deps : advapi32 user32 shell32 gdi32 ;
-
-# OpenSSL on Windows
-lib crypto : ssl-deps : <toolset>msvc <openssl-version>1.1 <name>libcrypto
-    <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
-lib ssl : ssl-deps : <toolset>msvc <openssl-version>1.1 <name>libssl <use>crypto
-    <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
-
-# OpenSSL on other platforms
-lib crypto : : <name>crypto <use>z <conditional>@openssl-lib-path : :
-    <conditional>@openssl-include-path ;
-lib ssl : : <name>ssl <use>crypto <conditional>@openssl-lib-path : :
-    <conditional>@openssl-include-path ;
-
-# GnuTLS
-lib gnutls : : <link>shared <name>gnutls ;
-lib nettle : : <link>shared <name>nettle ;
-

Makefile

@@ -25,33 +25,17 @@ else
         LIBS+=openssl
 endif
 
-USE_NICE ?= 0
-ifneq ($(USE_NICE), 0)
-        CPPFLAGS+=-DUSE_NICE=1
-        LIBS+=glib-2.0 gobject-2.0 nice
-else
-        CPPFLAGS+=-DUSE_NICE=0
+USE_JUICE ?= 0
+ifneq ($(USE_JUICE), 0)
+        CPPFLAGS+=-DUSE_JUICE=1
         INCLUDES+=-I$(JUICE_DIR)/include
         LOCALLIBS+=libjuice.a
 ifneq ($(USE_GNUTLS), 0)
         LIBS+=nettle
 endif
-endif
-
-USE_SRTP ?= 0
-ifneq ($(USE_SRTP), 0)
-        CPPFLAGS+=-DRTC_ENABLE_MEDIA=1
-        LIBS+=srtp
 else
-        CPPFLAGS+=-DRTC_ENABLE_MEDIA=0
-endif
-
-
-NO_WEBSOCKET ?= 0
-ifeq ($(NO_WEBSOCKET), 0)
-        CPPFLAGS+=-DRTC_ENABLE_WEBSOCKET=1
-else
-        CPPFLAGS+=-DRTC_ENABLE_WEBSOCKET=0
+        CPPFLAGS+=-DUSE_JUICE=0
+        LIBS+=glib-2.0 gobject-2.0 nice
 endif
 
 INCLUDES+=$(shell pkg-config --cflags $(LIBS))

README.md

@@ -1,113 +1,49 @@
-# libdatachannel - C/C++ WebRTC Data Channels
+# libdatachannel - C/C++ WebRTC DataChannels
 
-libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows. It enables direct connectivity between native applications and web browsers without the pain of importing the entire WebRTC stack. The interface consists of simplified versions of the JavaScript WebRTC and WebSocket APIs present in browsers, in order to ease the design of cross-environment applications.
-It can be compiled with multiple backends:
-- The security layer can be provided through [OpenSSL](https://www.openssl.org/) or [GnuTLS](https://www.gnutls.org/).
-- The connectivity for WebRTC can be provided through my ad-hoc ICE library [libjuice](https://github.com/paullouisageneau/libjuice) as submodule or through [libnice](https://github.com/libnice/libnice).
+libdatachannel is a standalone implementation of WebRTC DataChannels in C++17 with C bindings for POSIX platforms and Microsoft Windows. It enables direct connectivity between native applications and web browsers without the pain of importing the entire WebRTC stack. Its API is modelled as a simplified version of the JavaScript WebRTC API, in order to ease the design of cross-environment applications.
 
 This projet is originally inspired by [librtcdcpp](https://github.com/chadnickbok/librtcdcpp), however it is a complete rewrite from scratch, because the messy architecture of librtcdcpp made solving its implementation issues difficult.
 
+The connectivity can be provided through my ad-hoc ICE library [libjuice](https://github.com/paullouisageneau/libjuice) as submodule or through [libnice](https://github.com/libnice/libnice). The security layer can be provided through [GnuTLS](https://www.gnutls.org/) or [OpenSSL](https://www.openssl.org/).
+
 Licensed under LGPLv2, see [LICENSE](https://github.com/paullouisageneau/libdatachannel/blob/master/LICENSE).
 
 ## Compatibility
 
-The library aims at implementing the following communication protocols:
-
-### WebRTC Data Channels and Media Transport
-
-The WebRTC stack has been tested to be compatible with Firefox and Chromium.
-
-Protocol stack:
-- SCTP-based Data Channels ([draft-ietf-rtcweb-data-channel-13](https://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-13))
-- SRTP-based Media Transport ([draft-ietf-rtcweb-rtp-usage-26](https://tools.ietf.org/html/draft-ietf-rtcweb-rtp-usage-26)) with [libSRTP](https://github.com/cisco/libsrtp)
-- DTLS/UDP ([RFC7350](https://tools.ietf.org/html/rfc7350) and [RFC8261](https://tools.ietf.org/html/rfc8261))
-- ICE ([RFC8445](https://tools.ietf.org/html/rfc8445)) with STUN ([RFC5389](https://tools.ietf.org/html/rfc5389))
-
-Features:
-- Full IPv6 support
-- Trickle ICE ([draft-ietf-ice-trickle-21](https://tools.ietf.org/html/draft-ietf-ice-trickle-21))
-- JSEP compatible ([draft-ietf-rtcweb-jsep-26](https://tools.ietf.org/html/draft-ietf-rtcweb-jsep-26))
-- SRTP and SRTCP key derivation from DTLS ([RFC5764](https://tools.ietf.org/html/rfc5764))
-- Multicast DNS candidates ([draft-ietf-rtcweb-mdns-ice-candidates-04](https://tools.ietf.org/html/draft-ietf-rtcweb-mdns-ice-candidates-04))
-- TURN relaying ([RFC5766](https://tools.ietf.org/html/rfc5766)) with [libnice](https://github.com/libnice/libnice) as ICE backend
-
-Note only SDP BUNDLE mode is supported for media multiplexing ([draft-ietf-mmusic-sdp-bundle-negotiation-54](https://tools.ietf.org/html/draft-ietf-mmusic-sdp-bundle-negotiation-54)). The behavior is equivalent to the JSEP bundle-only policy: the library always negociates one unique network component, where SRTP media streams are multiplexed with SRTCP control packets ([RFC5761](https://tools.ietf.org/html/rfc5761)) and SCTP/DTLS data traffic ([RFC5764](https://tools.ietf.org/html/rfc5764)).
-
-### WebSocket
-
-WebSocket is the protocol of choice for WebRTC signaling. The support is optional and can be disabled at compile time.
-
-Protocol stack:
-- WebSocket protocol ([RFC6455](https://tools.ietf.org/html/rfc6455)), client-side only
-- HTTP over TLS ([RFC2818](https://tools.ietf.org/html/rfc2818))
-
-Features:
-- IPv6 and IPv4/IPv6 dual-stack support
-- Keepalive with ping/pong
+The library aims at fully implementing WebRTC SCTP DataChannels ([draft-ietf-rtcweb-data-channel-13](https://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-13)) over DTLS/UDP ([RFC7350](https://tools.ietf.org/html/rfc7350) and [RFC8261](https://tools.ietf.org/html/rfc8261)) with ICE ([RFC8445](https://tools.ietf.org/html/rfc8445)). It has been tested to be compatible with Firefox and Chromium. It supports IPv6 and Multicast DNS candidates resolution ([draft-ietf-rtcweb-mdns-ice-candidates-03](https://tools.ietf.org/html/draft-ietf-rtcweb-mdns-ice-candidates-03)) provided the operating system also supports it.
 
 ## Dependencies
 
-Dependencies:
 - GnuTLS: https://www.gnutls.org/ or OpenSSL: https://www.openssl.org/
 
-Submodules:
-- libjuice: https://github.com/paullouisageneau/libjuice
-- usrsctp: https://github.com/sctplab/usrsctp
+Optional:
+- libnice: https://nice.freedesktop.org/ (substituable with libjuice)
 
-Optional dependencies:
-- libnice: https://nice.freedesktop.org/ (only if selected as ICE backend instead of libjuice)
-- libSRTP: https://github.com/cisco/libsrtp (only necessary for supporting media transport)
+Submodules:
+- usrsctp: https://github.com/sctplab/usrsctp
+- libjuice: https://github.com/paullouisageneau/libjuice
 
 ## Building
-
-### Clone repository and submodules
+### Building with CMake (preferred)
 
 ```bash
-$ git clone https://github.com/paullouisageneau/libdatachannel.git
-$ cd libdatachannel
 $ git submodule update --init --recursive
-```
-
-### Building with CMake
-
-The CMake library targets `libdatachannel` and `libdatachannel-static` respectively correspond to the shared and static libraries. The default target will build tests and examples. The option `USE_GNUTLS` allows to switch between OpenSSL (default) and GnuTLS, and the option `USE_NICE` allows to switch between libjuice as submodule (default) and libnice.
-
-On Windows, the DLL resulting from the shared library build only exposes the C API, use the static library for the C++ API.
-
-#### POSIX-compliant operating systems (including Linux and Apple macOS)
-```bash
-$ cmake -B build -DUSE_GNUTLS=1 -DUSE_NICE=0
+$ mkdir build
 $ cd build
-$ make -j2
+$ cmake -DUSE_JUICE=1 -DUSE_GNUTLS=1 ..
+$ make
 ```
 
-#### Microsoft Windows with MinGW cross-compilation
-```bash
-$ cmake -B build -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-x86_64-w64-mingw32.cmake # replace with your toolchain file
-$ cd build
-$ make -j2
-```
-
-#### Microsoft Windows with Microsoft Visual C++
-```bash
-$ cmake -B build -G "NMake Makefiles"
-$ cd build
-$ nmake
-```
-
-### Building directly with Make (Linux only)
-
-The option `USE_GNUTLS` allows to switch between OpenSSL (default) and GnuTLS, and the option `USE_NICE` allows to switch between libjuice as submodule (default) and libnice.
+### Building directly with Make
 
 ```bash
-$ make USE_GNUTLS=1 USE_NICE=0
+$ git submodule update --init --recursive
+$ make USE_JUICE=1 USE_GNUTLS=1
 ```
 
-## Examples
+## Example
 
-See [examples](https://github.com/paullouisageneau/libdatachannel/blob/master/examples/) for a complete usage example with signaling server (under GPLv2).
-
-Additionnaly, you might want to have a look at the [C API](https://github.com/paullouisageneau/libdatachannel/blob/master/include/rtc/rtc.h).
+In the following example, note the callbacks are called in another thread.
 
 ### Signal a PeerConnection
 
@@ -121,12 +57,12 @@ config.iceServers.emplace_back("mystunserver.org:3478");
 
 auto pc = make_shared<rtc::PeerConnection>(config);
 
-pc->onLocalDescription([](rtc::Description sdp) {
+pc->onLocalDescription([](const rtc::Description &sdp) {
     // Send the SDP to the remote peer
     MY_SEND_DESCRIPTION_TO_REMOTE(string(sdp));
 });
 
-pc->onLocalCandidate([](rtc::Candidate candidate) {
+pc->onLocalCandidate([](const rtc::Candidate &candidate) {
     // Send the candidate to the remote peer
     MY_SEND_CANDIDATE_TO_REMOTE(candidate.candidate(), candidate.mid());
 });
@@ -157,12 +93,10 @@ pc->onGatheringStateChange([](PeerConnection::GatheringState state) {
 
 ```cpp
 auto dc = pc->createDataChannel("test");
-
 dc->onOpen([]() {
     cout << "Open" << endl;
 });
-
-dc->onMessage([](variant<binary, string> message) {
+dc->onMessage([](const variant<binary, string> &message) {
     if (holds_alternative<string>(message)) {
         cout << "Received: " << get<string>(message) << endl;
     }
@@ -180,27 +114,7 @@ pc->onDataChannel([&dc](shared_ptr<rtc::DataChannel> incoming) {
 
 ```
 
-### Open a WebSocket
+See [test/connectivity.cpp](https://github.com/paullouisageneau/libdatachannel/blob/master/test/connectivity.cpp) for a complete local connection example.
 
-```cpp
-auto ws = make_shared<rtc::WebSocket>();
-
-ws->onOpen([]() {
-	cout << "WebSocket open" << endl;
-});
-
-ws->onMessage([](variant<binary, string> message) {
-    if (holds_alternative<string>(message)) {
-        cout << "WebSocket received: " << get<string>(message) << endl;
-    }
-});
-
-ws->open("wss://my.websocket/service");
-
-```
-
-## External resources
-- Rust wrapper for libdatachannel: [datachannel-rs](https://github.com/lerouxrgd/datachannel-rs)
-- Node.js wrapper for libdatachannel: [node-datachannel](https://github.com/murat-dogan/node-datachannel)
-- WebAssembly wrapper compatible with libdatachannel: [datachannel-wasm](https://github.com/paullouisageneau/datachannel-wasm)
+See [test/cpai.cpp](https://github.com/paullouisageneau/libdatachannel/blob/master/test/capi.cpp) for a C API example.
 

cmake/Modules/FindLibNice.cmake

@@ -10,7 +10,7 @@ if (NOT TARGET LibNice::LibNice)
             HINTS ${PC_LIBNICE_LIBDIR} ${PC_LIBNICE_LIBRARY_DIRS})
 
     include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(LibNice DEFAULT_MSG
+    find_package_handle_standard_args(Libnice DEFAULT_MSG
             LIBNICE_LIBRARY LIBNICE_INCLUDE_DIR)
     mark_as_advanced(LIBNICE_INCLUDE_DIR LIBNICE_LIBRARY)
 

cmake/Modules/FindSRTP.cmake

@@ -1,73 +0,0 @@
-############################################################################
-# FindSRTP.txt
-# Copyright (C) 2014  Belledonne Communications, Grenoble France
-#
-############################################################################
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-############################################################################
-#
-# - Find the SRTP include file and library
-#
-#  SRTP_FOUND - system has SRTP
-#  SRTP_INCLUDE_DIRS - the SRTP include directory
-#  SRTP_LIBRARIES - The libraries needed to use SRTP
-
-set(_SRTP_ROOT_PATHS
-	${CMAKE_INSTALL_PREFIX}
-)
-
-find_path(SRTP2_INCLUDE_DIRS
-	NAMES srtp2/srtp.h
-	HINTS _SRTP_ROOT_PATHS
-	PATH_SUFFIXES include
-)
-
-if(SRTP2_INCLUDE_DIRS)
-	set(HAVE_SRTP_SRTP_H 1)
-	set(SRTP_INCLUDE_DIRS ${SRTP2_INCLUDE_DIRS})
-	set(SRTP_VERSION 2)
-	find_library(SRTP_LIBRARIES
-		NAMES srtp2
-		HINTS ${_SRTP_ROOT_PATHS}
-		PATH_SUFFIXES bin lib
-	)
-else()
-	find_path(SRTP_INCLUDE_DIRS
-		NAMES srtp/srtp.h
-		HINTS _SRTP_ROOT_PATHS
-		PATH_SUFFIXES include
-	)
-	if(SRTP_INCLUDE_DIRS)
-		set(HAVE_SRTP_SRTP_H 1)
-		set(SRTP_VERSION 1)
-	endif()
-	find_library(SRTP_LIBRARIES
-	NAMES srtp
-	HINTS ${_SRTP_ROOT_PATHS}
-	PATH_SUFFIXES bin lib
-)
-endif()
-
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SRTP
-	DEFAULT_MSG
-	SRTP_INCLUDE_DIRS SRTP_LIBRARIES HAVE_SRTP_SRTP_H SRTP_VERSION
-)
-
-mark_as_advanced(SRTP_INCLUDE_DIRS SRTP_LIBRARIES HAVE_SRTP_SRTP_H SRTP_VERSION)
-

examples/README.md

@@ -1,15 +0,0 @@
-# Examples for libdatachannel
-
-This directory contains different WebRTC clients and compatible WebSocket + JSON signaling servers.
-
-- [client](client) uses libdatachannel to implement WebRTC Data Channels with WebSocket signaling
-- [web](web) contains an equivalent implementation for web browsers and a node.js signaling server
-- [signaling-server-python](signaling-server-python) contains a similar signaling server in Python
-- [signaling-server-rust](signaling-server-rust) contains a similar signaling server in Rust (see [lerouxrgd/datachannel-rs](https://github.com/lerouxrgd/datachannel-rs) for Rust wrappers)
-
-- [media](media) is a copy/paste demo to send the webcam from your browser into gstreamer.
-
-Additionally, it contains two debugging tools for libdatachannel with copy-pasting as signaling:
-- [copy-paste](copy-paste) using the C++ API
-- [copy-paste-capi](copy-paste-capi) using the C API
-

examples/client/CMakeLists.txt

@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-if(POLICY CMP0079)
-	cmake_policy(SET CMP0079 NEW)
-endif()
-
-if(WIN32)
-add_executable(datachannel-client main.cpp parse_cl.cpp parse_cl.h getopt.cpp getopt.h)
-target_compile_definitions(datachannel-client PUBLIC STATIC_GETOPT)
-else()
-add_executable(datachannel-client main.cpp parse_cl.cpp parse_cl.h)
-endif()
-set_target_properties(datachannel-client PROPERTIES
-	CXX_STANDARD 17
-	OUTPUT_NAME client)
-
-if(WIN32)
-	target_link_libraries(datachannel-client datachannel-static) # DLL exports only the C API
-else()
-	target_link_libraries(datachannel-client datachannel)
-endif()
-target_link_libraries(datachannel-client datachannel nlohmann_json)
-

examples/client/LICENSE

@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

examples/client/README-getopt-for-windows.md

@@ -1,4 +0,0 @@
-# getopt-for-windows
-getopt.h and getopt.c is very often used in linux, to make it easy for windows user, two files were extracted from glibc. In order to make it works properly in windows, some modification was done and you may compare the change using original source files. Enjoy it!
-
-Source: https://github.com/Chunde/getopt-for-windows.  IMPORTANT: getopt.[ch] are likely not safe for Linux due to conflict with existing getopt.[ch].  They are thus NOT in CMakeFiles.txt and instead both files are #include only on Windows.

examples/client/getopt.cpp

@@ -1,973 +0,0 @@
-/* Getopt for Microsoft C
-This code is a modification of the Free Software Foundation, Inc.
-Getopt library for parsing command line argument the purpose was
-to provide a Microsoft Visual C friendly derivative. This code
-provides functionality for both Unicode and Multibyte builds.
-
-Date: 02/03/2011 - Ludvik Jerabek - Initial Release
-Version: 1.0
-Comment: Supports getopt, getopt_long, and getopt_long_only
-and POSIXLY_CORRECT environment flag
-License: LGPL
-
-Revisions:
-
-02/03/2011 - Ludvik Jerabek - Initial Release
-02/20/2011 - Ludvik Jerabek - Fixed compiler warnings at Level 4
-07/05/2011 - Ludvik Jerabek - Added no_argument, required_argument, optional_argument defs
-08/03/2011 - Ludvik Jerabek - Fixed non-argument runtime bug which caused runtime exception
-08/09/2011 - Ludvik Jerabek - Added code to export functions for DLL and LIB
-02/15/2012 - Ludvik Jerabek - Fixed _GETOPT_THROW definition missing in implementation file
-08/01/2012 - Ludvik Jerabek - Created separate functions for char and wchar_t characters so single dll can do both unicode and ansi
-10/15/2012 - Ludvik Jerabek - Modified to match latest GNU features
-06/19/2015 - Ludvik Jerabek - Fixed maximum option limitation caused by option_a (255) and option_w (65535) structure val variable
-
-**DISCLAIMER**
-THIS MATERIAL IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND,
-EITHER EXPRESS OR IMPLIED, INCLUDING, BUT Not LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE, OR NON-INFRINGEMENT. SOME JURISDICTIONS DO NOT ALLOW THE
-EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSION MAY NOT
-APPLY TO YOU. IN NO EVENT WILL I BE LIABLE TO ANY PARTY FOR ANY
-DIRECT, INDIRECT, SPECIAL OR OTHER CONSEQUENTIAL DAMAGES FOR ANY
-USE OF THIS MATERIAL INCLUDING, WITHOUT LIMITATION, ANY LOST
-PROFITS, BUSINESS INTERRUPTION, LOSS OF PROGRAMS OR OTHER DATA ON
-YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN If WE ARE
-EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-*/
-#define _CRT_SECURE_NO_WARNINGS
-#include <stdlib.h>
-#include <stdio.h>
-#include <malloc.h>
-#include "getopt.h"
-
-#ifdef __cplusplus
-	#define _GETOPT_THROW throw()
-#else
-	#define _GETOPT_THROW
-#endif
-
-int optind = 1;
-int opterr = 1;
-int optopt = '?';
-enum ENUM_ORDERING { REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER };
-
-//
-//
-//		Ansi structures and functions follow
-// 
-//
-
-static struct _getopt_data_a
-{
-	int optind;
-	int opterr;
-	int optopt;
-	char *optarg;
-	int __initialized;
-	char *__nextchar;
-	enum ENUM_ORDERING __ordering;
-	int __posixly_correct;
-	int __first_nonopt;
-	int __last_nonopt;
-} getopt_data_a;
-char *optarg_a;
-
-static void exchange_a(char **argv, struct _getopt_data_a *d)
-{
-	int bottom = d->__first_nonopt;
-	int middle = d->__last_nonopt;
-	int top = d->optind;
-	char *tem;
-	while (top > middle && middle > bottom)
-	{
-		if (top - middle > middle - bottom)
-		{
-			int len = middle - bottom;
-			int i;
-			for (i = 0; i < len; i++)
-			{
-				tem = argv[bottom + i];
-				argv[bottom + i] = argv[top - (middle - bottom) + i];
-				argv[top - (middle - bottom) + i] = tem;
-			}
-			top -= len;
-		}
-		else
-		{
-			int len = top - middle;
-			int i;
-			for (i = 0; i < len; i++)
-			{
-				tem = argv[bottom + i];
-				argv[bottom + i] = argv[middle + i];
-				argv[middle + i] = tem;
-			}
-			bottom += len;
-		}
-	}
-	d->__first_nonopt += (d->optind - d->__last_nonopt);
-	d->__last_nonopt = d->optind;
-}
-static const char *_getopt_initialize_a (const char *optstring, struct _getopt_data_a *d, int posixly_correct)
-{
-	d->__first_nonopt = d->__last_nonopt = d->optind;
-	d->__nextchar = NULL;
-	d->__posixly_correct = posixly_correct | !!getenv("POSIXLY_CORRECT");
-	if (optstring[0] == '-')
-	{
-		d->__ordering = RETURN_IN_ORDER;
-		++optstring;
-	}
-	else if (optstring[0] == '+')
-	{
-		d->__ordering = REQUIRE_ORDER;
-		++optstring;
-	}
-	else if (d->__posixly_correct)
-		d->__ordering = REQUIRE_ORDER;
-	else
-		d->__ordering = PERMUTE;
-	return optstring;
-}
-int _getopt_internal_r_a (int argc, char *const *argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, struct _getopt_data_a *d, int posixly_correct)
-{
-	int print_errors = d->opterr;
-	if (argc < 1)
-		return -1;
-	d->optarg = NULL;
-	if (d->optind == 0 || !d->__initialized)
-	{
-		if (d->optind == 0)
-			d->optind = 1;
-		optstring = _getopt_initialize_a (optstring, d, posixly_correct);
-		d->__initialized = 1;
-	}
-	else if (optstring[0] == '-' || optstring[0] == '+')
-		optstring++;
-	if (optstring[0] == ':')
-		print_errors = 0;
-	if (d->__nextchar == NULL || *d->__nextchar == '\0')
-	{
-		if (d->__last_nonopt > d->optind)
-			d->__last_nonopt = d->optind;
-		if (d->__first_nonopt > d->optind)
-			d->__first_nonopt = d->optind;
-		if (d->__ordering == PERMUTE)
-		{
-			if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
-				exchange_a ((char **) argv, d);
-			else if (d->__last_nonopt != d->optind)
-				d->__first_nonopt = d->optind;
-			while (d->optind < argc && (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0'))
-				d->optind++;
-			d->__last_nonopt = d->optind;
-		}
-		if (d->optind != argc && !strcmp(argv[d->optind], "--"))
-		{
-			d->optind++;
-			if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
-				exchange_a((char **) argv, d);
-			else if (d->__first_nonopt == d->__last_nonopt)
-				d->__first_nonopt = d->optind;
-			d->__last_nonopt = argc;
-			d->optind = argc;
-		}
-		if (d->optind == argc)
-		{
-			if (d->__first_nonopt != d->__last_nonopt)
-				d->optind = d->__first_nonopt;
-			return -1;
-		}
-		if ((argv[d->optind][0] != '-' || argv[d->optind][1] == '\0'))
-		{
-			if (d->__ordering == REQUIRE_ORDER)
-				return -1;
-			d->optarg = argv[d->optind++];
-			return 1;
-		}
-		d->__nextchar = (argv[d->optind] + 1 + (longopts != NULL && argv[d->optind][1] == '-'));
-	}
-	if (longopts != NULL && (argv[d->optind][1] == '-' || (long_only && (argv[d->optind][2] || !strchr(optstring, argv[d->optind][1])))))
-	{
-		char *nameend;
-		unsigned int namelen;
-		const struct option_a *p;
-		const struct option_a *pfound = NULL;
-		struct option_list
-		{
-			const struct option_a *p;
-			struct option_list *next;
-		} *ambig_list = NULL;
-		int exact = 0;
-		int indfound = -1;
-		int option_index;
-		for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++);
-		namelen = (unsigned int)(nameend - d->__nextchar);
-		for (p = longopts, option_index = 0; p->name; p++, option_index++)
-			if (!strncmp(p->name, d->__nextchar, namelen))
-			{
-				if (namelen == (unsigned int)strlen(p->name))
-				{
-					pfound = p;
-					indfound = option_index;
-					exact = 1;
-					break;
-				}
-				else if (pfound == NULL)
-				{
-					pfound = p;
-					indfound = option_index;
-				}
-				else if (long_only || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val)
-				{
-					struct option_list *newp = (struct option_list*)alloca(sizeof(*newp));
-					newp->p = p;
-					newp->next = ambig_list;
-					ambig_list = newp;
-				}
-			}
-			if (ambig_list != NULL && !exact)
-			{
-				if (print_errors)
-				{
-					struct option_list first;
-					first.p = pfound;
-					first.next = ambig_list;
-					ambig_list = &first;
-					fprintf (stderr, "%s: option '%s' is ambiguous; possibilities:", argv[0], argv[d->optind]);
-					do
-					{
-						fprintf (stderr, " '--%s'", ambig_list->p->name);
-						ambig_list = ambig_list->next;
-					}
-					while (ambig_list != NULL);
-					fputc ('\n', stderr);
-				}
-				d->__nextchar += strlen(d->__nextchar);
-				d->optind++;
-				d->optopt = 0;
-				return '?';
-			}
-			if (pfound != NULL)
-			{
-				option_index = indfound;
-				d->optind++;
-				if (*nameend)
-				{
-					if (pfound->has_arg)
-						d->optarg = nameend + 1;
-					else
-					{
-						if (print_errors)
-						{
-							if (argv[d->optind - 1][1] == '-')
-							{
-								fprintf(stderr, "%s: option '--%s' doesn't allow an argument\n",argv[0], pfound->name);
-							}
-							else
-							{
-								fprintf(stderr, "%s: option '%c%s' doesn't allow an argument\n",argv[0], argv[d->optind - 1][0],pfound->name);
-							}
-						}
-						d->__nextchar += strlen(d->__nextchar);
-						d->optopt = pfound->val;
-						return '?';
-					}
-				}
-				else if (pfound->has_arg == 1)
-				{
-					if (d->optind < argc)
-						d->optarg = argv[d->optind++];
-					else
-					{
-						if (print_errors)
-						{
-							fprintf(stderr,"%s: option '--%s' requires an argument\n",argv[0], pfound->name);
-						}
-						d->__nextchar += strlen(d->__nextchar);
-						d->optopt = pfound->val;
-						return optstring[0] == ':' ? ':' : '?';
-					}
-				}
-				d->__nextchar += strlen(d->__nextchar);
-				if (longind != NULL)
-					*longind = option_index;
-				if (pfound->flag)
-				{
-					*(pfound->flag) = pfound->val;
-					return 0;
-				}
-				return pfound->val;
-			}
-			if (!long_only || argv[d->optind][1] == '-' || strchr(optstring, *d->__nextchar) == NULL)
-			{
-				if (print_errors)
-				{
-					if (argv[d->optind][1] == '-')
-					{
-						fprintf(stderr, "%s: unrecognized option '--%s'\n",argv[0], d->__nextchar);
-					}
-					else
-					{
-						fprintf(stderr, "%s: unrecognized option '%c%s'\n",argv[0], argv[d->optind][0], d->__nextchar);
-					}
-				}
-				d->__nextchar = (char *)"";
-				d->optind++;
-				d->optopt = 0;
-				return '?';
-			}
-	}
-	{
-		char c = *d->__nextchar++;
-		char *temp = (char*)strchr(optstring, c);
-		if (*d->__nextchar == '\0')
-			++d->optind;
-		if (temp == NULL || c == ':' || c == ';')
-		{
-			if (print_errors)
-			{
-				fprintf(stderr, "%s: invalid option -- '%c'\n", argv[0], c);
-			}
-			d->optopt = c;
-			return '?';
-		}
-		if (temp[0] == 'W' && temp[1] == ';')
-		{
-			char *nameend;
-			const struct option_a *p;
-			const struct option_a *pfound = NULL;
-			int exact = 0;
-			int ambig = 0;
-			int indfound = 0;
-			int option_index;
-			if (longopts == NULL)
-				goto no_longs;
-			if (*d->__nextchar != '\0')
-			{
-				d->optarg = d->__nextchar;
-				d->optind++;
-			}
-			else if (d->optind == argc)
-			{
-				if (print_errors)
-				{
-					fprintf(stderr,"%s: option requires an argument -- '%c'\n",argv[0], c);
-				}
-				d->optopt = c;
-				if (optstring[0] == ':')
-					c = ':';
-				else
-					c = '?';
-				return c;
-			}
-			else
-				d->optarg = argv[d->optind++];
-			for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '='; nameend++);
-			for (p = longopts, option_index = 0; p->name; p++, option_index++)
-				if (!strncmp(p->name, d->__nextchar, nameend - d->__nextchar))
-				{
-					if ((unsigned int) (nameend - d->__nextchar) == strlen(p->name))
-					{
-						pfound = p;
-						indfound = option_index;
-						exact = 1;
-						break;
-					}
-					else if (pfound == NULL)
-					{
-						pfound = p;
-						indfound = option_index;
-					}
-					else if (long_only || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val)
-						ambig = 1;
-				}
-				if (ambig && !exact)
-				{
-					if (print_errors)
-					{
-						fprintf(stderr, "%s: option '-W %s' is ambiguous\n",argv[0], d->optarg);
-					}
-					d->__nextchar += strlen(d->__nextchar);
-					d->optind++;
-					return '?';
-				}
-				if (pfound != NULL)
-				{
-					option_index = indfound;
-					if (*nameend)
-					{
-						if (pfound->has_arg)
-							d->optarg = nameend + 1;
-						else
-						{
-							if (print_errors)
-							{
-								fprintf(stderr, "%s: option '-W %s' doesn't allow an argument\n",argv[0], pfound->name);
-							}
-							d->__nextchar += strlen(d->__nextchar);
-							return '?';
-						}
-					}
-					else if (pfound->has_arg == 1)
-					{
-						if (d->optind < argc)
-							d->optarg = argv[d->optind++];
-						else
-						{
-							if (print_errors)
-							{
-								fprintf(stderr, "%s: option '-W %s' requires an argument\n",argv[0], pfound->name);
-							}
-							d->__nextchar += strlen(d->__nextchar);
-							return optstring[0] == ':' ? ':' : '?';
-						}
-					}
-					else
-						d->optarg = NULL;
-					d->__nextchar += strlen(d->__nextchar);
-					if (longind != NULL)
-						*longind = option_index;
-					if (pfound->flag)
-					{
-						*(pfound->flag) = pfound->val;
-						return 0;
-					}
-					return pfound->val;
-				}
-no_longs:
-				d->__nextchar = NULL;
-				return 'W';
-		}
-		if (temp[1] == ':')
-		{
-			if (temp[2] == ':')
-			{
-				if (*d->__nextchar != '\0')
-				{
-					d->optarg = d->__nextchar;
-					d->optind++;
-				}
-				else
-					d->optarg = NULL;
-				d->__nextchar = NULL;
-			}
-			else
-			{
-				if (*d->__nextchar != '\0')
-				{
-					d->optarg = d->__nextchar;
-					d->optind++;
-				}
-				else if (d->optind == argc)
-				{
-					if (print_errors)
-					{
-						fprintf(stderr,"%s: option requires an argument -- '%c'\n",argv[0], c);
-					}
-					d->optopt = c;
-					if (optstring[0] == ':')
-						c = ':';
-					else
-						c = '?';
-				}
-				else
-					d->optarg = argv[d->optind++];
-				d->__nextchar = NULL;
-			}
-		}
-		return c;
-	}
-}
-int _getopt_internal_a (int argc, char *const *argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, int posixly_correct)
-{
-	int result;
-	getopt_data_a.optind = optind;
-	getopt_data_a.opterr = opterr;
-	result = _getopt_internal_r_a (argc, argv, optstring, longopts,longind, long_only, &getopt_data_a,posixly_correct);
-	optind = getopt_data_a.optind;
-	optarg_a = getopt_data_a.optarg;
-	optopt = getopt_data_a.optopt;
-	return result;
-}
-int getopt_a (int argc, char *const *argv, const char *optstring) _GETOPT_THROW
-{
-	return _getopt_internal_a (argc, argv, optstring, (const struct option_a *) 0, (int *) 0, 0, 0);
-}
-int getopt_long_a (int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW
-{
-	return _getopt_internal_a (argc, argv, options, long_options, opt_index, 0, 0);
-}
-int getopt_long_only_a (int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW
-{
-	return _getopt_internal_a (argc, argv, options, long_options, opt_index, 1, 0);
-}
-int _getopt_long_r_a (int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index, struct _getopt_data_a *d)
-{
-	return _getopt_internal_r_a (argc, argv, options, long_options, opt_index,0, d, 0);
-}
-int _getopt_long_only_r_a (int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index, struct _getopt_data_a *d)
-{
-	return _getopt_internal_r_a (argc, argv, options, long_options, opt_index, 1, d, 0);
-}
-
-//
-//
-//	Unicode Structures and Functions
-// 
-//
-
-static struct _getopt_data_w
-{
-	int optind;
-	int opterr;
-	int optopt;
-	wchar_t *optarg;
-	int __initialized;
-	wchar_t *__nextchar;
-	enum ENUM_ORDERING __ordering;
-	int __posixly_correct;
-	int __first_nonopt;
-	int __last_nonopt;
-} getopt_data_w;
-wchar_t *optarg_w;
-
-static void exchange_w(wchar_t **argv, struct _getopt_data_w *d)
-{
-	int bottom = d->__first_nonopt;
-	int middle = d->__last_nonopt;
-	int top = d->optind;
-	wchar_t *tem;
-	while (top > middle && middle > bottom)
-	{
-		if (top - middle > middle - bottom)
-		{
-			int len = middle - bottom;
-			int i;
-			for (i = 0; i < len; i++)
-			{
-				tem = argv[bottom + i];
-				argv[bottom + i] = argv[top - (middle - bottom) + i];
-				argv[top - (middle - bottom) + i] = tem;
-			}
-			top -= len;
-		}
-		else
-		{
-			int len = top - middle;
-			int i;
-			for (i = 0; i < len; i++)
-			{
-				tem = argv[bottom + i];
-				argv[bottom + i] = argv[middle + i];
-				argv[middle + i] = tem;
-			}
-			bottom += len;
-		}
-	}
-	d->__first_nonopt += (d->optind - d->__last_nonopt);
-	d->__last_nonopt = d->optind;
-}
-static const wchar_t *_getopt_initialize_w (const wchar_t *optstring, struct _getopt_data_w *d, int posixly_correct)
-{
-	d->__first_nonopt = d->__last_nonopt = d->optind;
-	d->__nextchar = NULL;
-	d->__posixly_correct = posixly_correct | !!_wgetenv(L"POSIXLY_CORRECT");
-	if (optstring[0] == L'-')
-	{
-		d->__ordering = RETURN_IN_ORDER;
-		++optstring;
-	}
-	else if (optstring[0] == L'+')
-	{
-		d->__ordering = REQUIRE_ORDER;
-		++optstring;
-	}
-	else if (d->__posixly_correct)
-		d->__ordering = REQUIRE_ORDER;
-	else
-		d->__ordering = PERMUTE;
-	return optstring;
-}
-int _getopt_internal_r_w (int argc, wchar_t *const *argv, const wchar_t *optstring, const struct option_w *longopts, int *longind, int long_only, struct _getopt_data_w *d, int posixly_correct)
-{
-	int print_errors = d->opterr;
-	if (argc < 1)
-		return -1;
-	d->optarg = NULL;
-	if (d->optind == 0 || !d->__initialized)
-	{
-		if (d->optind == 0)
-			d->optind = 1;
-		optstring = _getopt_initialize_w (optstring, d, posixly_correct);
-		d->__initialized = 1;
-	}
-	else if (optstring[0] == L'-' || optstring[0] == L'+')
-		optstring++;
-	if (optstring[0] == L':')
-		print_errors = 0;
-	if (d->__nextchar == NULL || *d->__nextchar == L'\0')
-	{
-		if (d->__last_nonopt > d->optind)
-			d->__last_nonopt = d->optind;
-		if (d->__first_nonopt > d->optind)
-			d->__first_nonopt = d->optind;
-		if (d->__ordering == PERMUTE)
-		{
-			if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
-				exchange_w((wchar_t **) argv, d);
-			else if (d->__last_nonopt != d->optind)
-				d->__first_nonopt = d->optind;
-			while (d->optind < argc && (argv[d->optind][0] != L'-' || argv[d->optind][1] == L'\0'))
-				d->optind++;
-			d->__last_nonopt = d->optind;
-		}
-		if (d->optind != argc && !wcscmp(argv[d->optind], L"--"))
-		{
-			d->optind++;
-			if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
-				exchange_w((wchar_t **) argv, d);
-			else if (d->__first_nonopt == d->__last_nonopt)
-				d->__first_nonopt = d->optind;
-			d->__last_nonopt = argc;
-			d->optind = argc;
-		}
-		if (d->optind == argc)
-		{
-			if (d->__first_nonopt != d->__last_nonopt)
-				d->optind = d->__first_nonopt;
-			return -1;
-		}
-		if ((argv[d->optind][0] != L'-' || argv[d->optind][1] == L'\0'))
-		{
-			if (d->__ordering == REQUIRE_ORDER)
-				return -1;
-			d->optarg = argv[d->optind++];
-			return 1;
-		}
-		d->__nextchar = (argv[d->optind] + 1 + (longopts != NULL && argv[d->optind][1] == L'-'));
-	}
-	if (longopts != NULL && (argv[d->optind][1] == L'-' || (long_only && (argv[d->optind][2] || !wcschr(optstring, argv[d->optind][1])))))
-	{
-		wchar_t *nameend;
-		unsigned int namelen;
-		const struct option_w *p;
-		const struct option_w *pfound = NULL;
-		struct option_list
-		{
-			const struct option_w *p;
-			struct option_list *next;
-		} *ambig_list = NULL;
-		int exact = 0;
-		int indfound = -1;
-		int option_index;
-		for (nameend = d->__nextchar; *nameend && *nameend != L'='; nameend++);
-		namelen = (unsigned int)(nameend - d->__nextchar);
-		for (p = longopts, option_index = 0; p->name; p++, option_index++)
-			if (!wcsncmp(p->name, d->__nextchar, namelen))
-			{
-				if (namelen == (unsigned int)wcslen(p->name))
-				{
-					pfound = p;
-					indfound = option_index;
-					exact = 1;
-					break;
-				}
-				else if (pfound == NULL)
-				{
-					pfound = p;
-					indfound = option_index;
-				}
-				else if (long_only || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val)
-				{
-					struct option_list *newp = (struct option_list*)alloca(sizeof(*newp));
-					newp->p = p;
-					newp->next = ambig_list;
-					ambig_list = newp;
-				}
-			}
-			if (ambig_list != NULL && !exact)
-			{
-				if (print_errors)
-				{						
-					struct option_list first;
-					first.p = pfound;
-					first.next = ambig_list;
-					ambig_list = &first;
-					fwprintf(stderr, L"%s: option '%s' is ambiguous; possibilities:", argv[0], argv[d->optind]);
-					do
-					{
-						fwprintf (stderr, L" '--%s'", ambig_list->p->name);
-						ambig_list = ambig_list->next;
-					}
-					while (ambig_list != NULL);
-					fputwc (L'\n', stderr);
-				}
-				d->__nextchar += wcslen(d->__nextchar);
-				d->optind++;
-				d->optopt = 0;
-				return L'?';
-			}
-			if (pfound != NULL)
-			{
-				option_index = indfound;
-				d->optind++;
-				if (*nameend)
-				{
-					if (pfound->has_arg)
-						d->optarg = nameend + 1;
-					else
-					{
-						if (print_errors)
-						{
-							if (argv[d->optind - 1][1] == L'-')
-							{
-								fwprintf(stderr, L"%s: option '--%s' doesn't allow an argument\n",argv[0], pfound->name);
-							}
-							else
-							{
-								fwprintf(stderr, L"%s: option '%c%s' doesn't allow an argument\n",argv[0], argv[d->optind - 1][0],pfound->name);
-							}
-						}
-						d->__nextchar += wcslen(d->__nextchar);
-						d->optopt = pfound->val;
-						return L'?';
-					}
-				}
-				else if (pfound->has_arg == 1)
-				{
-					if (d->optind < argc)
-						d->optarg = argv[d->optind++];
-					else
-					{
-						if (print_errors)
-						{
-							fwprintf(stderr,L"%s: option '--%s' requires an argument\n",argv[0], pfound->name);
-						}
-						d->__nextchar += wcslen(d->__nextchar);
-						d->optopt = pfound->val;
-						return optstring[0] == L':' ? L':' : L'?';
-					}
-				}
-				d->__nextchar += wcslen(d->__nextchar);
-				if (longind != NULL)
-					*longind = option_index;
-				if (pfound->flag)
-				{
-					*(pfound->flag) = pfound->val;
-					return 0;
-				}
-				return pfound->val;
-			}
-			if (!long_only || argv[d->optind][1] == L'-' || wcschr(optstring, *d->__nextchar) == NULL)
-			{
-				if (print_errors)
-				{
-					if (argv[d->optind][1] == L'-')
-					{
-						fwprintf(stderr, L"%s: unrecognized option '--%s'\n",argv[0], d->__nextchar);
-					}
-					else
-					{
-						fwprintf(stderr, L"%s: unrecognized option '%c%s'\n",argv[0], argv[d->optind][0], d->__nextchar);
-					}
-				}
-				d->__nextchar = (wchar_t *)L"";
-				d->optind++;
-				d->optopt = 0;
-				return L'?';
-			}
-	}
-	{
-		wchar_t c = *d->__nextchar++;
-		wchar_t *temp = (wchar_t*)wcschr(optstring, c);
-		if (*d->__nextchar == L'\0')
-			++d->optind;
-		if (temp == NULL || c == L':' || c == L';')
-		{
-			if (print_errors)
-			{
-				fwprintf(stderr, L"%s: invalid option -- '%c'\n", argv[0], c);
-			}
-			d->optopt = c;
-			return L'?';
-		}
-		if (temp[0] == L'W' && temp[1] == L';')
-		{
-			wchar_t *nameend;
-			const struct option_w *p;
-			const struct option_w *pfound = NULL;
-			int exact = 0;
-			int ambig = 0;
-			int indfound = 0;
-			int option_index;
-			if (longopts == NULL)
-				goto no_longs;
-			if (*d->__nextchar != L'\0')
-			{
-				d->optarg = d->__nextchar;
-				d->optind++;
-			}
-			else if (d->optind == argc)
-			{
-				if (print_errors)
-				{
-					fwprintf(stderr,L"%s: option requires an argument -- '%c'\n",argv[0], c);
-				}
-				d->optopt = c;
-				if (optstring[0] == L':')
-					c = L':';
-				else
-					c = L'?';
-				return c;
-			}
-			else
-				d->optarg = argv[d->optind++];
-			for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != L'='; nameend++);
-			for (p = longopts, option_index = 0; p->name; p++, option_index++)
-				if (!wcsncmp(p->name, d->__nextchar, nameend - d->__nextchar))
-				{
-					if ((unsigned int) (nameend - d->__nextchar) == wcslen(p->name))
-					{
-						pfound = p;
-						indfound = option_index;
-						exact = 1;
-						break;
-					}
-					else if (pfound == NULL)
-					{
-						pfound = p;
-						indfound = option_index;
-					}
-					else if (long_only || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val)
-						ambig = 1;
-				}
-				if (ambig && !exact)
-				{
-					if (print_errors)
-					{
-						fwprintf(stderr, L"%s: option '-W %s' is ambiguous\n",argv[0], d->optarg);
-					}
-					d->__nextchar += wcslen(d->__nextchar);
-					d->optind++;
-					return L'?';
-				}
-				if (pfound != NULL)
-				{
-					option_index = indfound;
-					if (*nameend)
-					{
-						if (pfound->has_arg)
-							d->optarg = nameend + 1;
-						else
-						{
-							if (print_errors)
-							{
-								fwprintf(stderr, L"%s: option '-W %s' doesn't allow an argument\n",argv[0], pfound->name);
-							}
-							d->__nextchar += wcslen(d->__nextchar);
-							return L'?';
-						}
-					}
-					else if (pfound->has_arg == 1)
-					{
-						if (d->optind < argc)
-							d->optarg = argv[d->optind++];
-						else
-						{
-							if (print_errors)
-							{
-								fwprintf(stderr, L"%s: option '-W %s' requires an argument\n",argv[0], pfound->name);
-							}
-							d->__nextchar += wcslen(d->__nextchar);
-							return optstring[0] == L':' ? L':' : L'?';
-						}
-					}
-					else
-						d->optarg = NULL;
-					d->__nextchar += wcslen(d->__nextchar);
-					if (longind != NULL)
-						*longind = option_index;
-					if (pfound->flag)
-					{
-						*(pfound->flag) = pfound->val;
-						return 0;
-					}
-					return pfound->val;
-				}
-no_longs:
-				d->__nextchar = NULL;
-				return L'W';
-		}
-		if (temp[1] == L':')
-		{
-			if (temp[2] == L':')
-			{
-				if (*d->__nextchar != L'\0')
-				{
-					d->optarg = d->__nextchar;
-					d->optind++;
-				}
-				else
-					d->optarg = NULL;
-				d->__nextchar = NULL;
-			}
-			else
-			{
-				if (*d->__nextchar != L'\0')
-				{
-					d->optarg = d->__nextchar;
-					d->optind++;
-				}
-				else if (d->optind == argc)
-				{
-					if (print_errors)
-					{
-						fwprintf(stderr,L"%s: option requires an argument -- '%c'\n",argv[0], c);
-					}
-					d->optopt = c;
-					if (optstring[0] == L':')
-						c = L':';
-					else
-						c = L'?';
-				}
-				else
-					d->optarg = argv[d->optind++];
-				d->__nextchar = NULL;
-			}
-		}
-		return c;
-	}
-}
-int _getopt_internal_w (int argc, wchar_t *const *argv, const wchar_t *optstring, const struct option_w *longopts, int *longind, int long_only, int posixly_correct)
-{
-	int result;
-	getopt_data_w.optind = optind;
-	getopt_data_w.opterr = opterr;
-	result = _getopt_internal_r_w (argc, argv, optstring, longopts,longind, long_only, &getopt_data_w,posixly_correct);
-	optind = getopt_data_w.optind;
-	optarg_w = getopt_data_w.optarg;
-	optopt = getopt_data_w.optopt;
-	return result;
-}
-int getopt_w (int argc, wchar_t *const *argv, const wchar_t *optstring) _GETOPT_THROW
-{
-	return _getopt_internal_w (argc, argv, optstring, (const struct option_w *) 0, (int *) 0, 0, 0);
-}
-int getopt_long_w (int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW
-{
-	return _getopt_internal_w (argc, argv, options, long_options, opt_index, 0, 0);
-}
-int getopt_long_only_w (int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW
-{
-	return _getopt_internal_w (argc, argv, options, long_options, opt_index, 1, 0);
-}
-int _getopt_long_r_w (int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index, struct _getopt_data_w *d)
-{
-	return _getopt_internal_r_w (argc, argv, options, long_options, opt_index,0, d, 0);
-}
-int _getopt_long_only_r_w (int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index, struct _getopt_data_w *d)
-{
-	return _getopt_internal_r_w (argc, argv, options, long_options, opt_index, 1, d, 0);
-}

examples/client/getopt.h

@@ -1,136 +0,0 @@
-/* Getopt for Microsoft C
-This code is a modification of the Free Software Foundation, Inc.
-Getopt library for parsing command line argument the purpose was
-to provide a Microsoft Visual C friendly derivative. This code
-provides functionality for both Unicode and Multibyte builds.
-
-Date: 02/03/2011 - Ludvik Jerabek - Initial Release
-Version: 1.0
-Comment: Supports getopt, getopt_long, and getopt_long_only
-and POSIXLY_CORRECT environment flag
-License: LGPL
-
-Revisions:
-
-02/03/2011 - Ludvik Jerabek - Initial Release
-02/20/2011 - Ludvik Jerabek - Fixed compiler warnings at Level 4
-07/05/2011 - Ludvik Jerabek - Added no_argument, required_argument, optional_argument defs
-08/03/2011 - Ludvik Jerabek - Fixed non-argument runtime bug which caused runtime exception
-08/09/2011 - Ludvik Jerabek - Added code to export functions for DLL and LIB
-02/15/2012 - Ludvik Jerabek - Fixed _GETOPT_THROW definition missing in implementation file
-08/01/2012 - Ludvik Jerabek - Created separate functions for char and wchar_t characters so single dll can do both unicode and ansi
-10/15/2012 - Ludvik Jerabek - Modified to match latest GNU features
-06/19/2015 - Ludvik Jerabek - Fixed maximum option limitation caused by option_a (255) and option_w (65535) structure val variable
-
-**DISCLAIMER**
-THIS MATERIAL IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND,
-EITHER EXPRESS OR IMPLIED, INCLUDING, BUT Not LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE, OR NON-INFRINGEMENT. SOME JURISDICTIONS DO NOT ALLOW THE
-EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSION MAY NOT
-APPLY TO YOU. IN NO EVENT WILL I BE LIABLE TO ANY PARTY FOR ANY
-DIRECT, INDIRECT, SPECIAL OR OTHER CONSEQUENTIAL DAMAGES FOR ANY
-USE OF THIS MATERIAL INCLUDING, WITHOUT LIMITATION, ANY LOST
-PROFITS, BUSINESS INTERRUPTION, LOSS OF PROGRAMS OR OTHER DATA ON
-YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN If WE ARE
-EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-*/
-#ifndef __GETOPT_H_
-	#define __GETOPT_H_
-
-	#ifdef _GETOPT_API
-		#undef _GETOPT_API
-	#endif
-
-	#if defined(EXPORTS_GETOPT) && defined(STATIC_GETOPT)
-		#error "The preprocessor definitions of EXPORTS_GETOPT and STATIC_GETOPT can only be used individually"
-	#elif defined(STATIC_GETOPT)
-		#pragma message("Warning static builds of getopt violate the Lesser GNU Public License")
-		#define _GETOPT_API
-	#elif defined(EXPORTS_GETOPT)
-		#pragma message("Exporting getopt library")
-		#define _GETOPT_API __declspec(dllexport)
-	#else
-		#pragma message("Importing getopt library")
-		#define _GETOPT_API __declspec(dllimport)
-	#endif
-
-	// Change behavior for C\C++
-	#ifdef __cplusplus
-		#define _BEGIN_EXTERN_C extern "C" {
-		#define _END_EXTERN_C }
-		#define _GETOPT_THROW throw()
-	#else
-		#define _BEGIN_EXTERN_C
-		#define _END_EXTERN_C
-		#define _GETOPT_THROW
-	#endif
-
-	// Standard GNU options
-	#define	null_argument		0	/*Argument Null*/
-	#define	no_argument			0	/*Argument Switch Only*/
-	#define required_argument	1	/*Argument Required*/
-	#define optional_argument	2	/*Argument Optional*/	
-
-	// Shorter Options
-	#define ARG_NULL	0	/*Argument Null*/
-	#define ARG_NONE	0	/*Argument Switch Only*/
-	#define ARG_REQ		1	/*Argument Required*/
-	#define ARG_OPT		2	/*Argument Optional*/
-
-	#include <string.h>
-	#include <wchar.h>
-
-_BEGIN_EXTERN_C
-
-	extern _GETOPT_API int optind;
-	extern _GETOPT_API int opterr;
-	extern _GETOPT_API int optopt;
-
-	// Ansi
-	struct option_a
-	{
-		const char* name;
-		int has_arg;
-		int *flag;
-		int val;
-	};
-	extern _GETOPT_API char *optarg_a;
-	extern _GETOPT_API int getopt_a(int argc, char *const *argv, const char *optstring) _GETOPT_THROW;
-	extern _GETOPT_API int getopt_long_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW;
-	extern _GETOPT_API int getopt_long_only_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW;
-
-	// Unicode
-	struct option_w
-	{
-		const wchar_t* name;
-		int has_arg;
-		int *flag;
-		int val;
-	};
-	extern _GETOPT_API wchar_t *optarg_w;
-	extern _GETOPT_API int getopt_w(int argc, wchar_t *const *argv, const wchar_t *optstring) _GETOPT_THROW;
-	extern _GETOPT_API int getopt_long_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW;
-	extern _GETOPT_API int getopt_long_only_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW;	
-	
-_END_EXTERN_C
-
-	#undef _BEGIN_EXTERN_C
-	#undef _END_EXTERN_C
-	#undef _GETOPT_THROW
-	#undef _GETOPT_API
-
-	#ifdef _UNICODE
-		#define getopt getopt_w
-		#define getopt_long getopt_long_w
-		#define getopt_long_only getopt_long_only_w
-		#define option option_w
-		#define optarg optarg_w
-	#else
-		#define getopt getopt_a
-		#define getopt_long getopt_long_a
-		#define getopt_long_only getopt_long_only_a
-		#define option option_a
-		#define optarg optarg_a
-	#endif
-#endif  // __GETOPT_H_

examples/client/main.cpp

@@ -1,279 +0,0 @@
-/*
- * libdatachannel client example
- * Copyright (c) 2019-2020 Paul-Louis Ageneau
- * Copyright (c) 2019 Murat Dogan
- * Copyright (c) 2020 Will Munn
- * Copyright (c) 2020 Nico Chatzi
- * Copyright (c) 2020 Lara Mackey
- * Copyright (c) 2020 Erik Cota-Robles
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rtc/rtc.hpp"
-
-#include <nlohmann/json.hpp>
-
-#include <algorithm>
-#include <iostream>
-#include <memory>
-#include <random>
-#include <thread>
-#include <unordered_map>
-#include "parse_cl.h"
-
-using namespace rtc;
-using namespace std;
-using namespace std::chrono_literals;
-
-using json = nlohmann::json;
-
-template <class T> weak_ptr<T> make_weak_ptr(shared_ptr<T> ptr) { return ptr; }
-
-unordered_map<string, shared_ptr<PeerConnection>> peerConnectionMap;
-unordered_map<string, shared_ptr<DataChannel>> dataChannelMap;
-
-string localId;
-bool echoDataChannelMessages = false;
-
-shared_ptr<PeerConnection> createPeerConnection(const Configuration &config,
-                                                weak_ptr<WebSocket> wws, string id);
-void confirmOnStdout(bool echoed, string id, string type, size_t length);
-string randomId(size_t length);
-
-int main(int argc, char **argv) {
-	Cmdline *params = nullptr;
-	try {
-		params = new Cmdline(argc, argv);
-	} catch (const std::range_error&e) {
-		std::cout<< e.what() << '\n';
-		delete params;
-		return -1;
-	}
-
-	rtc::InitLogger(LogLevel::Debug);
-
-	Configuration config;
-	string stunServer = "";
-	if (params->stunServer().substr(0,5).compare("stun:") != 0) {
-		stunServer = "stun:";
-	}
-	stunServer += params->stunServer() + ":" + to_string(params->stunPort());
-	cout << "Stun server is " << stunServer << endl;
-	config.iceServers.emplace_back(stunServer);
-
-	localId = randomId(4);
-	cout << "The local ID is: " << localId << endl;
-
-	echoDataChannelMessages = params->echoDataChannelMessages();
-	cout << "Received data channel messages will be "
-	     << (echoDataChannelMessages ? "echoed back to sender" : "printed to stdout") << endl;
-
-	auto ws = make_shared<WebSocket>();
-
-	ws->onOpen([]() { cout << "WebSocket connected, signaling ready" << endl; });
-
-	ws->onClosed([]() { cout << "WebSocket closed" << endl; });
-
-	ws->onError([](const string &error) { cout << "WebSocket failed: " << error << endl; });
-
-	ws->onMessage([&](variant<binary, string> data) {
-		if (!holds_alternative<string>(data))
-			return;
-
-		json message = json::parse(get<string>(data));
-
-		auto it = message.find("id");
-		if (it == message.end())
-			return;
-		string id = it->get<string>();
-
-		it = message.find("type");
-		if (it == message.end())
-			return;
-		string type = it->get<string>();
-
-		shared_ptr<PeerConnection> pc;
-		if (auto jt = peerConnectionMap.find(id); jt != peerConnectionMap.end()) {
-			pc = jt->second;
-		} else if (type == "offer") {
-			cout << "Answering to " + id << endl;
-			pc = createPeerConnection(config, ws, id);
-		} else {
-			return;
-		}
-
-		if (type == "offer" || type == "answer") {
-			auto sdp = message["description"].get<string>();
-			pc->setRemoteDescription(Description(sdp, type));
-		} else if (type == "candidate") {
-			auto sdp = message["candidate"].get<string>();
-			auto mid = message["mid"].get<string>();
-			pc->addRemoteCandidate(Candidate(sdp, mid));
-		}
-	});
-
-	string wsPrefix = "";
-	if (params->webSocketServer().substr(0,5).compare("ws://") != 0) {
-		wsPrefix = "ws://";
-	}
-	const string url = wsPrefix + params->webSocketServer() + ":" +
-		to_string(params->webSocketPort()) + "/" + localId;
-	cout << "Url is " << url << endl;
-	ws->open(url);
-
-	cout << "Waiting for signaling to be connected..." << endl;
-	while (!ws->isOpen()) {
-		if (ws->isClosed())
-			return 1;
-		this_thread::sleep_for(100ms);
-	}
-
-	while (true) {
-		string id;
-		cout << "Enter a remote ID to send an offer:" << endl;
-		cin >> id;
-		cin.ignore();
-		if (id.empty())
-			break;
-		if (id == localId)
-			continue;
-
-		cout << "Offering to " + id << endl;
-		auto pc = createPeerConnection(config, ws, id);
-
-		// We are the offerer, so create a data channel to initiate the process
-		const string label = "test";
-		cout << "Creating DataChannel with label \"" << label << "\"" << endl;
-		auto dc = pc->createDataChannel(label);
-
-		dc->onOpen([id, wdc = make_weak_ptr(dc)]() {
-			cout << "DataChannel from " << id << " open" << endl;
-			if (auto dc = wdc.lock())
-				dc->send("Hello from " + localId);
-		});
-
-		dc->onClosed([id]() { cout << "DataChannel from " << id << " closed" << endl; });
-
-		dc->onMessage([id, wdc = make_weak_ptr(dc)](const variant<binary, string> &message) {
-			static bool firstMessage = true;
-			if (holds_alternative<string>(message) && (!echoDataChannelMessages || firstMessage)) {
-				cout << "Message from " << id << " received: " << get<string>(message) << endl;
-				firstMessage = false;
-			} else if (echoDataChannelMessages) {
-				bool echoed = false;
-				if (auto dc = wdc.lock()) {
-					dc->send(message);
-					echoed = true;
-				}
-				confirmOnStdout(echoed, id, (holds_alternative<string>(message) ? "text" : "binary"),
-						get<string>(message).length());
-			}
-		});
-
-		dataChannelMap.emplace(id, dc);
-
-		this_thread::sleep_for(1s);
-	}
-
-	cout << "Cleaning up..." << endl;
-
-	dataChannelMap.clear();
-	peerConnectionMap.clear();
-	delete params;
-	return 0;
-}
-
-// Create and setup a PeerConnection
-shared_ptr<PeerConnection> createPeerConnection(const Configuration &config,
-                                                weak_ptr<WebSocket> wws, string id) {
-	auto pc = make_shared<PeerConnection>(config);
-
-	pc->onStateChange([](PeerConnection::State state) { cout << "State: " << state << endl; });
-
-	pc->onGatheringStateChange(
-	    [](PeerConnection::GatheringState state) { cout << "Gathering State: " << state << endl; });
-
-	pc->onLocalDescription([wws, id](Description description) {
-		json message = {
-		    {"id", id}, {"type", description.typeString()}, {"description", string(description)}};
-
-		if (auto ws = wws.lock())
-			ws->send(message.dump());
-	});
-
-	pc->onLocalCandidate([wws, id](Candidate candidate) {
-		json message = {{"id", id},
-		                {"type", "candidate"},
-		                {"candidate", string(candidate)},
-		                {"mid", candidate.mid()}};
-
-		if (auto ws = wws.lock())
-			ws->send(message.dump());
-	});
-
-	pc->onDataChannel([id](shared_ptr<DataChannel> dc) {
-		cout << "DataChannel from " << id << " received with label \"" << dc->label() << "\""
-		     << endl;
-
-		dc->onClosed([id]() { cout << "DataChannel from " << id << " closed" << endl; });
-
-		dc->onMessage([id, wdc = make_weak_ptr(dc)](const variant<binary, string> &message) {
-			static bool firstMessage = true;
-			if (holds_alternative<string>(message) && (!echoDataChannelMessages || firstMessage)) {
-				cout << "Message from " << id << " received: " << get<string>(message) << endl;
-				firstMessage = false;
-			} else if (echoDataChannelMessages) {
-				bool echoed = false;
-				if (auto dc = wdc.lock()) {
-					dc->send(message);
-					echoed = true;
-				}
-				confirmOnStdout(echoed, id, (holds_alternative<string>(message) ? "text" : "binary"),
-						get<string>(message).length());
-			}
-		});
-
-		dc->send("Hello from " + localId);
-
-		dataChannelMap.emplace(id, dc);
-	});
-
-	peerConnectionMap.emplace(id, pc);
-	return pc;
-};
-
-void confirmOnStdout(bool echoed, string id, string type, size_t length) {
-	static long count = 0;
-	static long freq = 100;
-	if (!(++count%freq)) {
-		cout << "Received " << count << " pings in total from host " << id << ", most recent of type "
-		     << type << " and " << (echoed ? "" : "un") << "successfully echoed most recent ping of size "
-		     << length << " back to " << id << endl;
-		if (count >= (freq * 10) && freq < 1000000) {
-			freq *= 10;
-		}
-	}
-}
-
-// Helper function to generate a random ID
-string randomId(size_t length) {
-	static const string characters(
-	    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
-	string id(length, '0');
-	default_random_engine rng(random_device{}());
-	uniform_int_distribution<int> dist(0, int(characters.size() - 1));
-	generate(id.begin(), id.end(), [&]() { return characters.at(dist(rng)); });
-	return id;
-}

examples/client/parse_cl.cpp

@@ -1,173 +0,0 @@
-/******************************************************************************
-**
-** parse_cl.cpp
-**
-** Thu Aug  6 19:42:25 2020
-** Linux 5.4.0-42-generic (#46-Ubuntu SMP Fri Jul 10 00:24:02 UTC 2020) x86_64
-** cerik@Erik-VBox-Ubuntu (Erik Cota-Robles)
-**
-** Copyright (c) 2020 Erik Cota-Robles
-**
-** Definition of command line parser class
-**
-** Automatically created by genparse v0.9.3
-**
-** See http://genparse.sourceforge.net for details and updates
-**
-**
-******************************************************************************/
-
-#include <stdlib.h>
-
-#if defined(_WIN32) || defined(WIN32)
-#include "getopt.h"
-#else
-#include <getopt.h>
-#endif
-
-#include "parse_cl.h"
-
-/*----------------------------------------------------------------------------
-**
-** Cmdline::Cmdline ()
-**
-** Constructor method.
-**
-**--------------------------------------------------------------------------*/
-
-Cmdline::Cmdline (int argc, char *argv[]) // ISO C++17 not allowed: throw (std::string )
-{
-  extern char *optarg;
-  extern int optind;
-  int c;
-
-  static struct option long_options[] =
-  {
-    {"stunServer", required_argument, NULL, 's'},
-    {"stunPort", required_argument, NULL, 't'},
-    {"webSocketServer", required_argument, NULL, 'w'},
-    {"webSocketPort", required_argument, NULL, 'x'},
-    {"help", no_argument, NULL, 'h'},
-    {"version", no_argument, NULL, 'v'},
-    {NULL, 0, NULL, 0}
-  };
-
-  _program_name += argv[0];
-
-  /* default values */
-  _s = "stun.l.google.com";
-  _t = 19302;
-  _w = "localhost";
-  _x = 8000;
-  _e = false;
-  _h = false;
-  _v = false;
-
-  optind = 0;
-  while ((c = getopt_long (argc, argv, "s:t:w:x:ehv", long_options, &optind)) != - 1)
-    {
-      switch (c)
-        {
-        case 's': 
-          _s = optarg;
-          break;
-
-        case 't': 
-          _t = atoi (optarg);
-          if (_t < 0)
-            {
-              std::string err;
-              err += "parameter range error: t must be >= 0";
-              throw (std::range_error(err));
-            }
-          if (_t > 65535)
-            {
-              std::string err;
-              err += "parameter range error: t must be <= 65535";
-              throw (std::range_error(err));
-            }
-          break;
-
-        case 'w': 
-          _w = optarg;
-          break;
-
-        case 'x': 
-          _x = atoi (optarg);
-          if (_x < 0)
-            {
-              std::string err;
-              err += "parameter range error: x must be >= 0";
-              throw (std::range_error(err));
-            }
-          if (_x > 65535)
-            {
-              std::string err;
-              err += "parameter range error: x must be <= 65535";
-              throw (std::range_error(err));
-            }
-          break;
-
-        case 'e': 
-          _e = true;
-          break;
-
-        case 'h': 
-          _h = true;
-          this->usage (EXIT_SUCCESS);
-          break;
-
-        case 'v': 
-          _v = true;
-          this->version (EXIT_SUCCESS);
-          break;
-
-        default:
-          this->usage (EXIT_FAILURE);
-
-        }
-    } /* while */
-
-  _optind = optind;
-}
-
-/*----------------------------------------------------------------------------
-**
-** Cmdline::usage () and version()
-**
-** Print out usage (or version) information, then exit.
-**
-**--------------------------------------------------------------------------*/
-
-void Cmdline::usage (int status)
-{
-  if (status != EXIT_SUCCESS)
-    std::cerr << "Try `" << _program_name << " --help' for more information.\n";
-  else
-    {
-      std::cout << "\
-usage: " << _program_name << " [ -estwxhv ] \n\
-libdatachannel client implementing WebRTC Data Channels with WebSocket signaling\n\
-   [ -e ] [ --echo ] (type=FLAG)\n\
-          Echo data channel messages back to sender rather than putting to stdout.\n\
-   [ -s ] [ --stunServer ] (type=STRING, default=stun.l.google.com)\n\
-          Stun server URL or IP address.\n\
-   [ -t ] [ --stunPort ] (type=INTEGER, range=0...65535, default=19302)\n\
-          Stun server port.\n\
-   [ -w ] [ --webSocketServer ] (type=STRING, default=localhost)\n\
-          Web socket server URL or IP address.\n\
-   [ -x ] [ --webSocketPort ] (type=INTEGER, range=0...65535, default=8000)\n\
-          Web socket server port.\n\
-   [ -h ] [ --help ] (type=FLAG)\n\
-          Display this help and exit.\n\
-   [ -v ] [ --version ] (type=FLAG)\n\
-          Output version information and exit.\n";
-    }
-  exit (status);
-}
-
-void Cmdline::version (int status)
-{
-  std::cout << _program_name << " v0.5\n";
-  exit (status);
-}

examples/client/parse_cl.h

@@ -1,72 +0,0 @@
-/******************************************************************************
-**
-** parse_cl.h
-**
-** Thu Aug  6 19:42:25 2020
-** Linux 5.4.0-42-generic (#46-Ubuntu SMP Fri Jul 10 00:24:02 UTC 2020) x86_64
-** cerik@Erik-VBox-Ubuntu (Erik Cota-Robles)
-**
-** Copyright (c) 2020 Erik Cota-Robles
-**
-** Header file for command line parser class
-**
-** Automatically created by genparse v0.9.3
-**
-** See http://genparse.sourceforge.net for details and updates
-**
-******************************************************************************/
-
-#ifndef CMDLINE_H
-#define CMDLINE_H
-
-#include <iostream>
-#include <string>
-
-/*----------------------------------------------------------------------------
-**
-** class Cmdline
-**
-** command line parser class
-**
-**--------------------------------------------------------------------------*/
-
-class Cmdline
-{
-private:
-  /* parameters */
-  std::string _s;
-  int _t;
-  std::string _w;
-  int _x;
-  bool _e;
-  bool _h;
-  bool _v;
-
-  /* other stuff to keep track of */
-  std::string _program_name;
-  int _optind;
-
-public:
-  /* constructor and destructor */
-  Cmdline (int, char **); // ISO C++17 not allowed: throw (std::string);
-  ~Cmdline (){}
-
-  /* usage function */
-  void usage (int status);
-
-  /* version function */
-  void version (int status);
-
-  /* return next (non-option) parameter */
-  int next_param () { return _optind; }
-
-  std::string stunServer () const { return _s; }
-  int stunPort () const { return _t; }
-  std::string webSocketServer () const { return _w; }
-  int webSocketPort () const { return _x; }
-  bool echoDataChannelMessages () const { return _e; }
-  bool h () const { return _h; }
-  bool v () const { return _v; }
-};
-
-#endif

examples/copy-paste-capi/CMakeLists.txt

@@ -1,15 +0,0 @@
-cmake_minimum_required(VERSION 3.5.1)
-project(offerer C)
-
-set(CMAKE_C_STANDARD 11)
-
-add_executable(datachannel-copy-paste-capi-offerer offerer.c)
-set_target_properties(datachannel-copy-paste-capi-offerer PROPERTIES
-	OUTPUT_NAME offerer)
-target_link_libraries(datachannel-copy-paste-capi-offerer datachannel)
-
-add_executable(datachannel-copy-paste-capi-answerer answerer.c)
-set_target_properties(datachannel-copy-paste-capi-answerer PROPERTIES
-	OUTPUT_NAME answerer)
-target_link_libraries(datachannel-copy-paste-capi-answerer datachannel)
-

examples/copy-paste-capi/answerer.c

@@ -1,309 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- * Copyright (c) 2020 Stevedan Ogochukwu Omodolor
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <rtc/rtc.h>
-
-#include <ctype.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _WIN32
-#include "getline.h"
-#include <windows.h>
-static void sleep(unsigned int secs) { Sleep(secs * 1000); }
-#else
-#include <unistd.h> // for sleep
-#endif
-
-typedef struct {
-        rtcState state;
-        rtcGatheringState gatheringState;
-        int pc;
-        int dc;
-        bool connected;
-} Peer;
-
-static void dataChannelCallback(int dc, void *ptr);
-static void descriptionCallback(const char *sdp, const char *type, void *ptr);
-static void candidateCallback(const char *cand, const char *mid, void *ptr);
-static void stateChangeCallback(rtcState state, void *ptr);
-static void gatheringStateCallback(rtcGatheringState state, void *ptr);
-static void closedCallback(void *ptr);
-static void messageCallback(const char *message, int size, void *ptr);
-static void deletePeer(Peer *peer);
-
-char* state_print(rtcState state);
-char *rtcGatheringState_print(rtcGatheringState state);
-
-int all_space(const char *str);
-
-int main(int argc, char **argv) {
-	rtcInitLogger(RTC_LOG_DEBUG, NULL);
-
-	// Create peer
-	rtcConfiguration config;
-	memset(&config, 0, sizeof(config));
-
-	Peer *peer = (Peer *)malloc(sizeof(Peer));
-	if (!peer) {
-		fprintf(stderr, "Error allocating memory for peer\n");
-		return -1;
-	    }
-        memset(peer, 0, sizeof(Peer));
-
-        printf("Peer created\n");
-
-        // Create peer connection
-        peer->pc = rtcCreatePeerConnection(&config);
-
-        rtcSetUserPointer(peer->pc, peer);
-        rtcSetLocalDescriptionCallback(peer->pc, descriptionCallback);
-        rtcSetLocalCandidateCallback(peer->pc, candidateCallback);
-        rtcSetStateChangeCallback(peer->pc, stateChangeCallback);
-        rtcSetGatheringStateChangeCallback(peer->pc, gatheringStateCallback);
-
-        rtcSetUserPointer(peer->dc, NULL);
-        rtcSetDataChannelCallback(peer->pc, dataChannelCallback);
-
-	    sleep(1);
-
-	    bool exit = false;
-        while (!exit) {
-                printf("\n");
-                printf("***************************************************************************************\n");
-                printf("* 0: Exit /"
-                       " 1: Enter remote description /"
-                       " 2: Enter remote candidate /"
-                       " 3: Send message /"
-                       " 4: Print Connection Info *\n"
-                       "[Command]: ");
-
-                int command = -1;
-                int c;
-
-		        if (!scanf("%d", &command)) {
-			        break;
-		        }
-
-		        while ((c = getchar()) != '\n' && c != EOF) {
-		        }
-		        fflush(stdin);
-
-		        switch (command) {
-                case 0: {
-                        exit = true;
-                        break;
-                }
-                case 1: {
-                        // Parse Description
-                        printf("[Description]: ");
-                        char *line = NULL;
-                        size_t len = 0;
-                        size_t read = 0;
-                        char *sdp = (char*) malloc(sizeof(char));
-                        while ((read = getline(&line, &len, stdin)) != -1 && !all_space(line)) {
-                                sdp = (char*) realloc (sdp,(strlen(sdp)+1) +strlen(line)+1);
-                                strcat(sdp, line);
-
-                        }
-                        printf("%s\n",sdp);
-                        rtcSetRemoteDescription(peer->pc, sdp, "offer");
-                        free(sdp);
-                        free(line);
-                        break;
-
-                }
-                case 2: {
-                        // Parse Candidate
-                        printf("[Candidate]: ");
-                        char* candidate = NULL;
-                        size_t candidate_size = 0;
-
-                        if(getline(&candidate, &candidate_size, stdin)) {
-                                rtcAddRemoteCandidate(peer->pc, candidate, "0");
-                                free(candidate);
-
-			            } else {
-				            printf("Error reading line\n");
-				            break;
-			            }
-
-			            break;
-                }
-                case 3: {
-                        // Send Message
-                        if(!peer->connected) {
-                                printf("** Channel is not Open **");
-                                break;
-                        }
-                        printf("[Message]: ");
-                        char* message = NULL;
-                        size_t message_size = 0;
-
-                        if(getline(&message, &message_size, stdin)) {
-                                rtcSendMessage(peer->dc, message, -1);
-                                free(message);
-			            } else {
-				            printf("Error reading line\n");
-				            break;
-			            }
-			            break;
-                }
-                case 4: {
-                        // Connection Info
-                        if(!peer->connected) {
-                                printf("** Channel is not Open **");
-                                break;
-                        }
-                        char buffer[256];
-                        if (rtcGetLocalAddress(peer->pc, buffer, 256) >= 0)
-                                printf("Local address 1:  %s\n", buffer);
-                        if (rtcGetRemoteAddress(peer->pc, buffer, 256) >= 0)
-                                printf("Remote address 1: %s\n", buffer);
-
-                        else
-                                printf("Could not get Candidate Pair Info\n");
-                        break;
-                }
-                default: {
-                        printf("** Invalid Command **");
-                        break;
-                }
-                }
-        }
-
-        deletePeer(peer);
-        return 0;
-}
-
-static void descriptionCallback(const char *sdp, const char *type, void *ptr) {
-        // Peer *peer = (Peer *)ptr;
-        printf("Description %s:\n%s\n", "answerer", sdp);
-}
-
-static void candidateCallback(const char *cand, const char *mid, void *ptr) {
-        // Peer *peer = (Peer *)ptr;
-        printf("Candidate %s: %s\n", "answerer", cand);
-
-}
-
-static void stateChangeCallback(rtcState state, void *ptr) {
-        Peer *peer = (Peer *)ptr;
-        peer->state = state;
-        printf("State %s: %s\n", "answerer", state_print(state));
-}
-
-static void gatheringStateCallback(rtcGatheringState state, void *ptr) {
-        Peer *peer = (Peer *)ptr;
-        peer->gatheringState = state;
-        printf("Gathering state %s: %s\n", "answerer", rtcGatheringState_print(state));
-}
-
-static void closedCallback(void *ptr) {
-        Peer *peer = (Peer *)ptr;
-        peer->connected = false;
-}
-
-static void messageCallback(const char *message, int size, void *ptr) {
-        if (size < 0) { // negative size indicates a null-terminated string
-                printf("Message %s: %s\n", "answerer", message);
-        } else {
-                printf("Message %s: [binary of size %d]\n", "answerer", size);
-        }
-}
-
-static void deletePeer(Peer *peer) {
-        if (peer) {
-                if (peer->dc)
-                        rtcDeleteDataChannel(peer->dc);
-                if (peer->pc)
-                        rtcDeletePeerConnection(peer->pc);
-                free(peer);
-        }
-}
-
-static void dataChannelCallback(int dc, void *ptr) {
-        Peer *peer = (Peer *)ptr;
-        peer->dc = dc;
-        peer->connected = true;
-        rtcSetClosedCallback(dc, closedCallback);
-        rtcSetMessageCallback(dc, messageCallback);
-        char buffer[256];
-        if (rtcGetDataChannelLabel(dc, buffer, 256) >= 0)
-                printf("DataChannel %s: Received with label \"%s\"\n", "answerer", buffer);
-}
-
-char *state_print(rtcState state) {
-	char *str = NULL;
-	switch (state) {
-	case RTC_NEW:
-		str = "RTC_NEW";
-		break;
-	case RTC_CONNECTING:
-		str = "RTC_CONNECTING";
-		break;
-	case RTC_CONNECTED:
-		str = "RTC_CONNECTED";
-		break;
-	case RTC_DISCONNECTED:
-		str = "RTC_DISCONNECTED";
-		break;
-	case RTC_FAILED:
-		str = "RTC_FAILED";
-		break;
-	case RTC_CLOSED:
-		str = "RTC_CLOSED";
-		break;
-	default:
-		break;
-	}
-
-	return str;
-}
-
-char *rtcGatheringState_print(rtcGatheringState state) {
-	char *str = NULL;
-	switch (state) {
-	case RTC_GATHERING_NEW:
-		str = "RTC_GATHERING_NEW";
-		break;
-	case RTC_GATHERING_INPROGRESS:
-		str = "RTC_GATHERING_INPROGRESS";
-		break;
-	case RTC_GATHERING_COMPLETE:
-		str = "RTC_GATHERING_COMPLETE";
-		break;
-	default:
-		break;
-	}
-
-	return str;
-}
-
-int all_space(const char *str) {
-	while (*str) {
-		if (!isspace(*str++)) {
-			return 0;
-		}
-	}
-
-	return 1;
-}

examples/copy-paste-capi/getline.h

@@ -1,48 +0,0 @@
-// Simple POSIX getline() implementation
-// This code is public domain
-
-#include <malloc.h>
-#include <stddef.h>
-#include <stdio.h>
-
-int getline(char **lineptr, size_t *n, FILE *stream) {
-	if (!lineptr || !stream || !n)
-		return -1;
-
-	int c = getc(stream);
-	if (c == EOF)
-		return -1;
-
-	if (!*lineptr) {
-		*lineptr = malloc(128);
-		if (!*lineptr)
-			return -1;
-
-		*n = 128;
-	}
-
-	int pos = 0;
-	while(c != EOF) {
-        if (pos + 1 >= *n) {
-            size_t new_size = *n + (*n >> 2);
-			if (new_size < 128)
-				new_size = 128;
-
-			char *new_ptr = realloc(*lineptr, new_size);
-			if (!new_ptr)
-				return -1;
-
-			*n = new_size;
-            *lineptr = new_ptr;
-        }
-
-        ((unsigned char *)(*lineptr))[pos ++] = c;
-		if (c == '\n')
-			break;
-
-		c = getc(stream);
-    }
-
-    (*lineptr)[pos] = '\0';
-    return pos;
-}

examples/copy-paste-capi/offerer.c

@@ -1,312 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- * Copyright (c) 2020 Stevedan Ogochukwu Omodolor
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <rtc/rtc.h>
-
-#include <ctype.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _WIN32
-#include "getline.h"
-#include <windows.h>
-static void sleep(unsigned int secs) { Sleep(secs * 1000); }
-#else
-#include <unistd.h> // for sleep
-#endif
-
-typedef struct {
-        rtcState state;
-        rtcGatheringState gatheringState;
-        int pc;
-        int dc;
-        bool connected;
-} Peer;
-
-static void descriptionCallback(const char *sdp, const char *type, void *ptr);
-static void candidateCallback(const char *cand, const char *mid, void *ptr);
-static void stateChangeCallback(rtcState state, void *ptr);
-static void gatheringStateCallback(rtcGatheringState state, void *ptr);
-static void openCallback(void *ptr);
-static void closedCallback(void *ptr);
-static void messageCallback(const char *message, int size, void *ptr);
-static void deletePeer(Peer *peer);
-
-char *state_print(rtcState state);
-char *rtcGatheringState_print(rtcGatheringState state);
-
-int all_space(const char *str);
-
-int main(int argc, char **argv){
-	rtcInitLogger(RTC_LOG_DEBUG, NULL);
-
-	// Create peer
-	rtcConfiguration config;
-	memset(&config, 0, sizeof(config));
-
-	Peer *peer = (Peer *)malloc(sizeof(Peer));
-	if (!peer) {
-		fprintf(stderr, "Error allocating memory for peer\n");
-		return -1;
-	    }
-	    memset(peer, 0, sizeof(Peer));
-
-        printf("Peer created\n");
-
-        // Create peer connection
-        peer->pc = rtcCreatePeerConnection(&config);
-        rtcSetUserPointer(peer->pc, peer);
-        rtcSetLocalDescriptionCallback(peer->pc, descriptionCallback);
-        rtcSetLocalCandidateCallback(peer->pc, candidateCallback);
-        rtcSetStateChangeCallback(peer->pc, stateChangeCallback);
-        rtcSetGatheringStateChangeCallback(peer->pc, gatheringStateCallback);
-
-        // Since this is the offere, we will create a datachannel
-        peer->dc = rtcCreateDataChannel(peer->pc, "test");
-        rtcSetOpenCallback(peer->dc, openCallback);
-        rtcSetClosedCallback(peer->dc, closedCallback);
-        rtcSetMessageCallback(peer->dc, messageCallback);
-
-	    sleep(1);
-
-	    bool exit = false;
-        while (!exit) {
-
-                printf("\n");
-                printf("***************************************************************************************\n");
-                printf("* 0: Exit /"
-                       " 1: Enter remote description /"
-                       " 2: Enter remote candidate /"
-                       " 3: Send message /"
-                       " 4: Print Connection Info *\n"
-                       "[Command]: ");
-
-                int command = -1;
-                int c;
-
-		        if (!scanf("%d", &command)) {
-			        break;
-		        }
-
-		        while ((c = getchar()) != '\n' && c != EOF) {
-		        }
-		        fflush(stdin);
-
-                switch (command) {
-                case 0: {
-                        exit = true;
-                        break;
-                }
-                case 1: {
-                        // Parse Description
-                        printf("[Description]: ");
-
-
-                        char *line = NULL;
-                        size_t len = 0;
-                        size_t read = 0;
-                        char *sdp = (char*) malloc(sizeof(char));
-                        while ((read = getline(&line, &len, stdin)) != -1 && !all_space(line)) {
-                                sdp = (char*) realloc (sdp,(strlen(sdp)+1) +strlen(line)+1);
-                                strcat(sdp, line);
-
-                        }
-                        printf("%s\n",sdp);
-                        rtcSetRemoteDescription(peer->pc, sdp, "answer");
-                        free(sdp);
-                        free(line);
-                        break;
-
-                }
-                case 2: {
-                        // Parse Candidate
-                        printf("[Candidate]: ");
-                        char* candidate = NULL;
-                        size_t candidate_size = 0;
-                        if(getline(&candidate, &candidate_size, stdin)) {
-                                rtcAddRemoteCandidate(peer->pc, candidate, "0");
-                                free(candidate);
-
-                        }else {
-                                printf("Error reading line\n");
-                                break;
-                        }
-
-
-                        break;
-                }
-                case 3: {
-                        // Send Message
-                        if(!peer->connected) {
-                                printf("** Channel is not Open **");
-                                break;
-                        }
-                        printf("[Message]: ");
-                        char* message = NULL;
-                        size_t message_size = 0;
-                        if(getline(&message, &message_size, stdin)) {
-                                rtcSendMessage(peer->dc, message, -1);
-                                free(message);
-                        }else {
-                                printf("Error reading line\n");
-                                break;
-                        }
-
-                        break;
-                }
-                case 4: {
-                        // Connection Info
-                        if(!peer->connected) {
-                                printf("** Channel is not Open **");
-                                break;
-                        }
-                        char buffer[256];
-                        if (rtcGetLocalAddress(peer->pc, buffer, 256) >= 0)
-                                printf("Local address 1:  %s\n", buffer);
-                        if (rtcGetRemoteAddress(peer->pc, buffer, 256) >= 0)
-                                printf("Remote address 1: %s\n", buffer);
-
-                        else
-                                printf("Could not get Candidate Pair Info\n");
-                        break;
-                }
-                default: {
-                        printf("** Invalid Command **");
-                        break;
-                }
-                }
-        }
-
-        deletePeer(peer);
-        return 0;
-}
-
-static void descriptionCallback(const char *sdp, const char *type, void *ptr) {
-        // Peer *peer = (Peer *)ptr;
-        printf("Description %s:\n%s\n", "offerer", sdp);
-}
-
-static void candidateCallback(const char *cand, const char *mid, void *ptr) {
-        // Peer *peer = (Peer *)ptr;
-        printf("Candidate %s: %s\n", "offerer", cand);
-
-}
-
-static void stateChangeCallback(rtcState state, void *ptr) {
-        Peer *peer = (Peer *)ptr;
-        peer->state = state;
-        printf("State %s: %s\n", "offerer", state_print(state));
-}
-
-static void gatheringStateCallback(rtcGatheringState state, void *ptr) {
-        Peer *peer = (Peer *)ptr;
-        peer->gatheringState = state;
-        printf("Gathering state %s: %s\n", "offerer", rtcGatheringState_print(state));
-}
-
-static void openCallback(void *ptr) {
-        Peer *peer = (Peer *)ptr;
-        peer->connected = true;
-        char buffer[256];
-        if (rtcGetDataChannelLabel(peer->dc, buffer, 256) >= 0)
-                printf("DataChannel %s: Received with label \"%s\"\n","offerer", buffer);
-}
-
-static void closedCallback(void *ptr) {
-        Peer *peer = (Peer *)ptr;
-        peer->connected = false;
-}
-
-static void messageCallback(const char *message, int size, void *ptr) {
-        // Peer *peer = (Peer *)ptr;
-        if (size < 0) { // negative size indicates a null-terminated string
-                printf("Message %s: %s\n", "offerer", message);
-        } else {
-                printf("Message %s: [binary of size %d]\n", "offerer", size);
-        }
-}
-
-static void deletePeer(Peer *peer) {
-        if (peer) {
-                if (peer->dc)
-                        rtcDeleteDataChannel(peer->dc);
-                if (peer->pc)
-                        rtcDeletePeerConnection(peer->pc);
-                free(peer);
-        }
-}
-
-char *state_print(rtcState state) {
-	char *str = NULL;
-	switch (state) {
-	case RTC_NEW:
-		str = "RTC_NEW";
-		break;
-	case RTC_CONNECTING:
-		str = "RTC_CONNECTING";
-		break;
-	case RTC_CONNECTED:
-		str = "RTC_CONNECTED";
-		break;
-	case RTC_DISCONNECTED:
-		str = "RTC_DISCONNECTED";
-		break;
-	case RTC_FAILED:
-		str = "RTC_FAILED";
-		break;
-	case RTC_CLOSED:
-		str = "RTC_CLOSED";
-		break;
-	default:
-		break;
-	}
-
-	return str;
-}
-
-char *rtcGatheringState_print(rtcGatheringState state) {
-	char *str = NULL;
-	switch (state) {
-	case RTC_GATHERING_NEW:
-		str = "RTC_GATHERING_NEW";
-		break;
-	case RTC_GATHERING_INPROGRESS:
-		str = "RTC_GATHERING_INPROGRESS";
-		break;
-	case RTC_GATHERING_COMPLETE:
-		str = "RTC_GATHERING_COMPLETE";
-		break;
-	default:
-		break;
-	}
-
-	return str;
-}
-
-int all_space(const char *str) {
-	while (*str) {
-		if (!isspace(*str++)) {
-			return 0;
-		}
-	}
-
-	return 1;
-}

examples/copy-paste/CMakeLists.txt

@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-
-add_executable(datachannel-copy-paste-offerer offerer.cpp)
-set_target_properties(datachannel-copy-paste-offerer PROPERTIES
-	CXX_STANDARD 17
-	OUTPUT_NAME offerer)
-if(WIN32)
-	target_link_libraries(datachannel-copy-paste-offerer datachannel-static) # DLL exports only the C API
-else()
-	target_link_libraries(datachannel-copy-paste-offerer datachannel)
-endif()
-
-add_executable(datachannel-copy-paste-answerer answerer.cpp)
-set_target_properties(datachannel-copy-paste-answerer PROPERTIES
-	CXX_STANDARD 17
-	OUTPUT_NAME answerer)
-if(WIN32)
-	target_link_libraries(datachannel-copy-paste-answerer datachannel-static) # DLL exports only the C API
-else()
-	target_link_libraries(datachannel-copy-paste-answerer datachannel)
-endif()
-

examples/media/CMakeLists.txt

@@ -1,14 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-
-add_executable(datachannel-media main.cpp)
-set_target_properties(datachannel-media PROPERTIES
-        CXX_STANDARD 17
-        OUTPUT_NAME media)
-
-if(WIN32)
-    target_link_libraries(datachannel-media datachannel-static) # DLL exports only the C API
-else()
-    target_link_libraries(datachannel-media datachannel)
-endif()
-
-target_link_libraries(datachannel-media datachannel nlohmann_json)

examples/media/README.md

@@ -1,19 +0,0 @@
-# Example Webcam from Browser to Port 5000
-This is an example copy/paste demo to send your webcam from your browser and out port 5000 through the demo application.
-
-## How to use
-Open main.html in your browser (you must open it either as HTTPS or as a domain of http://localhost).
-
-Start the application and copy it's offer into the text box of the web page.
-
-Copy the answer of the webpage back into the application.
-
-You will now see RTP traffic on `localhost:5000` of the computer that the application is running on.
-
-Use the following gstreamer demo pipeline to display the traffic
-(you might need to wave your hand in front of your camera to force an I-frame).
-
-```
-$ gst-launch-1.0 udpsrc address=127.0.0.1 port=5000 caps="application/x-rtp" ! queue ! rtph264depay ! video/x-h264,stream-format=byte-stream ! queue ! avdec_h264 ! queue ! autovideosink
-```
-

examples/media/main.cpp

@@ -1,97 +0,0 @@
-/*
- * libdatachannel client example
- * Copyright (c) 2020 Staz M
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define _WINSOCK_DEPRECATED_NO_WARNINGS
-
-#include "rtc/rtc.hpp"
-
-#include <iostream>
-#include <memory>
-#include <utility>
-
-#include <nlohmann/json.hpp>
-
-#ifdef _WIN32
-#include <winsock2.h>
-#else
-#include <arpa/inet.h>
-typedef int SOCKET;
-#endif
-
-using nlohmann::json;
-
-int main() {
-	try {
-		rtc::InitLogger(rtc::LogLevel::Debug);
-		auto pc = std::make_shared<rtc::PeerConnection>();
-
-		pc->onStateChange(
-		    [](rtc::PeerConnection::State state) { std::cout << "State: " << state << std::endl; });
-
-		pc->onGatheringStateChange([pc](rtc::PeerConnection::GatheringState state) {
-			std::cout << "Gathering State: " << state << std::endl;
-			if (state == rtc::PeerConnection::GatheringState::Complete) {
-				auto description = pc->localDescription();
-				json message = {{"type", description->typeString()},
-				                {"sdp", std::string(description.value())}};
-				std::cout << message << std::endl;
-			}
-		});
-
-		SOCKET sock = socket(AF_INET, SOCK_DGRAM, 0);
-		sockaddr_in addr;
-		addr.sin_addr.s_addr = inet_addr("127.0.0.1");
-		addr.sin_port = htons(5000);
-		addr.sin_family = AF_INET;
-
-		rtc::Description::Video media("video", rtc::Description::Direction::RecvOnly);
-		media.addH264Codec(96);
-		media.setBitrate(
-		    3000); // Request 3Mbps (Browsers do not encode more than 2.5MBps from a webcam)
-
-		auto track = pc->addTrack(media);
-
-		auto session = std::make_shared<rtc::RtcpSession>();
-		track->setRtcpHandler(session);
-
-		track->onMessage(
-		    [session, sock, addr](rtc::binary message) {
-			    // This is an RTP packet
-			    sendto(sock, reinterpret_cast<const char *>(message.data()), int(message.size()), 0,
-			           reinterpret_cast<const struct sockaddr *>(&addr), sizeof(addr));
-		    },
-		    nullptr);
-
-		pc->setLocalDescription();
-
-		std::cout << "Expect RTP video traffic on localhost:5000" << std::endl;
-		std::cout << "Please copy/paste the answer provided by the browser: " << std::endl;
-		std::string sdp;
-		std::getline(std::cin, sdp);
-		std::cout << "Got answer" << sdp << std::endl;
-		json j = json::parse(sdp);
-		rtc::Description answer(j["sdp"].get<std::string>(), j["type"].get<std::string>());
-		pc->setRemoteDescription(answer);
-		std::cout << "Press any key to exit." << std::endl;
-		std::cin >> sdp;
-
-	} catch (const std::exception &e) {
-		std::cerr << "Error: " << e.what() << std::endl;
-	}
-}

examples/media/main.html

@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>libdatachannel media example</title>
-</head>
-<body>
-
-<p>Please enter the offer provided to you by the application: </p>
-<textarea cols="50" rows="50"></textarea>
-<button>Submit</button>
-
-<script>
-    document.querySelector('button').addEventListener('click',  async () => {
-        let offer = JSON.parse(document.querySelector('textarea').value);
-        rtc = new RTCPeerConnection({
-            // Recommended for libdatachannel
-            bundlePolicy: "max-bundle",
-        });
-
-        rtc.onicegatheringstatechange = (state) => {
-            if (rtc.iceGatheringState === 'complete') {
-                // We only want to provide an answer once all of our candidates have been added to the SDP.
-                let answer = rtc.localDescription;
-                document.querySelector('textarea').value = JSON.stringify({"type": answer.type, sdp: answer.sdp});
-                document.querySelector('p').value = 'Please paste the answer in the application.';
-                alert('Please paste the answer in the application.');
-            }
-        }
-        await rtc.setRemoteDescription(offer);
-
-        let media = await navigator.mediaDevices.getUserMedia({
-            video: {
-                width: 1280,
-                height: 720
-            }
-        });
-        media.getTracks().forEach(track => rtc.addTrack(track, media));
-        let answer = await rtc.createAnswer();
-        await rtc.setLocalDescription(answer);
-    })
-</script>
-
-</body>
-</html>

examples/signaling-server-python/LICENSE

@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.

examples/signaling-server-python/signaling-server.py

@@ -1,82 +0,0 @@
-#!/usr/bin/env python
-#
-# Python signaling server example for libdatachannel
-# Copyright (c) 2020 Paul-Louis Ageneau
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import sys
-import ssl
-import json
-import asyncio
-import logging
-import websockets
-
-
-logger = logging.getLogger('websockets')
-logger.setLevel(logging.INFO)
-logger.addHandler(logging.StreamHandler(sys.stdout))
-
-clients = {}
-
-
-async def handle_websocket(websocket, path):
-    client_id = None
-    try:
-        splitted = path.split('/')
-        splitted.pop(0)
-        client_id = splitted.pop(0)
-        print('Client {} connected'.format(client_id))
-
-        clients[client_id] = websocket
-        while True:
-            data = await websocket.recv()
-            print('Client {} << {}'.format(client_id, data))
-            message = json.loads(data)
-            destination_id = message['id']
-            destination_websocket = clients.get(destination_id)
-            if destination_websocket:
-                message['id'] = client_id
-                data = json.dumps(message)
-                print('Client {} >> {}'.format(destination_id, data))
-                await destination_websocket.send(data)
-            else:
-                print('Client {} not found'.format(destination_id))
-
-    except Exception as e:
-        print(e)
-
-    finally:
-        if client_id:
-            del clients[client_id]
-            print('Client {} disconnected'.format(client_id))
-
-if __name__ == '__main__':
-    # Usage: ./server.py [[host:]port] [SSL certificate file]
-    endpoint_or_port = sys.argv[1] if len(sys.argv) > 1 else "8000"
-    ssl_cert = sys.argv[2] if len(sys.argv) > 2 else None
-
-    endpoint = endpoint_or_port if ':' in endpoint_or_port else "127.0.0.1:" + endpoint_or_port
-
-    if ssl_cert:
-        ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-        ssl_context.load_cert_chain(ssl_cert)
-    else:
-        ssl_context = None
-
-    print('Listening on {}'.format(endpoint))
-    host, port = endpoint.rsplit(':', 1)
-    start_server = websockets.serve(handle_websocket, host, int(port), ssl=ssl_context)
-    asyncio.get_event_loop().run_until_complete(start_server)
-    asyncio.get_event_loop().run_forever()

examples/signaling-server-rust/.gitignore

@@ -1 +0,0 @@
-/target

examples/signaling-server-rust/Cargo.lock

@@ -1,940 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "arc-swap"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034"
-
-[[package]]
-name = "autocfg"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-
-[[package]]
-name = "base64"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
-name = "byteorder"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
-
-[[package]]
-name = "bytes"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
-
-[[package]]
-name = "cc"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "core-foundation"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
-
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
-name = "futures"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
-
-[[package]]
-name = "futures-task"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "futures-util"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project",
- "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "http"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "httparse"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
-
-[[package]]
-name = "idna"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "input_buffer"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754"
-dependencies = [
- "bytes",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
-
-[[package]]
-name = "json"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701"
-
-[[package]]
-name = "libdatachannel_signaling_server_example"
-version = "0.1.0"
-dependencies = [
- "futures-channel",
- "futures-util",
- "json",
- "tokio",
- "tokio-tungstenite",
- "tungstenite",
-]
-
-[[package]]
-name = "log"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-
-[[package]]
-name = "memchr"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
-
-[[package]]
-name = "mio"
-version = "0.6.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
-dependencies = [
- "cfg-if",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
- "libc",
- "log",
- "miow 0.2.1",
- "net2",
- "slab",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "mio-named-pipes"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
-dependencies = [
- "log",
- "mio",
- "miow 0.3.5",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "mio-uds"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
-dependencies = [
- "iovec",
- "libc",
- "mio",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
-dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
-[[package]]
-name = "miow"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e"
-dependencies = [
- "socket2",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "net2"
-version = "0.2.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
-dependencies = [
- "cfg-if",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
-name = "openssl"
-version = "0.10.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
-dependencies = [
- "bitflags",
- "cfg-if",
- "foreign-types",
- "lazy_static",
- "libc",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "pin-project"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
-
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom",
- "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
-dependencies = [
- "lazy_static",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "security-framework"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
-dependencies = [
- "block-buffer",
- "digest",
- "fake-simd",
- "opaque-debug",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
-dependencies = [
- "arc-swap",
- "libc",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-
-[[package]]
-name = "socket2"
-version = "0.3.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cae2873c940d92e697597c5eee105fb570cd5689c695806f672883653349b"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-dependencies = [
- "cfg-if",
- "libc",
- "rand",
- "redox_syscall",
- "remove_dir_all",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tinyvec"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
-
-[[package]]
-name = "tokio"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d099fa27b9702bed751524694adbe393e18b36b204da91eb1cbbbbb4a5ee2d58"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "iovec",
- "lazy_static",
- "libc",
- "memchr",
- "mio",
- "mio-named-pipes",
- "mio-uds",
- "num_cpus",
- "pin-project-lite",
- "signal-hook-registry",
- "slab",
- "tokio-macros",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8b8fe88007ebc363512449868d7da4389c9400072a3f666f212c7280082882a"
-dependencies = [
- "futures",
- "log",
- "pin-project",
- "tokio",
- "tungstenite",
-]
-
-[[package]]
-name = "tungstenite"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfea31758bf674f990918962e8e5f07071a3161bd7c4138ed23e416e1ac4264e"
-dependencies = [
- "base64",
- "byteorder",
- "bytes",
- "http",
- "httparse",
- "input_buffer",
- "log",
- "native-tls",
- "rand",
- "sha-1",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "typenum"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-dependencies = [
- "matches",
-]
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
-
-[[package]]
-name = "url"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
-dependencies = [
- "idna",
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]

examples/signaling-server-rust/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "libdatachannel_signaling_server_example"
-version = "0.1.0"
-authors = ["Paul-Louis Ageneau"]
-edition = "2018"
-
-[dependencies]
-tokio = { version = "*", features = ["full"] }
-tungstenite = "*"
-tokio-tungstenite = "*"
-futures-util = "*"
-futures-channel = "*"
-json = "*"
-

examples/signaling-server-rust/LICENSE

@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.

examples/signaling-server-rust/src/main.rs

@@ -1,110 +0,0 @@
-/*
- * Rust signaling server example for libdatachannel
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-extern crate tokio;
-extern crate tungstenite;
-extern crate futures_util;
-extern crate futures_channel;
-extern crate json;
-
-use std::env;
-use std::collections::HashMap;
-use std::sync::{Arc, Mutex};
-
-use tokio::net::{TcpListener, TcpStream};
-use tungstenite::protocol::Message;
-use tungstenite::handshake::server::{Request, Response};
-
-use futures_util::{future, pin_mut, StreamExt};
-use futures_util::stream::TryStreamExt;
-use futures_channel::mpsc;
-
-type Id = String;
-type Tx = mpsc::UnboundedSender<Message>;
-type ClientsMap = Arc<Mutex<HashMap<Id, Tx>>>;
-
-async fn handle(clients: ClientsMap, stream: TcpStream) {
-    let mut client_id = Id::new();
-    let callback = |req: &Request, response: Response| {
-        let path: &str = req.uri().path();
-        let tokens: Vec<&str> = path.split('/').collect();
-        client_id = tokens[1].to_string();
-        return Ok(response);
-    };
-
-    let websocket = tokio_tungstenite::accept_hdr_async(stream, callback)
-        .await.expect("WebSocket handshake failed");
-	println!("Client {} connected", &client_id);
-
-    let (tx, rx) = mpsc::unbounded();
-    clients.lock().unwrap().insert(client_id.clone(), tx);
-
-    let (outgoing, incoming) = websocket.split();
-    let forward = rx.map(Ok).forward(outgoing);
-    let process = incoming.try_for_each(|msg| {
-        if msg.is_text() {
-            let text = msg.to_text().unwrap();
-            println!("Client {} << {}", &client_id, &text);
-
-            // Parse
-            let mut content = json::parse(text).unwrap();
-            let remote_id = content["id"].to_string();
-            let mut locked = clients.lock().unwrap();
-
-            match locked.get_mut(&remote_id) {
-                Some(remote) => {
-                    // Format
-                    content.insert("id", client_id.clone()).unwrap();
-                    let text = json::stringify(content);
-
-                    // Send to remote
-                    println!("Client {} >> {}", &remote_id, &text);
-                    remote.unbounded_send(Message::text(text)).unwrap();
-                },
-                _ => println!("Client {} not found", &remote_id),
-            }
-        }
-        future::ok(())
-    });
-
-    pin_mut!(process, forward);
-    future::select(process, forward).await;
-
-    println!("Client {} disconnected", &client_id);
-    clients.lock().unwrap().remove(&client_id);
-}
-
-#[tokio::main]
-async fn main() -> Result<(), std::io::Error> {
-    let service = env::args().nth(1).unwrap_or("8000".to_string());
-    let endpoint = if service.contains(':') { service } else { format!("127.0.0.1:{}", service) };
-
-	println!("Listening on {}", endpoint);
-
-    let mut listener = TcpListener::bind(endpoint)
-    	.await.expect("Listener binding failed");
-
-    let clients = ClientsMap::new(Mutex::new(HashMap::new()));
-
-    while let Ok((stream, _)) = listener.accept().await {
-        tokio::spawn(handle(clients.clone(), stream));
-    }
-
-    return Ok(())
-}
-

examples/web/LICENSE

@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

examples/web/index.html

@@ -1,23 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-		<meta charset="UTF-8">
-        <title>WebRTC Example</title>
-		<link rel="stylesheet" href="style.css">
-        <script src="script.js"></script>
-    </head>
-    <body>
-        <h1>WebRTC Example</h1>
-        <h2>Local ID</h2>
-        <p id="localId"></p>
-        <h2>Send an offer through signaling</h2>
-		<input type="text" id="offerId" placeholder="remote ID" disabled>
-		<input type="button" id="offerBtn" value="Offer" disabled>
-		<br>
-        <h2>Send a message through DataChannel</h2>
-        <input type="text" id="sendMsg" placeholder="message" disabled>
-        <input type="button" id="sendBtn" value="Send" disabled>
-        <br>
-    </body>
-</html>
-

examples/web/package-lock.json

@@ -1,136 +0,0 @@
-{
-  "name": "libdatachannel-example-web",
-  "version": "0.0.1",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "bufferutil": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.1.tgz",
-      "integrity": "sha512-xowrxvpxojqkagPcWRQVXZl0YXhRhAtBEIq3VoER1NH5Mw1n1o0ojdspp+GS2J//2gCVyrzQDApQ4unGF+QOoA==",
-      "requires": {
-        "node-gyp-build": "~3.7.0"
-      }
-    },
-    "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "requires": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
-      }
-    },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "requires": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
-    },
-    "ext": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "requires": {
-        "type": "^2.0.0"
-      },
-      "dependencies": {
-        "type": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
-          "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA=="
-        }
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
-    },
-    "node-gyp-build": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.7.0.tgz",
-      "integrity": "sha512-L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w=="
-    },
-    "type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
-    },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "utf-8-validate": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.2.tgz",
-      "integrity": "sha512-SwV++i2gTD5qh2XqaPzBnNX88N6HdyhQrNNRykvcS0QKvItV9u3vPEJr+X5Hhfb1JC0r0e1alL0iB09rY8+nmw==",
-      "requires": {
-        "node-gyp-build": "~3.7.0"
-      }
-    },
-    "websocket": {
-      "version": "1.0.32",
-      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.32.tgz",
-      "integrity": "sha512-i4yhcllSP4wrpoPMU2N0TQ/q0O94LRG/eUQjEAamRltjQ1oT1PFFKOG4i877OlJgCG8rw6LrrowJp+TYCEWF7Q==",
-      "requires": {
-        "bufferutil": "^4.0.1",
-        "debug": "^2.2.0",
-        "es5-ext": "^0.10.50",
-        "typedarray-to-buffer": "^3.1.5",
-        "utf-8-validate": "^5.0.2",
-        "yaeti": "^0.0.6"
-      }
-    },
-    "yaeti": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
-      "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc="
-    }
-  }
-}

examples/web/package.json

@@ -1,23 +0,0 @@
-{
-  "name": "libdatachannel-example-web",
-  "version": "0.0.1",
-  "description": "Example for libdatachannel",
-  "main": "server.js",
-  "scripts": {
-    "start": "node server.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/paullouisageneau/libdatachannel.git"
-  },
-  "author": "Paul-Louis Ageneau",
-  "license": "GPL-2.0",
-  "bugs": {
-    "url": "https://github.com/paullouisageneau/libdatachannel/issues"
-  },
-  "homepage": "https://github.com/paullouisageneau/libdatachannel#readme",
-  "dependencies": {
-    "websocket": "^1.0.32"
-  }
-}

examples/web/script.js

@@ -1,194 +0,0 @@
-/*
- * libdatachannel example web client
- * Copyright (C) 2020 Lara Mackey
- * Copyright (C) 2020 Paul-Louis Ageneau
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; If not, see <http://www.gnu.org/licenses/>.
- */
-
-window.addEventListener('load', () => {
-
-const config = {
-  iceServers: [{
-    urls: 'stun:stun.l.google.com:19302', // change to your STUN server
-  }],
-};
-
-const localId = randomId(4);
-
-const url = `ws://localhost:8000/${localId}`;
-
-const peerConnectionMap = {};
-const dataChannelMap = {};
-
-const offerId = document.getElementById('offerId');
-const offerBtn = document.getElementById('offerBtn');
-const sendMsg = document.getElementById('sendMsg');
-const sendBtn = document.getElementById('sendBtn');
-const _localId = document.getElementById('localId');
-_localId.textContent = localId;
-
-console.log('Connecting to signaling...');
-openSignaling(url)
-  .then((ws) => {
-    console.log('WebSocket connected, signaling ready');
-    offerId.disabled = false;
-    offerBtn.disabled = false;
-    offerBtn.onclick = () => offerPeerConnection(ws, offerId.value);
-  })
-  .catch((err) => console.error(err));
-
-
-function openSignaling(url) {
-  return new Promise((resolve, reject) => {
-    const ws = new WebSocket(url);
-    ws.onopen = () => resolve(ws);
-    ws.onerror = () => reject(new Error('WebSocket error'));
-    ws.onclosed = () => console.error('WebSocket disconnected');
-    ws.onmessage = (e) => {
-      if(typeof(e.data) != 'string') return;
-      const message = JSON.parse(e.data);
-      const { id, type } = message;
-
-      let pc = peerConnectionMap[id];
-      if(!pc) {
-		    if(type != 'offer') return;
-
-			  // Create PeerConnection for answer
-			  console.log(`Answering to ${id}`);
-			  pc = createPeerConnection(ws, id);
-		  }
-
-      switch(type) {
-      case 'offer':
-      case 'answer':
-			  pc.setRemoteDescription({
-			    sdp: message.description,
-			    type: message.type,
-			  })
-			  .then(() => {
-          if(type == 'offer') {
-			      // Send answer
-            sendLocalDescription(ws, id, pc, 'answer');
-          }
-			  });
-			  break;
-
-			case 'candidate':
-		    pc.addIceCandidate({
-          candidate: message.candidate,
-          sdpMid: message.mid,
-		    });
-		    break;
-		  }
-    }
-  });
-}
-
-function offerPeerConnection(ws, id) {
-	// Create PeerConnection
-	console.log(`Offering to ${id}`);
-	pc = createPeerConnection(ws, id);
-
-  // Create DataChannel
-  const label = "test";
-  console.log(`Creating DataChannel with label "${label}"`);
-  const dc = pc.createDataChannel(label);
-  setupDataChannel(dc, id);
-
-  // Send offer
-  sendLocalDescription(ws, id, pc, 'offer');
-}
-
-// Create and setup a PeerConnection
-function createPeerConnection(ws, id) {
-  const pc = new RTCPeerConnection(config);
-  pc.onconnectionstatechange = () => console.log(`Connection state: ${pc.connectionState}`);
-  pc.onicegatheringstatechange = () => console.log(`Gathering state: ${pc.iceGatheringState}`);
-  pc.onicecandidate = (e) => {
-    if (e.candidate) {
-      // Send candidate
-      sendLocalCandidate(ws, id, e.candidate);
-    }
-  };
-  pc.ondatachannel = (e) => {
-    const dc = e.channel;
-    console.log(`"DataChannel from ${id} received with label "${dc.label}"`);
-    setupDataChannel(dc, id);
-
-		dc.send(`Hello from ${localId}`);
-
-    sendMsg.disabled = false;
-    sendBtn.disabled = false;
-    sendBtn.onclick = () => dc.send(sendMsg.value);
-  };
-
-  peerConnectionMap[id] = pc;
-  return pc;
-}
-
-// Setup a DataChannel
-function setupDataChannel(dc, id) {
-  dc.onopen = () => {
-    console.log(`DataChannel from ${id} open`);
-
-    sendMsg.disabled = false;
-    sendBtn.disabled = false;
-    sendBtn.onclick = () => dc.send(sendMsg.value);
-  };
-  dc.onclose = () => {
-    console.log(`DataChannel from ${id} closed`);
-  };
-	dc.onmessage = (e) => {
-    if(typeof(e.data) != 'string') return;
-		console.log(`Message from ${id} received: ${e.data}`);
-    document.body.appendChild(document.createTextNode(e.data));
-	};
-
-  dataChannelMap[id] = dc;
-  return dc;
-}
-
-function sendLocalDescription(ws, id, pc, type) {
-  (type == 'offer' ? pc.createOffer() : pc.createAnswer())
-    .then((desc) => pc.setLocalDescription(desc))
-    .then(() => {
-      const { sdp, type } = pc.localDescription;
-      ws.send(JSON.stringify({
-        id,
-        type,
-        description: sdp,
-      }));
-    });
-}
-
-function sendLocalCandidate(ws, id, cand) {
-  const {candidate, sdpMid} = cand;
-  ws.send(JSON.stringify({
-    id,
-    type: 'candidate',
-    candidate,
-    mid: sdpMid,
-  }));
-}
-
-// Helper function to generate a random ID
-function randomId(length) {
-  const characters = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-  const pickRandom = () => characters.charAt(Math.floor(Math.random() * characters.length));
-  return [...Array(length)].map(pickRandom).join('');
-}
-
-});
-

examples/web/server.js

@@ -1,109 +0,0 @@
-/*
- * libdatachannel example web server
- * Copyright (C) 2020 Lara Mackey
- * Copyright (C) 2020 Paul-Louis Ageneau
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; If not, see <http://www.gnu.org/licenses/>.
- */
-
-const fs = require('fs');
-const http = require('http');
-const websocket = require('websocket');
-
-const staticFiles = {
-  '/index.html': 'text/html',
-  '/style.css': 'text/css',
-  '/script.js': 'text/javascript',
-};
-
-const clients = {};
-
-const httpServer = http.createServer((req, res) => {
-  console.log(`${req.method.toUpperCase()} ${req.url}`);
-
-  const respond = (code, data, contentType = 'text/plain') => {
-    res.writeHead(code, {
-      'Content-Type': contentType,
-      'Access-Control-Allow-Origin': '*',
-    });
-    res.end(data);
-  };
-
-  if(req.method != 'GET') {
-    respond(405, 'Method not allowed');
-    return;
-  }
-
-  const url = req.url == '/' ? '/index.html' : req.url;
-  const contentType = staticFiles[url];
-  if(!contentType) {
-    respond(404, 'Not found');
-    return;
-  }
-
-  fs.readFile(__dirname + url, (err, data) => {
-    if(err) {
-      respond(500, 'Missing file');
-      return;
-    }
-
-    respond(200, data, contentType);
-  });
-});
-
-const wsServer = new websocket.server({ httpServer });
-wsServer.on('request', (req) => {
-  console.log(`WS  ${req.resource}`);
-
-  const { path } = req.resourceURL;
-  const splitted = path.split('/');
-  splitted.shift();
-  const id = splitted[0];
-
-  const conn = req.accept(null, req.origin);
-  conn.on('message', (data) => {
-    if(data.type === 'utf8') {
-      console.log(`Client ${id} << ${data.utf8Data}`);
-
-      const message = JSON.parse(data.utf8Data);
-      const destId = message.id;
-      const dest = clients[destId];
-      if(dest) {
-        message.id = id;
-        const data = JSON.stringify(message);
-        console.log(`Client ${destId} >> ${data}`);
-        dest.send(data);
-      }
-      else {
-        console.error(`Client ${destId} not found`);
-      }
-    }
-  });
-  conn.on('close', () => {
-    delete clients[id];
-    console.error(`Client ${id} disconnected`);
-  });
-
-  clients[id] = conn;
-});
-
-const endpoint = process.env.PORT || '8000';
-const splitted = endpoint.split(':');
-const port = splitted.pop();
-const hostname = splitted.join(':') || '127.0.0.1';
-
-httpServer.listen(port, hostname, () => {
-  console.log(`Server listening on ${hostname}:${port}`);
-});
-

examples/web/style.css

@@ -1,20 +0,0 @@
-body {
-	font-family: arial, verdana, sans-serif;
-	font-size: 12pt;
-	background-color: #FFFFFF;
-	color: #000000;
-	margin: 0;
-	padding: 0.5em;
-}
-
-input {
-	font-size: 100%;
-	vertical-align: middle;
-}
-
-input[type="text"] {
-	width: 8em;
-	max-width: 75%;
-	padding: 0.4em;
-}
-

include/rtc/channel.hpp

@@ -20,7 +20,6 @@
 #define RTC_CHANNEL_H
 
 #include "include.hpp"
-#include "message.hpp"
 
 #include <atomic>
 #include <functional>
@@ -30,11 +29,8 @@ namespace rtc {
 
 class Channel {
 public:
-	Channel() = default;
-	virtual ~Channel() = default;
-
 	virtual void close() = 0;
-	virtual bool send(message_variant data) = 0; // returns false if buffered
+	virtual bool send(const std::variant<binary, string> &data) = 0; // returns false if buffered
 
 	virtual bool isOpen() const = 0;
 	virtual bool isClosed() const = 0;
@@ -43,24 +39,24 @@ public:
 
 	void onOpen(std::function<void()> callback);
 	void onClosed(std::function<void()> callback);
-	void onError(std::function<void(string error)> callback);
+	void onError(std::function<void(const string &error)> callback);
 
-	void onMessage(std::function<void(message_variant data)> callback);
-	void onMessage(std::function<void(binary data)> binaryCallback,
-	               std::function<void(string data)> stringCallback);
+	void onMessage(std::function<void(const std::variant<binary, string> &data)> callback);
+	void onMessage(std::function<void(const binary &data)> binaryCallback,
+	               std::function<void(const string &data)> stringCallback);
 
 	void onBufferedAmountLow(std::function<void()> callback);
 	void setBufferedAmountLowThreshold(size_t amount);
 
 	// Extended API
-	virtual std::optional<message_variant> receive() = 0; // only if onMessage unset
+	virtual std::optional<std::variant<binary, string>> receive() = 0; // only if onMessage unset
 	virtual size_t availableAmount() const; // total size available to receive
 	void onAvailable(std::function<void()> callback);
 
 protected:
 	virtual void triggerOpen();
 	virtual void triggerClosed();
-	virtual void triggerError(string error);
+	virtual void triggerError(const string &error);
 	virtual void triggerAvailable(size_t count);
 	virtual void triggerBufferedAmount(size_t amount);
 
@@ -69,8 +65,8 @@ protected:
 private:
 	synchronized_callback<> mOpenCallback;
 	synchronized_callback<> mClosedCallback;
-	synchronized_callback<string> mErrorCallback;
-	synchronized_callback<message_variant> mMessageCallback;
+	synchronized_callback<const string &> mErrorCallback;
+	synchronized_callback<const std::variant<binary, string> &> mMessageCallback;
 	synchronized_callback<> mAvailableCallback;
 	synchronized_callback<> mBufferedAmountLowCallback;
 

include/rtc/datachannel.hpp

@@ -36,7 +36,7 @@ namespace rtc {
 class SctpTransport;
 class PeerConnection;
 
-class DataChannel final : public std::enable_shared_from_this<DataChannel>, public Channel {
+class DataChannel : public std::enable_shared_from_this<DataChannel>, public Channel {
 public:
 	DataChannel(std::weak_ptr<PeerConnection> pc, unsigned int stream, string label,
 	            string protocol, Reliability reliability);
@@ -50,7 +50,7 @@ public:
 	Reliability reliability() const;
 
 	void close(void) override;
-	bool send(message_variant data) override;
+	bool send(const std::variant<binary, string> &data) override;
 	bool send(const byte *data, size_t size);
 	template <typename Buffer> bool sendBuffer(const Buffer &buf);
 	template <typename Iterator> bool sendBuffer(Iterator first, Iterator last);
@@ -61,12 +61,12 @@ public:
 
 	// Extended API
 	size_t availableAmount() const override;
-	std::optional<message_variant> receive() override;
+	std::optional<std::variant<binary, string>> receive() override;
 
 private:
 	void remoteClose();
 	void open(std::shared_ptr<SctpTransport> transport);
-	bool outgoing(message_ptr message);
+	bool outgoing(mutable_message_ptr message);
 	void incoming(message_ptr message);
 	void processOpenMessage(message_ptr message);
 
@@ -82,6 +82,7 @@ private:
 	std::atomic<bool> mIsClosed = false;
 
 	Queue<message_ptr> mRecvQueue;
+	std::atomic<size_t> mRecvAmount = 0;
 
 	friend class PeerConnection;
 };
@@ -108,8 +109,8 @@ template <typename Iterator> bool DataChannel::sendBuffer(Iterator first, Iterat
 	auto message = std::make_shared<Message>(size);
 	auto pos = message->begin();
 	for (Iterator it = first; it != last; ++it) {
-		auto [bytes, len] = to_bytes(*it);
-		pos = std::copy(bytes, bytes + len, pos);
+		auto [bytes, size] = to_bytes(*it);
+		pos = std::copy(bytes, bytes + size, pos);
 	}
 	return outgoing(message);
 }

include/rtc/description.hpp

@@ -1,6 +1,5 @@
 /**
- * Copyright (c) 2019-2020 Paul-Louis Ageneau
- * Copyright (c) 2020 Staz M
+ * Copyright (c) 2019 Paul-Louis Ageneau
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -25,9 +24,7 @@
 
 #include <iostream>
 #include <map>
-#include <memory>
 #include <optional>
-#include <variant>
 #include <vector>
 
 namespace rtc {
@@ -36,7 +33,6 @@ class Description {
 public:
 	enum class Type { Unspec = 0, Offer = 1, Answer = 2 };
 	enum class Role { ActPass = 0, Passive = 1, Active = 2 };
-	enum class Direction { SendOnly, RecvOnly, SendRecv, Inactive, Unknown };
 
 	Description(const string &sdp, const string &typeString = "");
 	Description(const string &sdp, Type type);
@@ -46,172 +42,36 @@ public:
 	string typeString() const;
 	Role role() const;
 	string roleString() const;
-	string bundleMid() const;
-	string iceUfrag() const;
-	string icePwd() const;
+	string mid() const;
 	std::optional<string> fingerprint() const;
-	bool ended() const;
+	std::optional<uint16_t> sctpPort() const;
+	std::optional<size_t> maxMessageSize() const;
+	bool trickleEnabled() const;
 
 	void hintType(Type type);
 	void setFingerprint(string fingerprint);
+	void setSctpPort(uint16_t port);
+	void setMaxMessageSize(size_t size);
 
 	void addCandidate(Candidate candidate);
 	void endCandidates();
 	std::vector<Candidate> extractCandidates();
 
 	operator string() const;
-	string generateSdp(string_view eol) const;
-	string generateApplicationSdp(string_view eol) const;
 
-	class Entry {
-	public:
-		virtual ~Entry() = default;
-
-		virtual string type() const { return mType; }
-		virtual string description() const { return mDescription; }
-		virtual string mid() const { return mMid; }
-		Direction direction() const { return mDirection; }
-		void setDirection(Direction dir);
-
-		operator string() const;
-		string generateSdp(string_view eol) const;
-
-		virtual void parseSdpLine(string_view line);
-
-	protected:
-		Entry(const string &mline, string mid, Direction dir = Direction::Unknown);
-		virtual string generateSdpLines(string_view eol) const;
-
-		std::vector<string> mAttributes;
-
-	private:
-		string mType;
-		string mDescription;
-		string mMid;
-		Direction mDirection;
-	};
-
-	struct Application : public Entry {
-	public:
-		Application(string mid = "data");
-		Application(const Application &other) = default;
-		Application(Application &&other) = default;
-
-		string description() const override;
-		Application reciprocate() const;
-
-		void setSctpPort(uint16_t port) { mSctpPort = port; }
-		void hintSctpPort(uint16_t port) { mSctpPort = mSctpPort.value_or(port); }
-		void setMaxMessageSize(size_t size) { mMaxMessageSize = size; }
-
-		std::optional<uint16_t> sctpPort() const { return mSctpPort; }
-		std::optional<size_t> maxMessageSize() const { return mMaxMessageSize; }
-
-		virtual void parseSdpLine(string_view line) override;
-
-	private:
-		virtual string generateSdpLines(string_view eol) const override;
-
-		std::optional<uint16_t> mSctpPort;
-		std::optional<size_t> mMaxMessageSize;
-	};
-
-	// Media (non-data)
-	class Media : public Entry {
-	public:
-		Media(const string &sdp);
-		Media(const string &mline, string mid, Direction dir = Direction::SendOnly);
-		Media(const Media &other) = default;
-		Media(Media &&other) = default;
-		virtual ~Media() = default;
-
-		string description() const override;
-		Media reciprocate() const;
-
-		void removeFormat(const string &fmt);
-
-		void addVideoCodec(int payloadType, const string &codec);
-		void addH264Codec(int payloadType);
-		void addVP8Codec(int payloadType);
-		void addVP9Codec(int payloadType);
-
-		void setBitrate(int bitrate);
-		int getBitrate() const;
-
-		bool hasPayloadType(int payloadType) const;
-
-		virtual void parseSdpLine(string_view line) override;
-
-	private:
-		virtual string generateSdpLines(string_view eol) const override;
-
-		int mBas = -1;
-
-		struct RTPMap {
-			RTPMap(string_view mline);
-
-			void removeFB(const string &string);
-			void addFB(const string &string);
-
-			int pt;
-			string format;
-			int clockRate;
-			string encParams;
-
-			std::vector<string> rtcpFbs;
-			std::vector<string> fmtps;
-		};
-
-		Media::RTPMap &getFormat(int fmt);
-		Media::RTPMap &getFormat(const string &fmt);
-
-		std::map<int, RTPMap> mRtpMap;
-	};
-
-	class Audio : public Media {
-	public:
-		Audio(string mid = "audio", Direction dir = Direction::SendOnly);
-	};
-
-	class Video : public Media {
-	public:
-		Video(string mid = "video", Direction dir = Direction::SendOnly);
-	};
-
-	bool hasApplication() const;
-	bool hasAudioOrVideo() const;
-
-	int addMedia(Media media);
-	int addMedia(Application application);
-	int addApplication(string mid = "data");
-	int addVideo(string mid = "video", Direction dir = Direction::SendOnly);
-	int addAudio(string mid = "audio", Direction dir = Direction::SendOnly);
-
-	std::variant<Media *, Application *> media(int index);
-	std::variant<const Media *, const Application *> media(int index) const;
-	int mediaCount() const;
-
-	Application *application();
+	string generateSdp(const string &eol) const;
 
 private:
-	std::shared_ptr<Entry> createEntry(string mline, string mid, Direction dir);
-	void removeApplication();
-
 	Type mType;
-
-	// Session-level attributes
 	Role mRole;
 	string mSessionId;
+	string mMid;
 	string mIceUfrag, mIcePwd;
 	std::optional<string> mFingerprint;
-
-	// Entries
-	std::vector<std::shared_ptr<Entry>> mEntries;
-	std::shared_ptr<Application> mApplication;
-
-	// Candidates
+	std::optional<uint16_t> mSctpPort;
+	std::optional<size_t> mMaxMessageSize;
 	std::vector<Candidate> mCandidates;
-	bool mEnded = false;
+	bool mTrickle;
 
 	static Type stringToType(const string &typeString);
 	static string typeToString(Type type);

include/rtc/include.hpp

@@ -19,14 +19,6 @@
 #ifndef RTC_INCLUDE_H
 #define RTC_INCLUDE_H
 
-#ifndef RTC_ENABLE_MEDIA
-#define RTC_ENABLE_MEDIA 1
-#endif
-
-#ifndef RTC_ENABLE_WEBSOCKET
-#define RTC_ENABLE_WEBSOCKET 1
-#endif
-
 #ifdef _WIN32
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0602
@@ -41,14 +33,12 @@
 #include <mutex>
 #include <optional>
 #include <string>
-#include <string_view>
 #include <vector>
 
 namespace rtc {
 
 using std::byte;
 using std::string;
-using std::string_view;
 using binary = std::vector<byte>;
 
 using std::nullopt;
@@ -66,49 +56,19 @@ const uint16_t DEFAULT_SCTP_PORT = 5000; // SCTP port to use by default
 const size_t DEFAULT_MAX_MESSAGE_SIZE = 65536;    // Remote max message size if not specified in SDP
 const size_t LOCAL_MAX_MESSAGE_SIZE = 256 * 1024; // Local max message size
 
-const size_t RECV_QUEUE_LIMIT = 1024 * 1024; // Max per-channel queue size
 
-const int THREADPOOL_SIZE = 4; // Number of threads in the global thread pool
-
-// overloaded helper
 template <class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
 template <class... Ts> overloaded(Ts...)->overloaded<Ts...>;
 
-// weak_ptr bind helper
-template <typename F, typename T, typename... Args> auto weak_bind(F &&f, T *t, Args &&... _args) {
-	return [bound = std::bind(f, t, _args...), weak_this = t->weak_from_this()](auto &&... args) {
-		using result_type = typename decltype(bound)::result_type;
-		if (auto shared_this = weak_this.lock())
-			return bound(args...);
-		else
-			return static_cast<result_type>(false);
-	};
-}
-
 template <typename... P> class synchronized_callback {
 public:
 	synchronized_callback() = default;
-	synchronized_callback(synchronized_callback &&cb) { *this = std::move(cb); }
-	synchronized_callback(const synchronized_callback &cb) { *this = cb; }
-	synchronized_callback(std::function<void(P...)> func) { *this = std::move(func); }
+	synchronized_callback(std::function<void(P...)> func) { *this = std::move(func); };
 	~synchronized_callback() { *this = nullptr; }
 
-	synchronized_callback &operator=(synchronized_callback &&cb) {
-		std::scoped_lock lock(mutex, cb.mutex);
-		callback = std::move(cb.callback);
-		cb.callback = nullptr;
-		return *this;
-	}
-
-	synchronized_callback &operator=(const synchronized_callback &cb) {
-		std::scoped_lock lock(mutex, cb.mutex);
-		callback = cb.callback;
-		return *this;
-	}
-
 	synchronized_callback &operator=(std::function<void(P...)> func) {
 		std::lock_guard lock(mutex);
-		callback = std::move(func);
+		callback = func;
 		return *this;
 	}
 
@@ -118,10 +78,7 @@ public:
 			callback(args...);
 	}
 
-	operator bool() const {
-		std::lock_guard lock(mutex);
-		return callback ? true : false;
-	}
+	operator bool() const { return callback ? true : false; }
 
 private:
 	std::function<void(P...)> callback;

include/rtc/init.hpp

@@ -25,12 +25,12 @@
 
 namespace rtc {
 
-using init_token = std::shared_ptr<void>;
+class Init;
+using init_token = std::shared_ptr<Init>;
 
 class Init {
 public:
 	static init_token Token();
-	static void Preload();
 	static void Cleanup();
 
 	~Init();
@@ -38,13 +38,11 @@ public:
 private:
 	Init();
 
-	static std::weak_ptr<void> Weak;
-	static std::shared_ptr<void> *Global;
-	static bool Initialized;
-	static std::recursive_mutex Mutex;
+	static std::weak_ptr<Init> Weak;
+	static init_token Global;
+	static std::mutex Mutex;
 };
 
-inline void Preload() { Init::Preload(); }
 inline void Cleanup() { Init::Cleanup(); }
 
 } // namespace rtc

include/rtc/log.hpp

@@ -19,22 +19,8 @@
 #ifndef RTC_LOG_H
 #define RTC_LOG_H
 
-// Disable warnings before including plog
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#elif defined(_MSC_VER)
-#pragma warning(push, 0)
-#endif
-
 #include "plog/Log.h"
 
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#elif defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 namespace rtc {
 
 enum class LogLevel { // Don't change, it must match plog severity

include/rtc/message.hpp

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2019-2020 Paul-Louis Ageneau
+ * Copyright (c) 2019 Paul-Louis Ageneau
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,34 +24,29 @@
 
 #include <functional>
 #include <memory>
-#include <optional>
-#include <variant>
 
 namespace rtc {
 
 struct Message : binary {
-	enum Type { Binary, String, Control, Reset };
+	enum Type { Binary, String, Control };
 
-	Message(const Message &message) = default;
-	Message(size_t size, Type type_ = Binary) : binary(size), type(type_) {}
+	Message(size_t size) : binary(size), type(Binary) {}
 
 	template <typename Iterator>
 	Message(Iterator begin_, Iterator end_, Type type_ = Binary)
 	    : binary(begin_, end_), type(type_) {}
 
-	Message(binary &&data, Type type_ = Binary) : binary(std::move(data)), type(type_) {}
-
 	Type type;
 	unsigned int stream = 0;
 	std::shared_ptr<Reliability> reliability;
 };
 
-using message_ptr = std::shared_ptr<Message>;
+using message_ptr = std::shared_ptr<const Message>;
+using mutable_message_ptr = std::shared_ptr<Message>;
 using message_callback = std::function<void(message_ptr message)>;
-using message_variant = std::variant<binary, string>;
 
-inline size_t message_size_func(const message_ptr &m) {
-	return m->type == Message::Binary || m->type == Message::String ? m->size() : 0;
+constexpr auto message_size_func = [](const message_ptr &m) -> size_t {
+	return m->type != Message::Control ? m->size() : 0;
 };
 
 template <typename Iterator>
@@ -64,17 +59,6 @@ message_ptr make_message(Iterator begin, Iterator end, Message::Type type = Mess
 	return message;
 }
 
-message_ptr make_message(size_t size, Message::Type type = Message::Binary, unsigned int stream = 0,
-                         std::shared_ptr<Reliability> reliability = nullptr);
-
-message_ptr make_message(binary &&data, Message::Type type = Message::Binary,
-                         unsigned int stream = 0,
-                         std::shared_ptr<Reliability> reliability = nullptr);
-
-message_ptr make_message(message_variant data);
-
-message_variant to_variant(Message &&message);
-
 } // namespace rtc
 
 #endif

include/rtc/peerconnection.hpp

@@ -28,11 +28,9 @@
 #include "message.hpp"
 #include "reliability.hpp"
 #include "rtc.hpp"
-#include "track.hpp"
 
 #include <atomic>
 #include <functional>
-#include <future>
 #include <list>
 #include <mutex>
 #include <shared_mutex>
@@ -42,15 +40,11 @@
 namespace rtc {
 
 class Certificate;
-class Processor;
 class IceTransport;
 class DtlsTransport;
 class SctpTransport;
 
-using certificate_ptr = std::shared_ptr<Certificate>;
-using future_certificate_ptr = std::shared_future<certificate_ptr>;
-
-class PeerConnection final : public std::enable_shared_from_this<PeerConnection> {
+class PeerConnection : public std::enable_shared_from_this<PeerConnection> {
 public:
 	enum class State : int {
 		New = RTC_NEW,
@@ -76,45 +70,34 @@ public:
 	const Configuration *config() const;
 	State state() const;
 	GatheringState gatheringState() const;
-	bool hasLocalDescription() const;
-	bool hasRemoteDescription() const;
-	bool hasMedia() const;
 	std::optional<Description> localDescription() const;
 	std::optional<Description> remoteDescription() const;
 	std::optional<string> localAddress() const;
 	std::optional<string> remoteAddress() const;
 
-	void setLocalDescription();
 	void setRemoteDescription(Description description);
 	void addRemoteCandidate(Candidate candidate);
 
-	std::shared_ptr<DataChannel> addDataChannel(string label, string protocol = "",
-	                                            Reliability reliability = {});
-
-	// Equivalent to calling addDataChannel() and setLocalDescription()
-	std::shared_ptr<DataChannel> createDataChannel(string label, string protocol = "",
-	                                               Reliability reliability = {});
+	std::shared_ptr<DataChannel> createDataChannel(const string &label, const string &protocol = "",
+	                                               const Reliability &reliability = {});
 
 	void onDataChannel(std::function<void(std::shared_ptr<DataChannel> dataChannel)> callback);
-	void onLocalDescription(std::function<void(Description description)> callback);
-	void onLocalCandidate(std::function<void(Candidate candidate)> callback);
+	void onLocalDescription(std::function<void(const Description &description)> callback);
+	void onLocalCandidate(std::function<void(const Candidate &candidate)> callback);
 	void onStateChange(std::function<void(State state)> callback);
 	void onGatheringStateChange(std::function<void(GatheringState state)> callback);
 
+	bool getSelectedCandidatePair(CandidateInfo *local, CandidateInfo *remote);
+
 	// Stats
 	void clearStats();
 	size_t bytesSent();
 	size_t bytesReceived();
 	std::optional<std::chrono::milliseconds> rtt();
 
-	// Track media support requires compiling with libSRTP
-	std::shared_ptr<Track> addTrack(Description::Media description);
-	void onTrack(std::function<void(std::shared_ptr<Track> track)> callback);
-
-	// libnice only
-	bool getSelectedCandidatePair(CandidateInfo *local, CandidateInfo *remote);
-
 private:
+	init_token mInitToken = Init::Token();
+
 	std::shared_ptr<IceTransport> initIceTransport(Description::Role role);
 	std::shared_ptr<DtlsTransport> initDtlsTransport();
 	std::shared_ptr<SctpTransport> initSctpTransport();
@@ -123,58 +106,46 @@ private:
 	void endLocalCandidates();
 	bool checkFingerprint(const std::string &fingerprint) const;
 	void forwardMessage(message_ptr message);
-	void forwardMedia(message_ptr message);
 	void forwardBufferedAmount(uint16_t stream, size_t amount);
 
-	std::shared_ptr<DataChannel> emplaceDataChannel(Description::Role role, string label,
-	                                                string protocol, Reliability reliability);
+	std::shared_ptr<DataChannel> emplaceDataChannel(Description::Role role, const string &label,
+	                                                const string &protocol,
+	                                                const Reliability &reliability);
 	std::shared_ptr<DataChannel> findDataChannel(uint16_t stream);
 	void iterateDataChannels(std::function<void(std::shared_ptr<DataChannel> channel)> func);
 	void openDataChannels();
 	void closeDataChannels();
 	void remoteCloseDataChannels();
 
-	void incomingTrack(Description::Media description);
-	void openTracks();
-
 	void processLocalDescription(Description description);
 	void processLocalCandidate(Candidate candidate);
 	void triggerDataChannel(std::weak_ptr<DataChannel> weakDataChannel);
-	void triggerTrack(std::shared_ptr<Track> track);
 	bool changeState(State state);
 	bool changeGatheringState(GatheringState state);
 
 	void resetCallbacks();
 
-	void outgoingMedia(message_ptr message);
-
-	const init_token mInitToken = Init::Token();
 	const Configuration mConfig;
-	const future_certificate_ptr mCertificate;
-	const std::unique_ptr<Processor> mProcessor;
+	const std::shared_ptr<Certificate> mCertificate;
 
 	std::optional<Description> mLocalDescription, mRemoteDescription;
-	mutable std::mutex mLocalDescriptionMutex, mRemoteDescriptionMutex;
+	mutable std::recursive_mutex mLocalDescriptionMutex, mRemoteDescriptionMutex;
 
 	std::shared_ptr<IceTransport> mIceTransport;
 	std::shared_ptr<DtlsTransport> mDtlsTransport;
 	std::shared_ptr<SctpTransport> mSctpTransport;
 
-	std::unordered_map<unsigned int, std::weak_ptr<DataChannel>> mDataChannels; // by stream ID
-	std::unordered_map<string, std::weak_ptr<Track>> mTracks;                   // by mid
-	std::shared_mutex mDataChannelsMutex, mTracksMutex;
-
-	std::unordered_map<unsigned int, string> mMidFromPayloadType; // cache
+	std::unordered_map<unsigned int, std::weak_ptr<DataChannel>> mDataChannels;
+	std::shared_mutex mDataChannelsMutex;
 
 	std::atomic<State> mState;
 	std::atomic<GatheringState> mGatheringState;
 
 	synchronized_callback<std::shared_ptr<DataChannel>> mDataChannelCallback;
-	synchronized_callback<Description> mLocalDescriptionCallback;
-	synchronized_callback<Candidate> mLocalCandidateCallback;
+	synchronized_callback<const Description &> mLocalDescriptionCallback;
+	synchronized_callback<const Candidate &> mLocalCandidateCallback;
 	synchronized_callback<State> mStateChangeCallback;
 	synchronized_callback<GatheringState> mGatheringStateChangeCallback;
-	synchronized_callback<std::shared_ptr<Track>> mTrackCallback;
 };
 
 } // namespace rtc

include/rtc/queue.hpp

@@ -39,20 +39,14 @@ public:
 
 	void stop();
 	bool empty() const;
-	bool full() const;
 	size_t size() const;   // elements
 	size_t amount() const; // amount
 	void push(T element);
 	std::optional<T> pop();
-	std::optional<T> tryPop();
 	std::optional<T> peek();
-	std::optional<T> exchange(T element);
 	bool wait(const std::optional<std::chrono::milliseconds> &duration = nullopt);
 
 private:
-	void pushImpl(T element);
-	std::optional<T> popImpl();
-
 	const size_t mLimit;
 	size_t mAmount;
 	std::queue<T> mQueue;
@@ -65,10 +59,7 @@ private:
 
 template <typename T>
 Queue<T>::Queue(size_t limit, amount_function func) : mLimit(limit), mAmount(0) {
-	mAmountFunction = func ? func : [](const T &element) -> size_t {
-		static_cast<void>(element);
-		return 1;
-	};
+	mAmountFunction = func ? func : [](const T &element) -> size_t { return 1; };
 }
 
 template <typename T> Queue<T>::~Queue() { stop(); }
@@ -85,11 +76,6 @@ template <typename T> bool Queue<T>::empty() const {
 	return mQueue.empty();
 }
 
-template <typename T> bool Queue<T>::full() const {
-	std::lock_guard lock(mMutex);
-	return mQueue.size() >= mLimit;
-}
-
 template <typename T> size_t Queue<T>::size() const {
 	std::lock_guard lock(mMutex);
 	return mQueue.size();
@@ -103,32 +89,33 @@ template <typename T> size_t Queue<T>::amount() const {
 template <typename T> void Queue<T>::push(T element) {
 	std::unique_lock lock(mMutex);
 	mPushCondition.wait(lock, [this]() { return !mLimit || mQueue.size() < mLimit || mStopping; });
-	pushImpl(std::move(element));
+	if (!mStopping) {
+		mAmount += mAmountFunction(element);
+		mQueue.emplace(std::move(element));
+		mPopCondition.notify_one();
+	}
 }
 
 template <typename T> std::optional<T> Queue<T>::pop() {
 	std::unique_lock lock(mMutex);
 	mPopCondition.wait(lock, [this]() { return !mQueue.empty() || mStopping; });
-	return popImpl();
-}
-
-template <typename T> std::optional<T> Queue<T>::tryPop() {
-	std::unique_lock lock(mMutex);
-	return popImpl();
+	if (!mQueue.empty()) {
+		mAmount -= mAmountFunction(mQueue.front());
+		std::optional<T> element{std::move(mQueue.front())};
+		mQueue.pop();
+		return element;
+	} else {
+		return nullopt;
+	}
 }
 
 template <typename T> std::optional<T> Queue<T>::peek() {
 	std::unique_lock lock(mMutex);
-	return !mQueue.empty() ? std::make_optional(mQueue.front()) : nullopt;
-}
-
-template <typename T> std::optional<T> Queue<T>::exchange(T element) {
-	std::unique_lock lock(mMutex);
-	if (mQueue.empty())
+	if (!mQueue.empty()) {
+		return std::optional<T>{mQueue.front()};
+	} else {
 		return nullopt;
-
-	std::swap(mQueue.front(), element);
-	return std::make_optional(std::move(element));
+	}
 }
 
 template <typename T>
@@ -138,27 +125,7 @@ bool Queue<T>::wait(const std::optional<std::chrono::milliseconds> &duration) {
 		mPopCondition.wait_for(lock, *duration, [this]() { return !mQueue.empty() || mStopping; });
 	else
 		mPopCondition.wait(lock, [this]() { return !mQueue.empty() || mStopping; });
-
-	return !mQueue.empty();
-}
-
-template <typename T> void Queue<T>::pushImpl(T element) {
-	if (mStopping)
-		return;
-
-	mAmount += mAmountFunction(element);
-	mQueue.emplace(std::move(element));
-	mPopCondition.notify_one();
-}
-
-template <typename T> std::optional<T> Queue<T>::popImpl() {
-	if (mQueue.empty())
-		return nullopt;
-
-	mAmount -= mAmountFunction(mQueue.front());
-	std::optional<T> element{std::move(mQueue.front())};
-	mQueue.pop();
-	return element;
+	return !mStopping;
 }
 
 } // namespace rtc

include/rtc/reliability.hpp

@@ -27,9 +27,13 @@
 namespace rtc {
 
 struct Reliability {
-	enum class Type { Reliable = 0, Rexmit, Timed };
+	enum Type : uint8_t {
+		TYPE_RELIABLE = 0x00,
+		TYPE_PARTIAL_RELIABLE_REXMIT = 0x01,
+		TYPE_PARTIAL_RELIABLE_TIMED = 0x02,
+	};
 
-	Type type = Type::Reliable;
+	Type type = TYPE_RELIABLE;
 	bool unordered = false;
 	std::variant<int, std::chrono::milliseconds> rexmit = 0;
 };

include/rtc/rtc.h

@@ -23,17 +23,6 @@
 extern "C" {
 #endif
 
-#ifdef _WIN32
-#define RTC_EXPORT __declspec(dllexport)
-#else
-#define RTC_EXPORT
-#endif
-
-#ifndef RTC_ENABLE_WEBSOCKET
-#define RTC_ENABLE_WEBSOCKET 1
-#endif
-
-#include <stdbool.h>
 #include <stdint.h>
 
 // libdatachannel C API
@@ -53,7 +42,8 @@ typedef enum {
 	RTC_GATHERING_COMPLETE = 2
 } rtcGatheringState;
 
-typedef enum { // Don't change, it must match plog severity
+// Don't change, it must match plog severity
+typedef enum {
 	RTC_LOG_NONE = 0,
 	RTC_LOG_FATAL = 1,
 	RTC_LOG_ERROR = 2,
@@ -63,10 +53,6 @@ typedef enum { // Don't change, it must match plog severity
 	RTC_LOG_VERBOSE = 6
 } rtcLogLevel;
 
-#define RTC_ERR_SUCCESS 0
-#define RTC_ERR_INVALID -1 // invalid argument
-#define RTC_ERR_FAILURE -2 // runtime error
-
 typedef struct {
 	const char **iceServers;
 	int iceServersCount;
@@ -74,101 +60,59 @@ typedef struct {
 	uint16_t portRangeEnd;
 } rtcConfiguration;
 
-typedef struct {
-	bool unordered;
-	bool unreliable;
-	unsigned int maxPacketLifeTime; // ignored if reliable
-	unsigned int maxRetransmits;    // ignored if reliable
-} rtcReliability;
-
-typedef void (*rtcLogCallbackFunc)(rtcLogLevel level, const char *message);
-typedef void (*rtcDescriptionCallbackFunc)(const char *sdp, const char *type, void *ptr);
-typedef void (*rtcCandidateCallbackFunc)(const char *cand, const char *mid, void *ptr);
-typedef void (*rtcStateChangeCallbackFunc)(rtcState state, void *ptr);
-typedef void (*rtcGatheringStateCallbackFunc)(rtcGatheringState state, void *ptr);
-typedef void (*rtcDataChannelCallbackFunc)(int dc, void *ptr);
-typedef void (*rtcTrackCallbackFunc)(int tr, void *ptr);
-typedef void (*rtcOpenCallbackFunc)(void *ptr);
-typedef void (*rtcClosedCallbackFunc)(void *ptr);
-typedef void (*rtcErrorCallbackFunc)(const char *error, void *ptr);
-typedef void (*rtcMessageCallbackFunc)(const char *message, int size, void *ptr);
-typedef void (*rtcBufferedAmountLowCallbackFunc)(void *ptr);
-typedef void (*rtcAvailableCallbackFunc)(void *ptr);
+typedef void (*dataChannelCallbackFunc)(int dc, void *ptr);
+typedef void (*descriptionCallbackFunc)(const char *sdp, const char *type, void *ptr);
+typedef void (*candidateCallbackFunc)(const char *cand, const char *mid, void *ptr);
+typedef void (*stateChangeCallbackFunc)(rtcState state, void *ptr);
+typedef void (*gatheringStateCallbackFunc)(rtcGatheringState state, void *ptr);
+typedef void (*openCallbackFunc)(void *ptr);
+typedef void (*closedCallbackFunc)(void *ptr);
+typedef void (*errorCallbackFunc)(const char *error, void *ptr);
+typedef void (*messageCallbackFunc)(const char *message, int size, void *ptr);
+typedef void (*bufferedAmountLowCallbackFunc)(void *ptr);
+typedef void (*availableCallbackFunc)(void *ptr);
 
 // Log
-RTC_EXPORT void rtcInitLogger(rtcLogLevel level, rtcLogCallbackFunc cb); // NULL cb to log to stdout
+void rtcInitLogger(rtcLogLevel level);
 
 // User pointer
-RTC_EXPORT void rtcSetUserPointer(int id, void *ptr);
+void rtcSetUserPointer(int i, void *ptr);
 
 // PeerConnection
-RTC_EXPORT int rtcCreatePeerConnection(const rtcConfiguration *config); // returns pc id
-RTC_EXPORT int rtcDeletePeerConnection(int pc);
+int rtcCreatePeerConnection(const rtcConfiguration *config);
+int rtcDeletePeerConnection(int pc);
 
-RTC_EXPORT int rtcSetLocalDescriptionCallback(int pc, rtcDescriptionCallbackFunc cb);
-RTC_EXPORT int rtcSetLocalCandidateCallback(int pc, rtcCandidateCallbackFunc cb);
-RTC_EXPORT int rtcSetStateChangeCallback(int pc, rtcStateChangeCallbackFunc cb);
-RTC_EXPORT int rtcSetGatheringStateChangeCallback(int pc, rtcGatheringStateCallbackFunc cb);
+int rtcSetDataChannelCallback(int pc, dataChannelCallbackFunc cb);
+int rtcSetLocalDescriptionCallback(int pc, descriptionCallbackFunc cb);
+int rtcSetLocalCandidateCallback(int pc, candidateCallbackFunc cb);
+int rtcSetStateChangeCallback(int pc, stateChangeCallbackFunc cb);
+int rtcSetGatheringStateChangeCallback(int pc, gatheringStateCallbackFunc cb);
 
-RTC_EXPORT int rtcSetLocalDescription(int pc);
-RTC_EXPORT int rtcSetRemoteDescription(int pc, const char *sdp, const char *type);
-RTC_EXPORT int rtcAddRemoteCandidate(int pc, const char *cand, const char *mid);
+int rtcSetRemoteDescription(int pc, const char *sdp, const char *type);
+int rtcAddRemoteCandidate(int pc, const char *cand, const char *mid);
 
-RTC_EXPORT int rtcGetLocalAddress(int pc, char *buffer, int size);
-RTC_EXPORT int rtcGetRemoteAddress(int pc, char *buffer, int size);
+int rtcGetLocalAddress(int pc, char *buffer, int size);
+int rtcGetRemoteAddress(int pc, char *buffer, int size);
 
 // DataChannel
-RTC_EXPORT int rtcSetDataChannelCallback(int pc, rtcDataChannelCallbackFunc cb);
-RTC_EXPORT int rtcAddDataChannel(int pc, const char *label); // returns dc id
-RTC_EXPORT int rtcAddDataChannelExt(int pc, const char *label, const char *protocol,
-                                    const rtcReliability *reliability); // returns dc id
-// Equivalent to calling rtcAddDataChannel() and rtcSetLocalDescription()
-RTC_EXPORT int rtcCreateDataChannel(int pc, const char *label); // returns dc id
-RTC_EXPORT int rtcCreateDataChannelExt(int pc, const char *label, const char *protocol,
-                                       const rtcReliability *reliability); // returns dc id
-RTC_EXPORT int rtcDeleteDataChannel(int dc);
+int rtcCreateDataChannel(int pc, const char *label);
+int rtcDeleteDataChannel(int dc);
 
-RTC_EXPORT int rtcGetDataChannelLabel(int dc, char *buffer, int size);
-RTC_EXPORT int rtcGetDataChannelProtocol(int dc, char *buffer, int size);
-RTC_EXPORT int rtcGetDataChannelReliability(int dc, rtcReliability *reliability);
+int rtcGetDataChannelLabel(int dc, char *buffer, int size);
+int rtcSetOpenCallback(int dc, openCallbackFunc cb);
+int rtcSetClosedCallback(int dc, closedCallbackFunc cb);
+int rtcSetErrorCallback(int dc, errorCallbackFunc cb);
+int rtcSetMessageCallback(int dc, messageCallbackFunc cb);
+int rtcSendMessage(int dc, const char *data, int size);
 
-// Track
-RTC_EXPORT int rtcSetTrackCallback(int pc, rtcTrackCallbackFunc cb);
-RTC_EXPORT int rtcAddTrack(int pc, const char *mediaDescriptionSdp); // returns tr id
-RTC_EXPORT int rtcDeleteTrack(int tr);
+int rtcGetBufferedAmount(int dc); // total size buffered to send
+int rtcSetBufferedAmountLowThreshold(int dc, int amount);
+int rtcSetBufferedAmountLowCallback(int dc, bufferedAmountLowCallbackFunc cb);
 
-RTC_EXPORT int rtcGetTrackDescription(int tr, char *buffer, int size);
-
-// WebSocket
-#if RTC_ENABLE_WEBSOCKET
-typedef struct {
-	bool disableTlsVerification; // if true, don't verify the TLS certificate
-} rtcWsConfiguration;
-
-RTC_EXPORT int rtcCreateWebSocket(const char *url); // returns ws id
-RTC_EXPORT int rtcCreateWebSocketEx(const char *url, const rtcWsConfiguration *config);
-RTC_EXPORT int rtcDeleteWebsocket(int ws);
-#endif
-
-// DataChannel, Track, and WebSocket common API
-RTC_EXPORT int rtcSetOpenCallback(int id, rtcOpenCallbackFunc cb);
-RTC_EXPORT int rtcSetClosedCallback(int id, rtcClosedCallbackFunc cb);
-RTC_EXPORT int rtcSetErrorCallback(int id, rtcErrorCallbackFunc cb);
-RTC_EXPORT int rtcSetMessageCallback(int id, rtcMessageCallbackFunc cb);
-RTC_EXPORT int rtcSendMessage(int id, const char *data, int size);
-
-RTC_EXPORT int rtcGetBufferedAmount(int id); // total size buffered to send
-RTC_EXPORT int rtcSetBufferedAmountLowThreshold(int id, int amount);
-RTC_EXPORT int rtcSetBufferedAmountLowCallback(int id, rtcBufferedAmountLowCallbackFunc cb);
-
-// DataChannel, Track, and WebSocket common extended API
-RTC_EXPORT int rtcGetAvailableAmount(int id); // total size available to receive
-RTC_EXPORT int rtcSetAvailableCallback(int id, rtcAvailableCallbackFunc cb);
-RTC_EXPORT int rtcReceiveMessage(int id, char *buffer, int *size);
-
-// Optional preload and cleanup
-RTC_EXPORT void rtcPreload(void);
-RTC_EXPORT void rtcCleanup(void);
+// DataChannel extended API
+int rtcGetAvailableAmount(int dc); // total size available to receive
+int rtcSetAvailableCallback(int dc, availableCallbackFunc cb);
+int rtcReceiveMessage(int dc, char *buffer, int *size);
 
 #ifdef __cplusplus
 } // extern "C"

include/rtc/rtc.hpp

@@ -23,7 +23,6 @@
 //
 #include "datachannel.hpp"
 #include "peerconnection.hpp"
-#include "websocket.hpp"
 
 // C API
 #include "rtc.h"

include/rtc/rtcp.hpp

@@ -1,59 +0,0 @@
-/**
- * Copyright (c) 2020 Staz M
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef RTC_RTCP_H
-#define RTC_RTCP_H
-
-#include "include.hpp"
-#include "log.hpp"
-#include "message.hpp"
-
-namespace rtc {
-
-typedef uint32_t SSRC;
-
-class RtcpHandler {
-public:
-	virtual void onOutgoing(std::function<void(rtc::message_ptr)> cb) = 0;
-	virtual std::optional<rtc::message_ptr> incoming(rtc::message_ptr ptr) = 0;
-};
-
-// An RtcpSession can be plugged into a Track to handle the whole RTCP session
-class RtcpSession : public RtcpHandler {
-public:
-	void onOutgoing(std::function<void(rtc::message_ptr)> cb) override;
-
-	std::optional<rtc::message_ptr> incoming(rtc::message_ptr ptr) override;
-	void requestBitrate(unsigned int newBitrate);
-
-private:
-	void pushREMB(unsigned int bitrate);
-	void pushRR(unsigned int lastSR_delay);
-	void tx(message_ptr msg);
-
-	unsigned int mRequestedBitrate = 0;
-	synchronized_callback<rtc::message_ptr> mTxCallback;
-	SSRC mSsrc = 0;
-	uint32_t mGreatestSeqNo = 0;
-	uint64_t mSyncRTPTS, mSyncNTPTS;
-};
-
-} // namespace rtc
-
-#endif // RTC_RTCP_H

include/rtc/track.hpp

@@ -1,82 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef RTC_TRACK_H
-#define RTC_TRACK_H
-
-#include "channel.hpp"
-#include "description.hpp"
-#include "include.hpp"
-#include "message.hpp"
-#include "queue.hpp"
-#include "rtcp.hpp"
-
-#include <atomic>
-#include <variant>
-
-namespace rtc {
-
-#if RTC_ENABLE_MEDIA
-class DtlsSrtpTransport;
-#endif
-
-class Track final : public std::enable_shared_from_this<Track>, public Channel {
-public:
-	Track(Description::Media description);
-	~Track() = default;
-
-	string mid() const;
-	Description::Media description() const;
-
-	void close(void) override;
-	bool send(message_variant data) override;
-	bool send(const byte *data, size_t size);
-
-	bool isOpen(void) const override;
-	bool isClosed(void) const override;
-	size_t maxMessageSize() const override;
-
-	// Extended API
-	size_t availableAmount() const override;
-	std::optional<message_variant> receive() override;
-
-	// RTCP handler
-	void setRtcpHandler(std::shared_ptr<RtcpHandler> handler);
-
-private:
-#if RTC_ENABLE_MEDIA
-	void open(std::shared_ptr<DtlsSrtpTransport> transport);
-	std::weak_ptr<DtlsSrtpTransport> mDtlsSrtpTransport;
-#endif
-
-	bool outgoing(message_ptr message);
-	void incoming(message_ptr message);
-
-	Description::Media mMediaDescription;
-	std::atomic<bool> mIsClosed = false;
-
-	Queue<message_ptr> mRecvQueue;
-	std::shared_ptr<RtcpHandler> mRtcpHandler;
-
-	friend class PeerConnection;
-};
-
-} // namespace rtc
-
-#endif
-

include/rtc/websocket.hpp

@@ -1,99 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef RTC_WEBSOCKET_H
-#define RTC_WEBSOCKET_H
-
-#if RTC_ENABLE_WEBSOCKET
-
-#include "channel.hpp"
-#include "include.hpp"
-#include "init.hpp"
-#include "message.hpp"
-#include "queue.hpp"
-
-#include <atomic>
-#include <optional>
-#include <thread>
-#include <variant>
-
-namespace rtc {
-
-class TcpTransport;
-class TlsTransport;
-class WsTransport;
-
-class WebSocket final : public Channel, public std::enable_shared_from_this<WebSocket> {
-public:
-	enum class State : int {
-		Connecting = 0,
-		Open = 1,
-		Closing = 2,
-		Closed = 3,
-	};
-
-	struct Configuration {
-		bool disableTlsVerification = false; // if true, don't verify the TLS certificate
-	};
-
-	WebSocket(std::optional<Configuration> config = nullopt);
-	~WebSocket();
-
-	State readyState() const;
-
-	void open(const string &url);
-	void close() override;
-	bool send(const message_variant data) override;
-
-	bool isOpen() const override;
-	bool isClosed() const override;
-	size_t maxMessageSize() const override;
-
-	// Extended API
-	std::optional<message_variant> receive() override;
-	size_t availableAmount() const override; // total size available to receive
-
-private:
-	bool changeState(State state);
-	void remoteClose();
-	bool outgoing(message_ptr message);
-	void incoming(message_ptr message);
-
-	std::shared_ptr<TcpTransport> initTcpTransport();
-	std::shared_ptr<TlsTransport> initTlsTransport();
-	std::shared_ptr<WsTransport> initWsTransport();
-	void closeTransports();
-
-	init_token mInitToken = Init::Token();
-
-	std::shared_ptr<TcpTransport> mTcpTransport;
-	std::shared_ptr<TlsTransport> mTlsTransport;
-	std::shared_ptr<WsTransport> mWsTransport;
-	std::recursive_mutex mInitMutex;
-
-	const Configuration mConfig;
-	string mScheme, mHost, mHostname, mService, mPath;
-	std::atomic<State> mState = State::Closed;
-
-	Queue<message_ptr> mRecvQueue;
-};
-} // namespace rtc
-
-#endif
-
-#endif // RTC_WEBSOCKET_H

src/base64.cpp

@@ -1,65 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#if RTC_ENABLE_WEBSOCKET
-
-#include "base64.hpp"
-
-namespace rtc {
-
-using std::to_integer;
-
-string to_base64(const binary &data) {
-	static const char tab[] =
-	    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-	string out;
-	out.reserve(3 * ((data.size() + 3) / 4));
-	int i = 0;
-	while (data.size() - i >= 3) {
-		auto d0 = to_integer<uint8_t>(data[i]);
-		auto d1 = to_integer<uint8_t>(data[i + 1]);
-		auto d2 = to_integer<uint8_t>(data[i + 2]);
-		out += tab[d0 >> 2];
-		out += tab[((d0 & 3) << 4) | (d1 >> 4)];
-		out += tab[((d1 & 0x0F) << 2) | (d2 >> 6)];
-		out += tab[d2 & 0x3F];
-		i += 3;
-	}
-
-	int left = int(data.size() - i);
-	if (left) {
-		auto d0 = to_integer<uint8_t>(data[i]);
-		out += tab[d0 >> 2];
-		if (left == 1) {
-			out += tab[(d0 & 3) << 4];
-			out += '=';
-		} else { // left == 2
-			auto d1 = to_integer<uint8_t>(data[i + 1]);
-			out += tab[((d0 & 3) << 4) | (d1 >> 4)];
-			out += tab[(d1 & 0x0F) << 2];
-		}
-		out += '=';
-	}
-
-	return out;
-}
-
-} // namespace rtc
-
-#endif

src/base64.hpp

@@ -1,34 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef RTC_BASE64_H
-#define RTC_BASE64_H
-
-#if RTC_ENABLE_WEBSOCKET
-
-#include "include.hpp"
-
-namespace rtc {
-
-string to_base64(const binary &data);
-
-}
-
-#endif
-
-#endif

src/candidate.cpp

@@ -28,7 +28,6 @@
 #else
 #include <netdb.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
 #endif
 
 #include <sys/types.h>
@@ -49,7 +48,7 @@ namespace rtc {
 
 Candidate::Candidate(string candidate, string mid) : mIsResolved(false) {
 	const std::array prefixes{"a=", "candidate:"};
-	for (const string &prefix : prefixes)
+	for (string prefix : prefixes)
 		if (hasprefix(candidate, prefix))
 			candidate.erase(0, prefix.size());
 
@@ -61,19 +60,12 @@ bool Candidate::resolve(ResolveMode mode) {
 	if (mIsResolved)
 		return true;
 
-	PLOG_VERBOSE << "Resolving candidate (mode="
-				 << (mode == ResolveMode::Simple ? "simple" : "lookup")
-				 << "): " << mCandidate;
-
 	// See RFC 8445 for format
-	std::istringstream iss(mCandidate);
+	std::stringstream ss(mCandidate);
 	int component{0}, priority{0};
 	string foundation, transport, node, service, typ_, type;
-	if (iss >> foundation >> component >> transport >> priority &&
-	    iss >> node >> service >> typ_ >> type && typ_ == "typ") {
-
-		string left;
-		std::getline(iss, left);
+	if (ss >> foundation >> component >> transport >> priority &&
+	    ss >> node >> service >> typ_ >> type && typ_ == "typ") {
 
 		// Try to resolve the node
 		struct addrinfo hints = {};
@@ -99,18 +91,19 @@ bool Candidate::resolve(ResolveMode mode) {
 					// Rewrite the candidate
 					char nodebuffer[MAX_NUMERICNODE_LEN];
 					char servbuffer[MAX_NUMERICSERV_LEN];
-					if (getnameinfo(p->ai_addr, socklen_t(p->ai_addrlen), nodebuffer,
-					                MAX_NUMERICNODE_LEN, servbuffer, MAX_NUMERICSERV_LEN,
+					if (getnameinfo(p->ai_addr, p->ai_addrlen, nodebuffer, MAX_NUMERICNODE_LEN,
+					                servbuffer, MAX_NUMERICSERV_LEN,
 					                NI_NUMERICHOST | NI_NUMERICSERV) == 0) {
+						string left;
+						std::getline(ss, left);
 						const char sp{' '};
-						std::ostringstream oss;
-						oss << foundation << sp << component << sp << transport << sp << priority;
-						oss << sp << nodebuffer << sp << servbuffer << sp << "typ" << sp << type;
-						oss << left;
-						mCandidate = oss.str();
-						mIsResolved = true;
-						PLOG_VERBOSE << "Resolved candidate: " << mCandidate;
-						break;
+						ss.clear();
+						ss << foundation << sp << component << sp << transport << sp << priority;
+						ss << sp << nodebuffer << sp << servbuffer << sp << "typ" << sp << type;
+						if (!left.empty())
+							ss << left;
+						mCandidate = ss.str();
+						return mIsResolved = true;
 					}
 				}
 		}
@@ -118,7 +111,7 @@ bool Candidate::resolve(ResolveMode mode) {
 		freeaddrinfo(result);
 	}
 
-	return mIsResolved;
+	return false;
 }
 
 bool Candidate::isResolved() const { return mIsResolved; }

src/capi.cpp

@@ -1,782 +0,0 @@
-/**
- * Copyright (c) 2019-2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "include.hpp"
-
-#include "rtc.h"
-
-#include "datachannel.hpp"
-#include "log.hpp"
-#include "peerconnection.hpp"
-#if RTC_ENABLE_WEBSOCKET
-#include "websocket.hpp"
-#endif
-
-#include "plog/Formatters/FuncMessageFormatter.h"
-
-#include <chrono>
-#include <exception>
-#include <mutex>
-#include <type_traits>
-#include <unordered_map>
-#include <utility>
-
-#ifdef _WIN32
-#include <codecvt>
-#include <locale>
-#endif
-
-using namespace rtc;
-using std::shared_ptr;
-using std::string;
-using std::chrono::milliseconds;
-
-namespace {
-
-std::unordered_map<int, shared_ptr<PeerConnection>> peerConnectionMap;
-std::unordered_map<int, shared_ptr<DataChannel>> dataChannelMap;
-std::unordered_map<int, shared_ptr<Track>> trackMap;
-#if RTC_ENABLE_WEBSOCKET
-std::unordered_map<int, shared_ptr<WebSocket>> webSocketMap;
-#endif
-std::unordered_map<int, void *> userPointerMap;
-std::mutex mutex;
-int lastId = 0;
-
-std::optional<void *> getUserPointer(int id) {
-	std::lock_guard lock(mutex);
-	auto it = userPointerMap.find(id);
-	return it != userPointerMap.end() ? std::make_optional(it->second) : nullopt;
-}
-
-void setUserPointer(int i, void *ptr) {
-	std::lock_guard lock(mutex);
-	userPointerMap[i] = ptr;
-}
-
-shared_ptr<PeerConnection> getPeerConnection(int id) {
-	std::lock_guard lock(mutex);
-	if (auto it = peerConnectionMap.find(id); it != peerConnectionMap.end())
-		return it->second;
-	else
-		throw std::invalid_argument("PeerConnection ID does not exist");
-}
-
-shared_ptr<DataChannel> getDataChannel(int id) {
-	std::lock_guard lock(mutex);
-	if (auto it = dataChannelMap.find(id); it != dataChannelMap.end())
-		return it->second;
-	else
-		throw std::invalid_argument("DataChannel ID does not exist");
-}
-
-shared_ptr<Track> getTrack(int id) {
-	std::lock_guard lock(mutex);
-	if (auto it = trackMap.find(id); it != trackMap.end())
-		return it->second;
-	else
-		throw std::invalid_argument("Track ID does not exist");
-}
-
-int emplacePeerConnection(shared_ptr<PeerConnection> ptr) {
-	std::lock_guard lock(mutex);
-	int pc = ++lastId;
-	peerConnectionMap.emplace(std::make_pair(pc, ptr));
-	userPointerMap.emplace(std::make_pair(pc, nullptr));
-	return pc;
-}
-
-int emplaceDataChannel(shared_ptr<DataChannel> ptr) {
-	std::lock_guard lock(mutex);
-	int dc = ++lastId;
-	dataChannelMap.emplace(std::make_pair(dc, ptr));
-	userPointerMap.emplace(std::make_pair(dc, nullptr));
-	return dc;
-}
-
-int emplaceTrack(shared_ptr<Track> ptr) {
-	std::lock_guard lock(mutex);
-	int tr = ++lastId;
-	trackMap.emplace(std::make_pair(tr, ptr));
-	userPointerMap.emplace(std::make_pair(tr, nullptr));
-	return tr;
-}
-
-void erasePeerConnection(int pc) {
-	std::lock_guard lock(mutex);
-	if (peerConnectionMap.erase(pc) == 0)
-		throw std::invalid_argument("PeerConnection ID does not exist");
-	userPointerMap.erase(pc);
-}
-
-void eraseDataChannel(int dc) {
-	std::lock_guard lock(mutex);
-	if (dataChannelMap.erase(dc) == 0)
-		throw std::invalid_argument("DataChannel ID does not exist");
-	userPointerMap.erase(dc);
-}
-
-void eraseTrack(int tr) {
-	std::lock_guard lock(mutex);
-	if (trackMap.erase(tr) == 0)
-		throw std::invalid_argument("Track ID does not exist");
-	userPointerMap.erase(tr);
-}
-
-#if RTC_ENABLE_WEBSOCKET
-shared_ptr<WebSocket> getWebSocket(int id) {
-	std::lock_guard lock(mutex);
-	if (auto it = webSocketMap.find(id); it != webSocketMap.end())
-		return it->second;
-	else
-		throw std::invalid_argument("WebSocket ID does not exist");
-}
-
-int emplaceWebSocket(shared_ptr<WebSocket> ptr) {
-	std::lock_guard lock(mutex);
-	int ws = ++lastId;
-	webSocketMap.emplace(std::make_pair(ws, ptr));
-	userPointerMap.emplace(std::make_pair(ws, nullptr));
-	return ws;
-}
-
-void eraseWebSocket(int ws) {
-	std::lock_guard lock(mutex);
-	if (webSocketMap.erase(ws) == 0)
-		throw std::invalid_argument("WebSocket ID does not exist");
-	userPointerMap.erase(ws);
-}
-#endif
-
-shared_ptr<Channel> getChannel(int id) {
-	std::lock_guard lock(mutex);
-	if (auto it = dataChannelMap.find(id); it != dataChannelMap.end())
-		return it->second;
-	if (auto it = trackMap.find(id); it != trackMap.end())
-		return it->second;
-#if RTC_ENABLE_WEBSOCKET
-	if (auto it = webSocketMap.find(id); it != webSocketMap.end())
-		return it->second;
-#endif
-	throw std::invalid_argument("DataChannel, Track, or WebSocket ID does not exist");
-}
-
-template <typename F> int wrap(F func) {
-	try {
-		return int(func());
-
-	} catch (const std::invalid_argument &e) {
-		PLOG_ERROR << e.what();
-		return RTC_ERR_INVALID;
-	} catch (const std::exception &e) {
-		PLOG_ERROR << e.what();
-		return RTC_ERR_FAILURE;
-	}
-}
-
-#define WRAP(statement)                                                                            \
-	wrap([&]() {                                                                                   \
-		statement;                                                                                 \
-		return RTC_ERR_SUCCESS;                                                                    \
-	})
-
-class plog_appender : public plog::IAppender {
-public:
-	plog_appender(rtcLogCallbackFunc cb = nullptr) { set_callback(cb); }
-
-	void set_callback(rtcLogCallbackFunc cb) {
-		std::lock_guard lock(mutex);
-		callback = cb;
-	}
-
-	void write(const plog::Record &record) override {
-		plog::Severity severity = record.getSeverity();
-		auto formatted = plog::FuncMessageFormatter::format(record);
-		formatted.pop_back(); // remove newline
-#ifdef _WIN32
-		using convert_type = std::codecvt_utf8<wchar_t>;
-		std::wstring_convert<convert_type, wchar_t> converter;
-		std::string str = converter.to_bytes(formatted);
-#else
-		std::string str = formatted;
-#endif
-		std::lock_guard lock(mutex);
-		if (callback)
-			callback(static_cast<rtcLogLevel>(record.getSeverity()), str.c_str());
-		else
-			std::cout << plog::severityToString(severity) << " " << str << std::endl;
-	}
-
-private:
-	rtcLogCallbackFunc callback;
-};
-
-} // namespace
-
-void rtcInitLogger(rtcLogLevel level, rtcLogCallbackFunc cb) {
-	static std::optional<plog_appender> appender;
-	if (appender)
-		appender->set_callback(cb);
-	else if (cb)
-		appender.emplace(plog_appender(cb));
-
-	InitLogger(static_cast<plog::Severity>(level), appender ? &appender.value() : nullptr);
-}
-
-void rtcSetUserPointer(int i, void *ptr) { setUserPointer(i, ptr); }
-
-int rtcCreatePeerConnection(const rtcConfiguration *config) {
-	return WRAP({
-		Configuration c;
-		for (int i = 0; i < config->iceServersCount; ++i)
-			c.iceServers.emplace_back(string(config->iceServers[i]));
-
-		if (config->portRangeBegin || config->portRangeEnd) {
-			c.portRangeBegin = config->portRangeBegin;
-			c.portRangeEnd = config->portRangeEnd;
-		}
-
-		return emplacePeerConnection(std::make_shared<PeerConnection>(c));
-	});
-}
-
-int rtcDeletePeerConnection(int pc) {
-	return WRAP({
-		auto peerConnection = getPeerConnection(pc);
-		peerConnection->onDataChannel(nullptr);
-		peerConnection->onLocalDescription(nullptr);
-		peerConnection->onLocalCandidate(nullptr);
-		peerConnection->onStateChange(nullptr);
-		peerConnection->onGatheringStateChange(nullptr);
-
-		erasePeerConnection(pc);
-	});
-}
-
-int rtcAddDataChannel(int pc, const char *label) {
-	return rtcAddDataChannelExt(pc, label, nullptr, nullptr);
-}
-
-int rtcAddDataChannelExt(int pc, const char *label, const char *protocol,
-                         const rtcReliability *reliability) {
-	return WRAP({
-		Reliability r = {};
-		if (reliability) {
-			r.unordered = reliability->unordered;
-			if (reliability->unreliable) {
-				if (reliability->maxPacketLifeTime > 0) {
-					r.type = Reliability::Type::Timed;
-					r.rexmit = milliseconds(reliability->maxPacketLifeTime);
-				} else {
-					r.type = Reliability::Type::Rexmit;
-					r.rexmit = int(reliability->maxRetransmits);
-				}
-			} else {
-				r.type = Reliability::Type::Reliable;
-			}
-		}
-		auto peerConnection = getPeerConnection(pc);
-		int dc = emplaceDataChannel(peerConnection->addDataChannel(
-		    string(label ? label : ""), string(protocol ? protocol : ""), r));
-		if (auto ptr = getUserPointer(pc))
-			rtcSetUserPointer(dc, *ptr);
-		return dc;
-	});
-}
-
-int rtcCreateDataChannel(int pc, const char *label) {
-	return rtcCreateDataChannelExt(pc, label, nullptr, nullptr);
-}
-
-int rtcCreateDataChannelExt(int pc, const char *label, const char *protocol,
-                            const rtcReliability *reliability) {
-	int dc = rtcAddDataChannelExt(pc, label, protocol, reliability);
-	rtcSetLocalDescription(pc);
-	return dc;
-}
-
-int rtcDeleteDataChannel(int dc) {
-	return WRAP({
-		auto dataChannel = getDataChannel(dc);
-		dataChannel->onOpen(nullptr);
-		dataChannel->onClosed(nullptr);
-		dataChannel->onError(nullptr);
-		dataChannel->onMessage(nullptr);
-		dataChannel->onBufferedAmountLow(nullptr);
-		dataChannel->onAvailable(nullptr);
-
-		eraseDataChannel(dc);
-	});
-}
-
-int rtcAddTrack(int pc, const char *mediaDescriptionSdp) {
-	return WRAP({
-		if (!mediaDescriptionSdp)
-			throw std::invalid_argument("Unexpected null pointer for track media description");
-
-		auto peerConnection = getPeerConnection(pc);
-		Description::Media media{string(mediaDescriptionSdp)};
-		int tr = emplaceTrack(peerConnection->addTrack(std::move(media)));
-		if (auto ptr = getUserPointer(pc))
-			rtcSetUserPointer(tr, *ptr);
-		return tr;
-	});
-}
-
-int rtcDeleteTrack(int tr) {
-	return WRAP({
-		auto track = getTrack(tr);
-		track->onOpen(nullptr);
-		track->onClosed(nullptr);
-		track->onError(nullptr);
-		track->onMessage(nullptr);
-		track->onBufferedAmountLow(nullptr);
-		track->onAvailable(nullptr);
-
-		eraseTrack(tr);
-	});
-}
-
-int rtcGetTrackDescription(int tr, char *buffer, int size) {
-	return WRAP({
-		auto track = getTrack(tr);
-
-		if (size <= 0)
-			return 0;
-
-		if (!buffer)
-			throw std::invalid_argument("Unexpected null pointer for buffer");
-
-		string description(track->description());
-		const char *data = description.data();
-		size = std::min(size - 1, int(description.size()));
-		std::copy(data, data + size, buffer);
-		buffer[size] = '\0';
-		return int(size + 1);
-	});
-}
-
-#if RTC_ENABLE_WEBSOCKET
-int rtcCreateWebSocket(const char *url) {
-	return WRAP({
-		auto ws = std::make_shared<WebSocket>();
-		ws->open(url);
-		return emplaceWebSocket(ws);
-	});
-}
-
-int rtcCreateWebSocketEx(const char *url, const rtcWsConfiguration *config) {
-	return WRAP({
-		WebSocket::Configuration c;
-		c.disableTlsVerification = config->disableTlsVerification;
-		auto ws = std::make_shared<WebSocket>(c);
-		ws->open(url);
-		return emplaceWebSocket(ws);
-	});
-}
-
-int rtcDeleteWebsocket(int ws) {
-	return WRAP({
-		auto webSocket = getWebSocket(ws);
-		webSocket->onOpen(nullptr);
-		webSocket->onClosed(nullptr);
-		webSocket->onError(nullptr);
-		webSocket->onMessage(nullptr);
-		webSocket->onBufferedAmountLow(nullptr);
-		webSocket->onAvailable(nullptr);
-
-		eraseWebSocket(ws);
-	});
-}
-#endif
-
-int rtcSetLocalDescriptionCallback(int pc, rtcDescriptionCallbackFunc cb) {
-	return WRAP({
-		auto peerConnection = getPeerConnection(pc);
-		if (cb)
-			peerConnection->onLocalDescription([pc, cb](Description desc) {
-				if (auto ptr = getUserPointer(pc))
-					cb(string(desc).c_str(), desc.typeString().c_str(), *ptr);
-			});
-		else
-			peerConnection->onLocalDescription(nullptr);
-	});
-}
-
-int rtcSetLocalCandidateCallback(int pc, rtcCandidateCallbackFunc cb) {
-	return WRAP({
-		auto peerConnection = getPeerConnection(pc);
-		if (cb)
-			peerConnection->onLocalCandidate([pc, cb](Candidate cand) {
-				if (auto ptr = getUserPointer(pc))
-					cb(cand.candidate().c_str(), cand.mid().c_str(), *ptr);
-			});
-		else
-			peerConnection->onLocalCandidate(nullptr);
-	});
-}
-
-int rtcSetStateChangeCallback(int pc, rtcStateChangeCallbackFunc cb) {
-	return WRAP({
-		auto peerConnection = getPeerConnection(pc);
-		if (cb)
-			peerConnection->onStateChange([pc, cb](PeerConnection::State state) {
-				if (auto ptr = getUserPointer(pc))
-					cb(static_cast<rtcState>(state), *ptr);
-			});
-		else
-			peerConnection->onStateChange(nullptr);
-	});
-}
-
-int rtcSetGatheringStateChangeCallback(int pc, rtcGatheringStateCallbackFunc cb) {
-	return WRAP({
-		auto peerConnection = getPeerConnection(pc);
-		if (cb)
-			peerConnection->onGatheringStateChange([pc, cb](PeerConnection::GatheringState state) {
-				if (auto ptr = getUserPointer(pc))
-					cb(static_cast<rtcGatheringState>(state), *ptr);
-			});
-		else
-			peerConnection->onGatheringStateChange(nullptr);
-	});
-}
-
-int rtcSetDataChannelCallback(int pc, rtcDataChannelCallbackFunc cb) {
-	return WRAP({
-		auto peerConnection = getPeerConnection(pc);
-		if (cb)
-			peerConnection->onDataChannel([pc, cb](std::shared_ptr<DataChannel> dataChannel) {
-				int dc = emplaceDataChannel(dataChannel);
-				if (auto ptr = getUserPointer(pc)) {
-					rtcSetUserPointer(dc, *ptr);
-					cb(dc, *ptr);
-				}
-			});
-		else
-			peerConnection->onDataChannel(nullptr);
-	});
-}
-
-int rtcSetTrackCallback(int pc, rtcTrackCallbackFunc cb) {
-	return WRAP({
-		auto peerConnection = getPeerConnection(pc);
-		if (cb)
-			peerConnection->onTrack([pc, cb](std::shared_ptr<Track> track) {
-				int tr = emplaceTrack(track);
-				if (auto ptr = getUserPointer(pc)) {
-					rtcSetUserPointer(tr, *ptr);
-					cb(tr, *ptr);
-				}
-			});
-		else
-			peerConnection->onTrack(nullptr);
-	});
-}
-
-int rtcSetLocalDescription(int pc) {
-	return WRAP({
-		auto peerConnection = getPeerConnection(pc);
-		peerConnection->setLocalDescription();
-	});
-}
-
-int rtcSetRemoteDescription(int pc, const char *sdp, const char *type) {
-	return WRAP({
-		auto peerConnection = getPeerConnection(pc);
-
-		if (!sdp)
-			throw std::invalid_argument("Unexpected null pointer for remote description");
-
-		peerConnection->setRemoteDescription({string(sdp), type ? string(type) : ""});
-	});
-}
-
-int rtcAddRemoteCandidate(int pc, const char *cand, const char *mid) {
-	return WRAP({
-		auto peerConnection = getPeerConnection(pc);
-
-		if (!cand)
-			throw std::invalid_argument("Unexpected null pointer for remote candidate");
-
-		peerConnection->addRemoteCandidate({string(cand), mid ? string(mid) : ""});
-	});
-}
-
-int rtcGetLocalAddress(int pc, char *buffer, int size) {
-	return WRAP({
-		auto peerConnection = getPeerConnection(pc);
-
-		if (size <= 0)
-			return 0;
-
-		if (!buffer)
-			throw std::invalid_argument("Unexpected null pointer for buffer");
-
-		if (auto addr = peerConnection->localAddress()) {
-			const char *data = addr->data();
-			size = std::min(size - 1, int(addr->size()));
-			std::copy(data, data + size, buffer);
-			buffer[size] = '\0';
-			return size + 1;
-		}
-	});
-}
-
-int rtcGetRemoteAddress(int pc, char *buffer, int size) {
-	return WRAP({
-		auto peerConnection = getPeerConnection(pc);
-
-		if (size <= 0)
-			return 0;
-
-		if (!buffer)
-			throw std::invalid_argument("Unexpected null pointer for buffer");
-
-		if (auto addr = peerConnection->remoteAddress()) {
-			const char *data = addr->data();
-			size = std::min(size - 1, int(addr->size()));
-			std::copy(data, data + size, buffer);
-			buffer[size] = '\0';
-			return int(size + 1);
-		}
-	});
-}
-
-int rtcGetDataChannelLabel(int dc, char *buffer, int size) {
-	return WRAP({
-		auto dataChannel = getDataChannel(dc);
-
-		if (size <= 0)
-			return 0;
-
-		if (!buffer)
-			throw std::invalid_argument("Unexpected null pointer for buffer");
-
-		string label = dataChannel->label();
-		const char *data = label.data();
-		size = std::min(size - 1, int(label.size()));
-		std::copy(data, data + size, buffer);
-		buffer[size] = '\0';
-		return int(size + 1);
-	});
-}
-
-int rtcGetDataChannelProtocol(int dc, char *buffer, int size) {
-	return WRAP({
-		auto dataChannel = getDataChannel(dc);
-
-		if (size <= 0)
-			return 0;
-
-		if (!buffer)
-			throw std::invalid_argument("Unexpected null pointer for buffer");
-
-		string protocol = dataChannel->protocol();
-		const char *data = protocol.data();
-		size = std::min(size - 1, int(protocol.size()));
-		std::copy(data, data + size, buffer);
-		buffer[size] = '\0';
-		return int(size + 1);
-	});
-}
-
-int rtcGetDataChannelReliability(int dc, rtcReliability *reliability) {
-	return WRAP({
-		auto dataChannel = getDataChannel(dc);
-
-		if (!reliability)
-			throw std::invalid_argument("Unexpected null pointer for reliability");
-
-		Reliability r = dataChannel->reliability();
-		std::memset(reliability, 0, sizeof(*reliability));
-		reliability->unordered = r.unordered;
-		if (r.type == Reliability::Type::Timed) {
-			reliability->unreliable = true;
-			reliability->maxPacketLifeTime = unsigned(std::get<milliseconds>(r.rexmit).count());
-		} else if (r.type == Reliability::Type::Rexmit) {
-			reliability->unreliable = true;
-			reliability->maxRetransmits = unsigned(std::get<int>(r.rexmit));
-		} else {
-			reliability->unreliable = false;
-		}
-		return 0;
-	});
-}
-
-int rtcSetOpenCallback(int id, rtcOpenCallbackFunc cb) {
-	return WRAP({
-		auto channel = getChannel(id);
-		if (cb)
-			channel->onOpen([id, cb]() {
-				if (auto ptr = getUserPointer(id))
-					cb(*ptr);
-			});
-		else
-			channel->onOpen(nullptr);
-	});
-}
-
-int rtcSetClosedCallback(int id, rtcClosedCallbackFunc cb) {
-	return WRAP({
-		auto channel = getChannel(id);
-		if (cb)
-			channel->onClosed([id, cb]() {
-				if (auto ptr = getUserPointer(id))
-					cb(*ptr);
-			});
-		else
-			channel->onClosed(nullptr);
-	});
-}
-
-int rtcSetErrorCallback(int id, rtcErrorCallbackFunc cb) {
-	return WRAP({
-		auto channel = getChannel(id);
-		if (cb)
-			channel->onError([id, cb](string error) {
-				if (auto ptr = getUserPointer(id))
-					cb(error.c_str(), *ptr);
-			});
-		else
-			channel->onError(nullptr);
-	});
-}
-
-int rtcSetMessageCallback(int id, rtcMessageCallbackFunc cb) {
-	return WRAP({
-		auto channel = getChannel(id);
-		if (cb)
-			channel->onMessage(
-			    [id, cb](binary b) {
-				    if (auto ptr = getUserPointer(id))
-					    cb(reinterpret_cast<const char *>(b.data()), int(b.size()), *ptr);
-			    },
-			    [id, cb](string s) {
-				    if (auto ptr = getUserPointer(id))
-					    cb(s.c_str(), -int(s.size() + 1), *ptr);
-			    });
-		else
-			channel->onMessage(nullptr);
-	});
-}
-
-int rtcSendMessage(int id, const char *data, int size) {
-	return WRAP({
-		auto channel = getChannel(id);
-
-		if (!data && size != 0)
-			throw std::invalid_argument("Unexpected null pointer for data");
-
-		if (size >= 0) {
-			auto b = reinterpret_cast<const byte *>(data);
-			channel->send(binary(b, b + size));
-			return size;
-		} else {
-			string str(data);
-			int len = int(str.size());
-			channel->send(std::move(str));
-			return len;
-		}
-	});
-}
-
-int rtcGetBufferedAmount(int id) {
-	return WRAP({
-		auto channel = getChannel(id);
-		return int(channel->bufferedAmount());
-	});
-}
-
-int rtcSetBufferedAmountLowThreshold(int id, int amount) {
-	return WRAP({
-		auto channel = getChannel(id);
-		channel->setBufferedAmountLowThreshold(size_t(amount));
-	});
-}
-
-int rtcSetBufferedAmountLowCallback(int id, rtcBufferedAmountLowCallbackFunc cb) {
-	return WRAP({
-		auto channel = getChannel(id);
-		if (cb)
-			channel->onBufferedAmountLow([id, cb]() {
-				if (auto ptr = getUserPointer(id))
-					cb(*ptr);
-			});
-		else
-			channel->onBufferedAmountLow(nullptr);
-	});
-}
-
-int rtcGetAvailableAmount(int id) {
-	return WRAP({ return int(getChannel(id)->availableAmount()); });
-}
-
-int rtcSetAvailableCallback(int id, rtcAvailableCallbackFunc cb) {
-	return WRAP({
-		auto channel = getChannel(id);
-		if (cb)
-			channel->onOpen([id, cb]() {
-				if (auto ptr = getUserPointer(id))
-					cb(*ptr);
-			});
-		else
-			channel->onOpen(nullptr);
-	});
-}
-
-int rtcReceiveMessage(int id, char *buffer, int *size) {
-	return WRAP({
-		auto channel = getChannel(id);
-
-		if (!size)
-			throw std::invalid_argument("Unexpected null pointer for size");
-
-		if (!buffer && *size != 0)
-			throw std::invalid_argument("Unexpected null pointer for buffer");
-
-		if (auto message = channel->receive())
-			return std::visit( //
-			    overloaded{    //
-			               [&](binary b) {
-				               if (*size > 0) {
-					               *size = std::min(*size, int(b.size()));
-					               auto data = reinterpret_cast<const char *>(b.data());
-					               std::copy(data, data + *size, buffer);
-				               }
-				               return 1;
-			               },
-			               [&](string s) {
-				               if (*size > 0) {
-					               int len = std::min(*size - 1, int(s.size()));
-					               if (len >= 0) {
-						               std::copy(s.data(), s.data() + len, buffer);
-						               buffer[len] = '\0';
-					               }
-					               *size = -(len + 1);
-				               }
-				               return 1;
-			               }},
-			    *message);
-		else
-			return 0;
-	});
-}
-
-void rtcPreload() { rtc::Preload(); }
-void rtcCleanup() { rtc::Cleanup(); }

src/certificate.cpp

@@ -17,7 +17,6 @@
  */
 
 #include "certificate.hpp"
-#include "threadpool.hpp"
 
 #include <cassert>
 #include <chrono>
@@ -32,43 +31,93 @@ using std::unique_ptr;
 
 #if USE_GNUTLS
 
+#include <gnutls/crypto.h>
+
+namespace {
+
+void check_gnutls(int ret, const string &message = "GnuTLS error") {
+	if (ret != GNUTLS_E_SUCCESS)
+		throw std::runtime_error(message + ": " + gnutls_strerror(ret));
+}
+
+gnutls_certificate_credentials_t *create_credentials() {
+	auto creds = new gnutls_certificate_credentials_t;
+	check_gnutls(gnutls_certificate_allocate_credentials(creds));
+	return creds;
+}
+
+void delete_credentials(gnutls_certificate_credentials_t *creds) {
+	gnutls_certificate_free_credentials(*creds);
+	delete creds;
+}
+
+gnutls_x509_crt_t *create_crt() {
+	auto crt = new gnutls_x509_crt_t;
+	check_gnutls(gnutls_x509_crt_init(crt));
+	return crt;
+}
+
+void delete_crt(gnutls_x509_crt_t *crt) {
+	gnutls_x509_crt_deinit(*crt);
+	delete crt;
+}
+
+gnutls_x509_privkey_t *create_privkey() {
+	auto privkey = new gnutls_x509_privkey_t;
+	check_gnutls(gnutls_x509_privkey_init(privkey));
+	return privkey;
+}
+
+void delete_privkey(gnutls_x509_privkey_t *privkey) {
+	gnutls_x509_privkey_deinit(*privkey);
+	delete privkey;
+}
+
+gnutls_datum_t make_datum(char *data, size_t size) {
+	gnutls_datum_t datum;
+	datum.data = reinterpret_cast<unsigned char *>(data);
+	datum.size = size;
+	return datum;
+}
+
+} // namespace
+
 namespace rtc {
 
 Certificate::Certificate(string crt_pem, string key_pem)
-    : mCredentials(gnutls::new_credentials(), gnutls::free_credentials) {
+    : mCredentials(create_credentials(), delete_credentials) {
 
-	gnutls_datum_t crt_datum = gnutls::make_datum(crt_pem.data(), crt_pem.size());
-	gnutls_datum_t key_datum = gnutls::make_datum(key_pem.data(), key_pem.size());
+	gnutls_datum_t crt_datum = make_datum(crt_pem.data(), crt_pem.size());
+	gnutls_datum_t key_datum = make_datum(key_pem.data(), key_pem.size());
 
-	gnutls::check(gnutls_certificate_set_x509_key_mem(*mCredentials, &crt_datum, &key_datum,
-	                                                  GNUTLS_X509_FMT_PEM),
-	              "Unable to import PEM");
+	check_gnutls(gnutls_certificate_set_x509_key_mem(*mCredentials, &crt_datum, &key_datum,
+	                                                 GNUTLS_X509_FMT_PEM),
+	             "Unable to import PEM");
 
-	auto new_crt_list = [this]() -> gnutls_x509_crt_t * {
+	auto create_crt_list = [this]() -> gnutls_x509_crt_t * {
 		gnutls_x509_crt_t *crt_list = nullptr;
 		unsigned int crt_list_size = 0;
-		gnutls::check(gnutls_certificate_get_x509_crt(*mCredentials, 0, &crt_list, &crt_list_size));
+		check_gnutls(gnutls_certificate_get_x509_crt(*mCredentials, 0, &crt_list, &crt_list_size));
 		assert(crt_list_size == 1);
 		return crt_list;
 	};
 
-	auto free_crt_list = [](gnutls_x509_crt_t *crt_list) {
+	auto delete_crt_list = [](gnutls_x509_crt_t *crt_list) {
 		gnutls_x509_crt_deinit(crt_list[0]);
 		gnutls_free(crt_list);
 	};
 
-	std::unique_ptr<gnutls_x509_crt_t, decltype(free_crt_list)> crt_list(new_crt_list(),
-	                                                                     free_crt_list);
+	std::unique_ptr<gnutls_x509_crt_t, decltype(delete_crt_list)> crt_list(create_crt_list(),
+	                                                                       delete_crt_list);
 
 	mFingerprint = make_fingerprint(*crt_list);
 }
 
 Certificate::Certificate(gnutls_x509_crt_t crt, gnutls_x509_privkey_t privkey)
-    : mCredentials(gnutls::new_credentials(), gnutls::free_credentials),
-      mFingerprint(make_fingerprint(crt)) {
+    : mCredentials(create_credentials(), delete_credentials), mFingerprint(make_fingerprint(crt)) {
 
-	gnutls::check(gnutls_certificate_set_x509_key(*mCredentials, &crt, 1, privkey),
-	              "Unable to set certificate and key pair in credentials");
+	check_gnutls(gnutls_certificate_set_x509_key(*mCredentials, &crt, 1, privkey),
+	             "Unable to set certificate and key pair in credentials");
 }
 
 gnutls_certificate_credentials_t Certificate::credentials() const { return *mCredentials; }
@@ -79,8 +128,8 @@ string make_fingerprint(gnutls_x509_crt_t crt) {
 	const size_t size = 32;
 	unsigned char buffer[size];
 	size_t len = size;
-	gnutls::check(gnutls_x509_crt_get_fingerprint(crt, GNUTLS_DIG_SHA256, buffer, &len),
-	              "X509 fingerprint error");
+	check_gnutls(gnutls_x509_crt_get_fingerprint(crt, GNUTLS_DIG_SHA256, buffer, &len),
+	             "X509 fingerprint error");
 
 	std::ostringstream oss;
 	oss << std::hex << std::uppercase << std::setfill('0');
@@ -92,16 +141,21 @@ string make_fingerprint(gnutls_x509_crt_t crt) {
 	return oss.str();
 }
 
-namespace {
+shared_ptr<Certificate> make_certificate(const string &commonName) {
+	static std::unordered_map<string, shared_ptr<Certificate>> cache;
+	static std::mutex cacheMutex;
 
-certificate_ptr make_certificate_impl(string commonName) {
-	using namespace gnutls;
-	unique_ptr<gnutls_x509_crt_t, decltype(&free_crt)> crt(new_crt(), free_crt);
-	unique_ptr<gnutls_x509_privkey_t, decltype(&free_privkey)> privkey(new_privkey(), free_privkey);
+	std::lock_guard lock(cacheMutex);
+	if (auto it = cache.find(commonName); it != cache.end())
+		return it->second;
+
+	std::unique_ptr<gnutls_x509_crt_t, decltype(&delete_crt)> crt(create_crt(), delete_crt);
+	std::unique_ptr<gnutls_x509_privkey_t, decltype(&delete_privkey)> privkey(create_privkey(),
+	                                                                          delete_privkey);
 
 	const unsigned int bits = gnutls_sec_param_to_pk_bits(GNUTLS_PK_RSA, GNUTLS_SEC_PARAM_HIGH);
-	gnutls::check(gnutls_x509_privkey_generate(*privkey, GNUTLS_PK_RSA, bits, 0),
-	              "Unable to generate key pair");
+	check_gnutls(gnutls_x509_privkey_generate(*privkey, GNUTLS_PK_RSA, bits, 0),
+	             "Unable to generate key pair");
 
 	using namespace std::chrono;
 	auto now = time_point_cast<seconds>(system_clock::now());
@@ -117,34 +171,40 @@ certificate_ptr make_certificate_impl(string commonName) {
 	gnutls_rnd(GNUTLS_RND_NONCE, serial, serialSize);
 	gnutls_x509_crt_set_serial(*crt, serial, serialSize);
 
-	gnutls::check(gnutls_x509_crt_sign2(*crt, *crt, *privkey, GNUTLS_DIG_SHA256, 0),
-	              "Unable to auto-sign certificate");
+	check_gnutls(gnutls_x509_crt_sign2(*crt, *crt, *privkey, GNUTLS_DIG_SHA256, 0),
+	             "Unable to auto-sign certificate");
 
-	return std::make_shared<Certificate>(*crt, *privkey);
+	auto certificate = std::make_shared<Certificate>(*crt, *privkey);
+	cache.emplace(std::make_pair(commonName, certificate));
+	return certificate;
 }
 
-} // namespace
-
 } // namespace rtc
 
-#else // USE_GNUTLS==0
+#else
+
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
 
 namespace rtc {
 
 Certificate::Certificate(string crt_pem, string key_pem) {
-	BIO *bio = BIO_new(BIO_s_mem());
-	BIO_write(bio, crt_pem.data(), int(crt_pem.size()));
-	mX509 = shared_ptr<X509>(PEM_read_bio_X509(bio, nullptr, 0, 0), X509_free);
-	BIO_free(bio);
-	if (!mX509)
-		throw std::invalid_argument("Unable to import certificate PEM");
+    BIO *bio;
 
-	bio = BIO_new(BIO_s_mem());
-	BIO_write(bio, key_pem.data(), int(key_pem.size()));
+    bio = BIO_new(BIO_s_mem());
+    BIO_write(bio, crt_pem.data(), crt_pem.size());
+    mX509 = shared_ptr<X509>(PEM_read_bio_X509(bio, nullptr, 0, 0), X509_free);
+    BIO_free(bio);
+    if (!mX509)
+      throw std::invalid_argument("Unable to import certificate PEM");
+
+    bio = BIO_new(BIO_s_mem());
+    BIO_write(bio, key_pem.data(), key_pem.size());
 	mPKey = shared_ptr<EVP_PKEY>(PEM_read_bio_PrivateKey(bio, nullptr, 0, 0), EVP_PKEY_free);
-	BIO_free(bio);
-	if (!mPKey)
-		throw std::invalid_argument("Unable to import PEM key PEM");
+    BIO_free(bio);
+    if (!mPKey)
+      throw std::invalid_argument("Unable to import PEM key PEM");
 
 	mFingerprint = make_fingerprint(mX509.get());
 }
@@ -176,9 +236,15 @@ string make_fingerprint(X509 *x509) {
 	return oss.str();
 }
 
-namespace {
 
-certificate_ptr make_certificate_impl(string commonName) {
+shared_ptr<Certificate> make_certificate(const string &commonName) {
+	static std::unordered_map<string, shared_ptr<Certificate>> cache;
+	static std::mutex cacheMutex;
+
+	std::lock_guard lock(cacheMutex);
+	if (auto it = cache.find(commonName); it != cache.end())
+		return it->second;
+
 	shared_ptr<X509> x509(X509_new(), X509_free);
 	shared_ptr<EVP_PKEY> pkey(EVP_PKEY_new(), EVP_PKEY_free);
 
@@ -199,11 +265,10 @@ certificate_ptr make_certificate_impl(string commonName) {
 		throw std::runtime_error("Unable to generate key pair");
 
 	const size_t serialSize = 16;
-	auto *commonNameBytes =
-	    reinterpret_cast<unsigned char *>(const_cast<char *>(commonName.c_str()));
+	const auto *commonNameBytes = reinterpret_cast<const unsigned char *>(commonName.c_str());
 
-	if (!X509_gmtime_adj(X509_getm_notBefore(x509.get()), 3600 * -1) ||
-	    !X509_gmtime_adj(X509_getm_notAfter(x509.get()), 3600 * 24 * 365) ||
+	if (!X509_gmtime_adj(X509_get_notBefore(x509.get()), 3600 * -1) ||
+	    !X509_gmtime_adj(X509_get_notAfter(x509.get()), 3600 * 24 * 365) ||
 	    !X509_set_version(x509.get(), 1) || !X509_set_pubkey(x509.get(), pkey.get()) ||
 	    !BN_pseudo_rand(serial_number.get(), serialSize, 0, 0) ||
 	    !BN_to_ASN1_INTEGER(serial_number.get(), X509_get_serialNumber(x509.get())) ||
@@ -216,41 +281,12 @@ certificate_ptr make_certificate_impl(string commonName) {
 	if (!X509_sign(x509.get(), pkey.get(), EVP_sha256()))
 		throw std::runtime_error("Unable to auto-sign certificate");
 
-	return std::make_shared<Certificate>(x509, pkey);
+	auto certificate = std::make_shared<Certificate>(x509, pkey);
+	cache.emplace(std::make_pair(commonName, certificate));
+	return certificate;
 }
 
-} // namespace
-
 } // namespace rtc
 
 #endif
 
-// Common for GnuTLS and OpenSSL
-
-namespace rtc {
-
-namespace {
-
-static std::unordered_map<string, future_certificate_ptr> CertificateCache;
-static std::mutex CertificateCacheMutex;
-
-} // namespace
-
-future_certificate_ptr make_certificate(string commonName) {
-	std::lock_guard lock(CertificateCacheMutex);
-
-	if (auto it = CertificateCache.find(commonName); it != CertificateCache.end())
-		return it->second;
-
-	auto future = ThreadPool::Instance().enqueue(make_certificate_impl, commonName);
-	auto shared = future.share();
-	CertificateCache.emplace(std::move(commonName), shared);
-	return shared;
-}
-
-void CleanupCertificateCache() {
-	std::lock_guard lock(CertificateCacheMutex);
-	CertificateCache.clear();
-}
-
-} // namespace rtc

src/certificate.hpp

@@ -20,11 +20,15 @@
 #define RTC_CERTIFICATE_H
 
 #include "include.hpp"
-#include "tls.hpp"
 
-#include <future>
 #include <tuple>
 
+#if USE_GNUTLS
+#include <gnutls/x509.h>
+#else
+#include <openssl/x509.h>
+#endif
+
 namespace rtc {
 
 class Certificate {
@@ -58,12 +62,7 @@ string make_fingerprint(gnutls_x509_crt_t crt);
 string make_fingerprint(X509 *x509);
 #endif
 
-using certificate_ptr = std::shared_ptr<Certificate>;
-using future_certificate_ptr = std::shared_future<certificate_ptr>;
-
-future_certificate_ptr make_certificate(string commonName = "libdatachannel"); // cached
-
-void CleanupCertificateCache();
+std::shared_ptr<Certificate> make_certificate(const string &commonName);
 
 } // namespace rtc
 

src/channel.cpp

@@ -34,9 +34,11 @@ void Channel::onClosed(std::function<void()> callback) {
 	mClosedCallback = callback;
 }
 
-void Channel::onError(std::function<void(string error)> callback) { mErrorCallback = callback; }
+void Channel::onError(std::function<void(const string &error)> callback) {
+	mErrorCallback = callback;
+}
 
-void Channel::onMessage(std::function<void(message_variant data)> callback) {
+void Channel::onMessage(std::function<void(const std::variant<binary, string> &data)> callback) {
 	mMessageCallback = callback;
 
 	// Pass pending messages
@@ -44,10 +46,10 @@ void Channel::onMessage(std::function<void(message_variant data)> callback) {
 		mMessageCallback(*message);
 }
 
-void Channel::onMessage(std::function<void(binary data)> binaryCallback,
-                        std::function<void(string data)> stringCallback) {
-	onMessage([binaryCallback, stringCallback](std::variant<binary, string> data) {
-		std::visit(overloaded{binaryCallback, stringCallback}, std::move(data));
+void Channel::onMessage(std::function<void(const binary &data)> binaryCallback,
+                        std::function<void(const string &data)> stringCallback) {
+	onMessage([binaryCallback, stringCallback](const std::variant<binary, string> &data) {
+		std::visit(overloaded{binaryCallback, stringCallback}, data);
 	});
 }
 
@@ -65,7 +67,7 @@ void Channel::triggerOpen() { mOpenCallback(); }
 
 void Channel::triggerClosed() { mClosedCallback(); }
 
-void Channel::triggerError(string error) { mErrorCallback(error); }
+void Channel::triggerError(const string &error) { mErrorCallback(error); }
 
 void Channel::triggerAvailable(size_t count) {
 	if (count == 1)

src/datachannel.cpp

@@ -31,7 +31,6 @@ namespace rtc {
 
 using std::shared_ptr;
 using std::weak_ptr;
-using std::chrono::milliseconds;
 
 // Messages for the DataChannel establishment protocol
 // See https://tools.ietf.org/html/draft-ietf-rtcweb-data-protocol-09
@@ -44,12 +43,6 @@ enum MessageType : uint8_t {
 	MESSAGE_CLOSE = 0x04
 };
 
-enum ChannelType : uint8_t {
-	CHANNEL_RELIABLE = 0x00,
-	CHANNEL_PARTIAL_RELIABLE_REXMIT = 0x01,
-	CHANNEL_PARTIAL_RELIABLE_TIMED = 0x02
-};
-
 #pragma pack(push, 1)
 struct OpenMessage {
 	uint8_t type = MESSAGE_OPEN;
@@ -72,6 +65,8 @@ struct CloseMessage {
 };
 #pragma pack(pop)
 
+const size_t RECV_QUEUE_LIMIT = 1024 * 1024; // 1 MiB
+
 DataChannel::DataChannel(weak_ptr<PeerConnection> pc, unsigned int stream, string label,
                          string protocol, Reliability reliability)
     : mPeerConnection(pc), mStream(stream), mLabel(std::move(label)),
@@ -98,38 +93,52 @@ string DataChannel::protocol() const { return mProtocol; }
 Reliability DataChannel::reliability() const { return *mReliability; }
 
 void DataChannel::close() {
-	mIsClosed = true;
 	if (mIsOpen.exchange(false))
 		if (auto transport = mSctpTransport.lock())
-			transport->closeStream(mStream);
-
+			transport->reset(mStream);
+	mIsClosed = true;
 	mSctpTransport.reset();
+
 	resetCallbacks();
 }
 
 void DataChannel::remoteClose() {
+	mIsOpen = false;
 	if (!mIsClosed.exchange(true))
 		triggerClosed();
-
-	mIsOpen = false;
 	mSctpTransport.reset();
 }
 
-bool DataChannel::send(message_variant data) { return outgoing(make_message(std::move(data))); }
+bool DataChannel::send(const std::variant<binary, string> &data) {
+	return std::visit(
+	    [&](const auto &d) {
+		    using T = std::decay_t<decltype(d)>;
+		    constexpr auto type = std::is_same_v<T, string> ? Message::String : Message::Binary;
+		    auto *b = reinterpret_cast<const byte *>(d.data());
+		    return outgoing(std::make_shared<Message>(b, b + d.size(), type));
+	    },
+	    data);
+}
 
 bool DataChannel::send(const byte *data, size_t size) {
 	return outgoing(std::make_shared<Message>(data, data + size, Message::Binary));
 }
 
-std::optional<message_variant> DataChannel::receive() {
-	while (auto next = mRecvQueue.tryPop()) {
-		message_ptr message = std::move(*next);
-		if (message->type == Message::Control) {
+std::optional<std::variant<binary, string>> DataChannel::receive() {
+	while (!mRecvQueue.empty()) {
+		auto message = *mRecvQueue.pop();
+		switch (message->type) {
+		case Message::Control: {
 			auto raw = reinterpret_cast<const uint8_t *>(message->data());
-			if (!message->empty() && raw[0] == MESSAGE_CLOSE)
+			if (raw[0] == MESSAGE_CLOSE)
 				remoteClose();
-		} else {
-			return to_variant(std::move(*message));
+			break;
+		}
+		case Message::String:
+			return std::make_optional(
+			    string(reinterpret_cast<const char *>(message->data()), message->size()));
+		case Message::Binary:
+			return std::make_optional(std::move(*message));
 		}
 	}
 
@@ -141,14 +150,13 @@ bool DataChannel::isOpen(void) const { return mIsOpen; }
 bool DataChannel::isClosed(void) const { return mIsClosed; }
 
 size_t DataChannel::maxMessageSize() const {
-	size_t remoteMax = DEFAULT_MAX_MESSAGE_SIZE;
+	size_t max = DEFAULT_MAX_MESSAGE_SIZE;
 	if (auto pc = mPeerConnection.lock())
 		if (auto description = pc->remoteDescription())
-			if (auto *application = description->application())
-				if (auto maxMessageSize = application->maxMessageSize())
-					remoteMax = *maxMessageSize > 0 ? *maxMessageSize : LOCAL_MAX_MESSAGE_SIZE;
+			if (auto maxMessageSize = description->maxMessageSize())
+				return *maxMessageSize > 0 ? *maxMessageSize : LOCAL_MAX_MESSAGE_SIZE;
 
-	return std::min(remoteMax, LOCAL_MAX_MESSAGE_SIZE);
+	return std::min(max, LOCAL_MAX_MESSAGE_SIZE);
 }
 
 size_t DataChannel::availableAmount() const { return mRecvQueue.amount(); }
@@ -156,37 +164,26 @@ size_t DataChannel::availableAmount() const { return mRecvQueue.amount(); }
 void DataChannel::open(shared_ptr<SctpTransport> transport) {
 	mSctpTransport = transport;
 
-	uint8_t channelType;
-	uint32_t reliabilityParameter;
-	switch (mReliability->type) {
-	case Reliability::Type::Rexmit:
-		channelType = CHANNEL_PARTIAL_RELIABLE_REXMIT;
-		reliabilityParameter = uint32_t(std::get<int>(mReliability->rexmit));
-		break;
-
-	case Reliability::Type::Timed:
-		channelType = CHANNEL_PARTIAL_RELIABLE_TIMED;
-		reliabilityParameter = uint32_t(std::get<milliseconds>(mReliability->rexmit).count());
-		break;
-
-	default:
-		channelType = CHANNEL_RELIABLE;
-		reliabilityParameter = 0;
-		break;
-	}
-
+	uint8_t channelType = static_cast<uint8_t>(mReliability->type);
 	if (mReliability->unordered)
-		channelType |= 0x80;
+		channelType &= 0x80;
+
+	using std::chrono::milliseconds;
+	uint32_t reliabilityParameter = 0;
+	if (mReliability->type == Reliability::TYPE_PARTIAL_RELIABLE_REXMIT)
+		reliabilityParameter = uint32_t(std::get<int>(mReliability->rexmit));
+	else if (mReliability->type == Reliability::TYPE_PARTIAL_RELIABLE_TIMED)
+		reliabilityParameter = uint32_t(std::get<milliseconds>(mReliability->rexmit).count());
 
 	const size_t len = sizeof(OpenMessage) + mLabel.size() + mProtocol.size();
 	binary buffer(len, byte(0));
 	auto &open = *reinterpret_cast<OpenMessage *>(buffer.data());
 	open.type = MESSAGE_OPEN;
-	open.channelType = channelType;
+	open.channelType = mReliability->type;
 	open.priority = htons(0);
 	open.reliabilityParameter = htonl(reliabilityParameter);
-	open.labelLength = htons(uint16_t(mLabel.size()));
-	open.protocolLength = htons(uint16_t(mProtocol.size()));
+	open.labelLength = htons(mLabel.size());
+	open.protocolLength = htons(mProtocol.size());
 
 	auto end = reinterpret_cast<char *>(buffer.data() + sizeof(OpenMessage));
 	std::copy(mLabel.begin(), mLabel.end(), end);
@@ -195,7 +192,7 @@ void DataChannel::open(shared_ptr<SctpTransport> transport) {
 	transport->send(make_message(buffer.begin(), buffer.end(), Message::Control, mStream));
 }
 
-bool DataChannel::outgoing(message_ptr message) {
+bool DataChannel::outgoing(mutable_message_ptr message) {
 	if (mIsClosed)
 		throw std::runtime_error("DataChannel is closed");
 
@@ -204,7 +201,7 @@ bool DataChannel::outgoing(message_ptr message) {
 
 	auto transport = mSctpTransport.lock();
 	if (!transport)
-		throw std::runtime_error("DataChannel transport is not open");
+		throw std::runtime_error("DataChannel has no transport");
 
 	// Before the ACK has been received on a DataChannel, all messages must be sent ordered
 	message->reliability = mIsOpen ? mReliability : nullptr;
@@ -213,9 +210,6 @@ bool DataChannel::outgoing(message_ptr message) {
 }
 
 void DataChannel::incoming(message_ptr message) {
-	if (!message)
-		return;
-
 	switch (message->type) {
 	case Message::Control: {
 		auto raw = reinterpret_cast<const uint8_t *>(message->data());
@@ -271,18 +265,19 @@ void DataChannel::processOpenMessage(message_ptr message) {
 	mLabel.assign(end, open.labelLength);
 	mProtocol.assign(end + open.labelLength, open.protocolLength);
 
+	using std::chrono::milliseconds;
 	mReliability->unordered = (open.reliabilityParameter & 0x80) != 0;
 	switch (open.channelType & 0x7F) {
-	case CHANNEL_PARTIAL_RELIABLE_REXMIT:
-		mReliability->type = Reliability::Type::Rexmit;
+	case Reliability::TYPE_PARTIAL_RELIABLE_REXMIT:
+		mReliability->type = Reliability::TYPE_PARTIAL_RELIABLE_REXMIT;
 		mReliability->rexmit = int(open.reliabilityParameter);
 		break;
-	case CHANNEL_PARTIAL_RELIABLE_TIMED:
-		mReliability->type = Reliability::Type::Timed;
+	case Reliability::TYPE_PARTIAL_RELIABLE_TIMED:
+		mReliability->type = Reliability::TYPE_PARTIAL_RELIABLE_TIMED;
 		mReliability->rexmit = milliseconds(open.reliabilityParameter);
 		break;
 	default:
-		mReliability->type = Reliability::Type::Reliable;
+		mReliability->type = Reliability::TYPE_RELIABLE;
 		mReliability->rexmit = int(0);
 	}
 

src/description.cpp

@@ -1,6 +1,5 @@
 /**
- * Copyright (c) 2019-2020 Paul-Louis Ageneau
- * Copyright (c) 2020 Staz M
+ * Copyright (c) 2019 Paul-Louis Ageneau
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,22 +19,17 @@
 #include "description.hpp"
 
 #include <algorithm>
-#include <array>
 #include <cctype>
 #include <chrono>
-#include <iostream>
 #include <random>
 #include <sstream>
 
-using std::shared_ptr;
 using std::size_t;
 using std::string;
-using std::string_view;
-using std::chrono::system_clock;
 
 namespace {
 
-inline bool match_prefix(string_view str, string_view prefix) {
+inline bool hasprefix(const string &str, const string &prefix) {
 	return str.size() >= prefix.size() &&
 	       std::mismatch(prefix.begin(), prefix.end(), str.begin()).first == prefix.end();
 }
@@ -46,21 +40,6 @@ inline void trim_end(string &str) {
 	    str.end());
 }
 
-inline std::pair<string_view, string_view> parse_pair(string_view attr) {
-	string_view key, value;
-	if (size_t separator = attr.find(':'); separator != string::npos) {
-		key = attr.substr(0, separator);
-		value = attr.substr(separator + 1);
-	} else {
-		key = attr;
-	}
-	return std::make_pair(std::move(key), std::move(value));
-}
-
-template <typename T> T to_integer(string_view s) {
-	return std::is_signed<T>::value ? T(std::stol(string(s))) : T(std::stoul(string(s)));
-}
-
 } // namespace
 
 namespace rtc {
@@ -71,74 +50,46 @@ Description::Description(const string &sdp, const string &typeString)
 Description::Description(const string &sdp, Type type) : Description(sdp, type, Role::ActPass) {}
 
 Description::Description(const string &sdp, Type type, Role role)
-    : mType(Type::Unspec), mRole(role) {
+    : mType(Type::Unspec), mRole(role), mMid("0"), mIceUfrag(""), mIcePwd(""), mTrickle(true) {
 	hintType(type);
 
-	auto seed = static_cast<unsigned int>(system_clock::now().time_since_epoch().count());
+	auto seed = std::chrono::system_clock::now().time_since_epoch().count();
 	std::default_random_engine generator(seed);
 	std::uniform_int_distribution<uint32_t> uniform;
 	mSessionId = std::to_string(uniform(generator));
 
-	int index = -1;
-	std::shared_ptr<Entry> current;
 	std::istringstream ss(sdp);
-	while (ss) {
-		string line;
-		std::getline(ss, line);
+	string line;
+	while (std::getline(ss, line)) {
 		trim_end(line);
-		if (line.empty())
-			continue;
-
-		// Media description line (aka m-line)
-		if (match_prefix(line, "m=")) {
-			++index;
-			string mline = line.substr(2);
-			current = createEntry(std::move(mline), std::to_string(index), Direction::Unknown);
-
-			// Attribute line
-		} else if (match_prefix(line, "a=")) {
-			string attr = line.substr(2);
-			auto [key, value] = parse_pair(attr);
-
-			if (key == "setup") {
-				if (value == "active")
-					mRole = Role::Active;
-				else if (value == "passive")
-					mRole = Role::Passive;
-				else
-					mRole = Role::ActPass;
-
-			} else if (key == "fingerprint") {
-				if (match_prefix(value, "sha-256 ")) {
-					mFingerprint = value.substr(8);
-					std::transform(mFingerprint->begin(), mFingerprint->end(),
-					               mFingerprint->begin(),
-					               [](char c) { return char(std::toupper(c)); });
-				} else {
-					PLOG_WARNING << "Unknown SDP fingerprint type: " << value;
-				}
-			} else if (key == "ice-ufrag") {
-				mIceUfrag = value;
-			} else if (key == "ice-pwd") {
-				mIcePwd = value;
-			} else if (key == "candidate") {
-				addCandidate(Candidate(attr, bundleMid()));
-			} else if (key == "end-of-candidates") {
-				mEnded = true;
-			} else if (current) {
-				current->parseSdpLine(std::move(line));
-			}
-
-		} else if (current) {
-			current->parseSdpLine(std::move(line));
+		if (hasprefix(line, "a=setup:")) {
+			const string setup = line.substr(line.find(':') + 1);
+			if (setup == "active")
+				mRole = Role::Active;
+			else if (setup == "passive")
+				mRole = Role::Passive;
+			else
+				mRole = Role::ActPass;
+		} else if (hasprefix(line, "a=mid:")) {
+			mMid = line.substr(line.find(':') + 1);
+		} else if (hasprefix(line, "a=fingerprint:sha-256")) {
+			mFingerprint = line.substr(line.find(' ') + 1);
+			std::transform(mFingerprint->begin(), mFingerprint->end(), mFingerprint->begin(),
+						   [](char c) { return std::toupper(c); });
+		} else if (hasprefix(line, "a=ice-ufrag")) {
+			mIceUfrag = line.substr(line.find(':') + 1);
+		} else if (hasprefix(line, "a=ice-pwd")) {
+			mIcePwd = line.substr(line.find(':') + 1);
+		} else if (hasprefix(line, "a=sctp-port")) {
+			mSctpPort = uint16_t(std::stoul(line.substr(line.find(':') + 1)));
+		} else if (hasprefix(line, "a=max-message-size")) {
+			mMaxMessageSize = size_t(std::stoul(line.substr(line.find(':') + 1)));
+		} else if (hasprefix(line, "a=candidate")) {
+			addCandidate(Candidate(line.substr(2), mMid));
+		} else if (hasprefix(line, "a=end-of-candidates")) {
+			mTrickle = false;
 		}
 	}
-
-	if (mIceUfrag.empty())
-		throw std::invalid_argument("Missing ice-ufrag parameter in SDP description");
-
-	if (mIcePwd.empty())
-		throw std::invalid_argument("Missing ice-pwd parameter in SDP description");
 }
 
 Description::Type Description::type() const { return mType; }
@@ -149,18 +100,15 @@ Description::Role Description::role() const { return mRole; }
 
 string Description::roleString() const { return roleToString(mRole); }
 
-string Description::bundleMid() const {
-	// Get the mid of the first media
-	return !mEntries.empty() ? mEntries[0]->mid() : "0";
-}
-
-string Description::iceUfrag() const { return mIceUfrag; }
-
-string Description::icePwd() const { return mIcePwd; }
+string Description::mid() const { return mMid; }
 
 std::optional<string> Description::fingerprint() const { return mFingerprint; }
 
-bool Description::ended() const { return mEnded; }
+std::optional<uint16_t> Description::sctpPort() const { return mSctpPort; }
+
+std::optional<size_t> Description::maxMessageSize() const { return mMaxMessageSize; }
+
+bool Description::trickleEnabled() const { return mTrickle; }
 
 void Description::hintType(Type type) {
 	if (mType == Type::Unspec) {
@@ -174,564 +122,60 @@ void Description::setFingerprint(string fingerprint) {
 	mFingerprint.emplace(std::move(fingerprint));
 }
 
+void Description::setSctpPort(uint16_t port) { mSctpPort.emplace(port); }
+
+void Description::setMaxMessageSize(size_t size) { mMaxMessageSize.emplace(size); }
+
 void Description::addCandidate(Candidate candidate) {
 	mCandidates.emplace_back(std::move(candidate));
 }
 
-void Description::endCandidates() { mEnded = true; }
+void Description::endCandidates() { mTrickle = false; }
 
 std::vector<Candidate> Description::extractCandidates() {
 	std::vector<Candidate> result;
 	std::swap(mCandidates, result);
-	mEnded = false;
+	mTrickle = true;
 	return result;
 }
 
 Description::operator string() const { return generateSdp("\r\n"); }
 
-string Description::generateSdp(string_view eol) const {
-	std::ostringstream sdp;
+string Description::generateSdp(const string &eol) const {
+	if (!mFingerprint)
+		throw std::logic_error("Fingerprint must be set to generate an SDP string");
 
-	// Header
+	std::ostringstream sdp;
 	sdp << "v=0" << eol;
 	sdp << "o=- " << mSessionId << " 0 IN IP4 127.0.0.1" << eol;
 	sdp << "s=-" << eol;
 	sdp << "t=0 0" << eol;
-
-	// Bundle
-	// see Negotiating Media Multiplexing Using the Session Description Protocol
-	// https://tools.ietf.org/html/draft-ietf-mmusic-sdp-bundle-negotiation-54
-	sdp << "a=group:BUNDLE";
-	for (const auto &entry : mEntries)
-		sdp << ' ' << entry->mid();
-	sdp << eol;
-
-	// Lip-sync
-	std::ostringstream lsGroup;
-	for (const auto &entry : mEntries)
-		if (entry != mApplication)
-			lsGroup << ' ' << entry->mid();
-
-	if (!lsGroup.str().empty())
-		sdp << "a=group:LS" << lsGroup.str() << eol;
-
-	// Session-level attributes
-	sdp << "a=msid-semantic:WMS *" << eol;
-	sdp << "a=setup:" << roleToString(mRole) << eol;
+	sdp << "a=group:BUNDLE 0" << eol;
+	sdp << "m=application 9 UDP/DTLS/SCTP webrtc-datachannel" << eol;
+	sdp << "c=IN IP4 0.0.0.0" << eol;
 	sdp << "a=ice-ufrag:" << mIceUfrag << eol;
 	sdp << "a=ice-pwd:" << mIcePwd << eol;
-
-	if (!mEnded)
+	if (mTrickle)
 		sdp << "a=ice-options:trickle" << eol;
-
+	sdp << "a=mid:" << mMid << eol;
+	sdp << "a=setup:" << roleToString(mRole) << eol;
+	sdp << "a=dtls-id:1" << eol;
 	if (mFingerprint)
 		sdp << "a=fingerprint:sha-256 " << *mFingerprint << eol;
-
-	// Entries
-	bool first = true;
-	for (const auto &entry : mEntries) {
-		sdp << entry->generateSdp(eol);
-
-		if (std::exchange(first, false)) {
-			// Candidates
-			for (const auto &candidate : mCandidates)
-				sdp << string(candidate) << eol;
-
-			if (mEnded)
-				sdp << "a=end-of-candidates" << eol;
-		}
+	if (mSctpPort)
+		sdp << "a=sctp-port:" << *mSctpPort << eol;
+	if (mMaxMessageSize)
+		sdp << "a=max-message-size:" << *mMaxMessageSize << eol;
+	for (const auto &candidate : mCandidates) {
+		sdp << string(candidate) << eol;
 	}
 
-	return sdp.str();
-}
-
-string Description::generateApplicationSdp(string_view eol) const {
-	std::ostringstream sdp;
-
-	// Header
-	sdp << "v=0" << eol;
-	sdp << "o=- " << mSessionId << " 0 IN IP4 127.0.0.1" << eol;
-	sdp << "s=-" << eol;
-	sdp << "t=0 0" << eol;
-
-	// Application
-	auto app = mApplication ? mApplication : std::make_shared<Application>();
-	sdp << app->generateSdp(eol);
-
-	// Session-level attributes
-	sdp << "a=msid-semantic:WMS *" << eol;
-	sdp << "a=setup:" << roleToString(mRole) << eol;
-	sdp << "a=ice-ufrag:" << mIceUfrag << eol;
-	sdp << "a=ice-pwd:" << mIcePwd << eol;
-
-	if (!mEnded)
-		sdp << "a=ice-options:trickle" << eol;
-
-	if (mFingerprint)
-		sdp << "a=fingerprint:sha-256 " << *mFingerprint << eol;
-
-	// Candidates
-	for (const auto &candidate : mCandidates)
-		sdp << string(candidate) << eol;
-
-	if (mEnded)
+	if (!mTrickle)
 		sdp << "a=end-of-candidates" << eol;
 
 	return sdp.str();
 }
 
-shared_ptr<Description::Entry> Description::createEntry(string mline, string mid, Direction dir) {
-	string type = mline.substr(0, mline.find(' '));
-	if (type == "application") {
-		removeApplication();
-		mApplication = std::make_shared<Application>(std::move(mid));
-		mEntries.emplace_back(mApplication);
-		return mApplication;
-	} else {
-		auto media = std::make_shared<Media>(std::move(mline), std::move(mid), dir);
-		mEntries.emplace_back(media);
-		return media;
-	}
-}
-
-void Description::removeApplication() {
-	if (!mApplication)
-		return;
-
-	auto it = std::find(mEntries.begin(), mEntries.end(), mApplication);
-	if (it != mEntries.end())
-		mEntries.erase(it);
-
-	mApplication.reset();
-}
-
-bool Description::hasApplication() const { return mApplication != nullptr; }
-
-bool Description::hasAudioOrVideo() const {
-	for (auto entry : mEntries)
-		if (entry != mApplication)
-			return true;
-
-	return false;
-}
-
-int Description::addMedia(Media media) {
-	mEntries.emplace_back(std::make_shared<Media>(std::move(media)));
-	return int(mEntries.size()) - 1;
-}
-
-int Description::addMedia(Application application) {
-	removeApplication();
-	mApplication = std::make_shared<Application>(std::move(application));
-	mEntries.emplace_back(mApplication);
-	return int(mEntries.size()) - 1;
-}
-
-int Description::addApplication(string mid) { return addMedia(Application(std::move(mid))); }
-
-Description::Application *Description::application() { return mApplication.get(); }
-
-int Description::addVideo(string mid, Direction dir) {
-	return addMedia(Video(std::move(mid), dir));
-}
-
-int Description::addAudio(string mid, Direction dir) {
-	return addMedia(Audio(std::move(mid), dir));
-}
-
-std::variant<Description::Media *, Description::Application *> Description::media(int index) {
-	if (index < 0 || index >= int(mEntries.size()))
-		throw std::out_of_range("Media index out of range");
-
-	const auto &entry = mEntries[index];
-	if (entry == mApplication) {
-		auto result = dynamic_cast<Application *>(entry.get());
-		if (!result)
-			throw std::logic_error("Bad type of application in description");
-		return result;
-	} else {
-		auto result = dynamic_cast<Media *>(entry.get());
-		if (!result)
-			throw std::logic_error("Bad type of media in description");
-		return result;
-	}
-}
-
-std::variant<const Description::Media *, const Description::Application *>
-Description::media(int index) const {
-	if (index < 0 || index >= int(mEntries.size()))
-		throw std::out_of_range("Media index out of range");
-
-	const auto &entry = mEntries[index];
-	if (entry == mApplication) {
-		auto result = dynamic_cast<Application *>(entry.get());
-		if (!result)
-			throw std::logic_error("Bad type of application in description");
-		return result;
-	} else {
-		auto result = dynamic_cast<Media *>(entry.get());
-		if (!result)
-			throw std::logic_error("Bad type of media in description");
-		return result;
-	}
-}
-
-int Description::mediaCount() const { return int(mEntries.size()); }
-
-Description::Entry::Entry(const string &mline, string mid, Direction dir)
-    : mMid(std::move(mid)), mDirection(dir) {
-
-	unsigned int port;
-	std::istringstream ss(mline);
-	ss >> mType;
-	ss >> port; // ignored
-	ss >> mDescription;
-}
-
-void Description::Entry::setDirection(Direction dir) { mDirection = dir; }
-
-Description::Entry::operator string() const { return generateSdp("\r\n"); }
-
-string Description::Entry::generateSdp(string_view eol) const {
-	std::ostringstream sdp;
-	// Port 9 is the discard protocol
-	sdp << "m=" << type() << ' ' << 9 << ' ' << description() << eol;
-	sdp << "c=IN IP4 0.0.0.0" << eol;
-	sdp << generateSdpLines(eol);
-
-	return sdp.str();
-}
-
-string Description::Entry::generateSdpLines(string_view eol) const {
-	std::ostringstream sdp;
-	sdp << "a=bundle-only" << eol;
-	sdp << "a=mid:" << mMid << eol;
-
-	switch (mDirection) {
-	case Direction::SendOnly:
-		sdp << "a=sendonly" << eol;
-		break;
-	case Direction::RecvOnly:
-		sdp << "a=recvonly" << eol;
-		break;
-	case Direction::SendRecv:
-		sdp << "a=sendrecv" << eol;
-		break;
-	case Direction::Inactive:
-		sdp << "a=inactive" << eol;
-		break;
-	default:
-		// Ignore
-		break;
-	}
-
-	for (const auto &attr : mAttributes)
-		sdp << "a=" << attr << eol;
-
-	return sdp.str();
-}
-
-void Description::Entry::parseSdpLine(string_view line) {
-	if (match_prefix(line, "a=")) {
-		string_view attr = line.substr(2);
-		auto [key, value] = parse_pair(attr);
-
-		if (key == "mid")
-			mMid = value;
-		else if (attr == "sendonly")
-			mDirection = Direction::SendOnly;
-		else if (attr == "recvonly")
-			mDirection = Direction::RecvOnly;
-		else if (key == "sendrecv")
-			mDirection = Direction::SendRecv;
-		else if (key == "inactive")
-			mDirection = Direction::Inactive;
-		else if (key == "bundle-only") {
-			// always added
-		} else
-			mAttributes.emplace_back(line.substr(2));
-	}
-}
-
-Description::Application::Application(string mid)
-    : Entry("application 9 UDP/DTLS/SCTP", std::move(mid), Direction::SendRecv) {}
-
-string Description::Application::description() const {
-	return Entry::description() + " webrtc-datachannel";
-}
-
-Description::Application Description::Application::reciprocate() const {
-	Application reciprocated(*this);
-
-	reciprocated.mMaxMessageSize.reset();
-
-	return reciprocated;
-}
-
-string Description::Application::generateSdpLines(string_view eol) const {
-	std::ostringstream sdp;
-	sdp << Entry::generateSdpLines(eol);
-
-	if (mSctpPort)
-		sdp << "a=sctp-port:" << *mSctpPort << eol;
-
-	if (mMaxMessageSize)
-		sdp << "a=max-message-size:" << *mMaxMessageSize << eol;
-
-	return sdp.str();
-}
-
-void Description::Application::parseSdpLine(string_view line) {
-	if (match_prefix(line, "a=")) {
-		string_view attr = line.substr(2);
-		auto [key, value] = parse_pair(attr);
-
-		if (key == "sctp-port") {
-			mSctpPort = to_integer<uint16_t>(value);
-		} else if (key == "max-message-size") {
-			mMaxMessageSize = to_integer<size_t>(value);
-		} else {
-			Entry::parseSdpLine(line);
-		}
-	} else {
-		Entry::parseSdpLine(line);
-	}
-}
-
-Description::Media::Media(const string &sdp) : Entry(sdp, "", Direction::Unknown) {
-	std::istringstream ss(sdp);
-	while (ss) {
-		string line;
-		std::getline(ss, line);
-		trim_end(line);
-		if (line.empty())
-			continue;
-
-		parseSdpLine(line);
-	}
-
-	if (mid().empty())
-		throw std::invalid_argument("Missing mid in media SDP");
-}
-
-Description::Media::Media(const string &mline, string mid, Direction dir)
-    : Entry(mline, std::move(mid), dir) {
-}
-
-string Description::Media::description() const {
-	std::ostringstream desc;
-	desc << Entry::description();
-	for (auto it = mRtpMap.begin(); it != mRtpMap.end(); ++it)
-		desc << ' ' << it->first;
-
-	return desc.str();
-}
-
-Description::Media Description::Media::reciprocate() const {
-	Media reciprocated(*this);
-
-	// Invert direction
-	switch (direction()) {
-	case Direction::RecvOnly:
-		reciprocated.setDirection(Direction::SendOnly);
-		break;
-	case Direction::SendOnly:
-		reciprocated.setDirection(Direction::RecvOnly);
-		break;
-	default:
-		// We are good
-		break;
-	}
-
-	return reciprocated;
-}
-
-Description::Media::RTPMap &Description::Media::getFormat(int fmt) {
-	auto it = mRtpMap.find(fmt);
-	if (it != mRtpMap.end())
-		return it->second;
-
-	throw std::invalid_argument("m-line index is out of bounds");
-}
-
-Description::Media::RTPMap &Description::Media::getFormat(const string &fmt) {
-	for (auto it = mRtpMap.begin(); it != mRtpMap.end(); ++it)
-		if (it->second.format == fmt)
-			return it->second;
-
-	throw std::invalid_argument("format was not found");
-}
-
-void Description::Media::removeFormat(const string &fmt) {
-	auto it = mRtpMap.begin();
-	std::vector<int> remed;
-
-	// Remove the actual formats
-	while (it != mRtpMap.end()) {
-		if (it->second.format == fmt) {
-			remed.emplace_back(it->first);
-			it = mRtpMap.erase(it);
-		} else {
-			it++;
-		}
-	}
-
-	// Remove any other rtpmaps that depend on the formats we just removed
-	it = mRtpMap.begin();
-	while (it != mRtpMap.end()) {
-		auto it2 = it->second.fmtps.begin();
-		bool rem = false;
-		while (it2 != it->second.fmtps.end()) {
-			if (it2->find("apt=") == 0) {
-				for (auto remid : remed) {
-					if (it2->find(std::to_string(remid)) != string::npos) {
-						std::cout << *it2 << ' ' << remid << std::endl;
-						it = mRtpMap.erase(it);
-						rem = true;
-						break;
-					}
-				}
-				break;
-			}
-			it2++;
-		}
-		if (!rem)
-			it++;
-	}
-}
-
-void Description::Media::addVideoCodec(int payloadType, const string &codec) {
-	RTPMap map(std::to_string(payloadType) + ' ' + codec + "/90000");
-	map.addFB("nack");
-	map.addFB("goog-remb");
-	if (codec == "H264") {
-		// Use Constrained Baseline profile Level 4.2 (necessary for Firefox)
-		// https://developer.mozilla.org/en-US/docs/Web/Media/Formats/WebRTC_codecs#Supported_video_codecs
-		// TODO: Should be 42E0 but 42C0 appears to be more compatible. Investigate this.
-		map.fmtps.emplace_back("profile-level-id=42E02A;level-asymmetry-allowed=1");
-	}
-	mRtpMap.emplace(map.pt, map);
-}
-
-void Description::Media::addH264Codec(int pt) { addVideoCodec(pt, "H264"); }
-
-void Description::Media::addVP8Codec(int payloadType) { addVideoCodec(payloadType, "VP8"); }
-
-void Description::Media::addVP9Codec(int payloadType) { addVideoCodec(payloadType, "VP9"); }
-
-void Description::Media::setBitrate(int bitrate) { mBas = bitrate; }
-
-int Description::Media::getBitrate() const { return mBas; }
-
-bool Description::Media::hasPayloadType(int payloadType) const {
-	return mRtpMap.find(payloadType) != mRtpMap.end();
-}
-
-string Description::Media::generateSdpLines(string_view eol) const {
-	std::ostringstream sdp;
-	if (mBas >= 0)
-		sdp << "b=AS:" << mBas << eol;
-
-	sdp << Entry::generateSdpLines(eol);
-	sdp << "a=rtcp-mux" << eol;
-
-	for (auto it = mRtpMap.begin(); it != mRtpMap.end(); ++it) {
-		auto &map = it->second;
-
-		// Create the a=rtpmap
-		sdp << "a=rtpmap:" << map.pt << ' ' << map.format << '/' << map.clockRate;
-		if (!map.encParams.empty())
-			sdp << '/' << map.encParams;
-		sdp << eol;
-
-		for (const auto &val : map.rtcpFbs)
-			sdp << "a=rtcp-fb:" << map.pt << ' ' << val << eol;
-		for (const auto &val : map.fmtps)
-			sdp << "a=fmtp:" << map.pt << ' ' << val << eol;
-	}
-
-	return sdp.str();
-}
-
-void Description::Media::parseSdpLine(string_view line) {
-	if (match_prefix(line, "a=")) {
-		string_view attr = line.substr(2);
-		auto [key, value] = parse_pair(attr);
-
-		if (key == "rtpmap") {
-			Description::Media::RTPMap map(value);
-			int pt = map.pt;
-			mRtpMap.emplace(pt, std::move(map));
-		} else if (key == "rtcp-fb") {
-			size_t p = value.find(' ');
-			int pt = to_integer<int>(value.substr(0, p));
-			auto it = mRtpMap.find(pt);
-			if (it == mRtpMap.end()) {
-				PLOG_WARNING << "rtcp-fb applied before the corresponding rtpmap, ignoring";
-			} else {
-				it->second.rtcpFbs.emplace_back(value.substr(p + 1));
-			}
-		} else if (key == "fmtp") {
-			size_t p = value.find(' ');
-			int pt = to_integer<int>(value.substr(0, p));
-			auto it = mRtpMap.find(pt);
-			if (it == mRtpMap.end()) {
-				PLOG_WARNING << "fmtp applied before the corresponding rtpmap, ignoring";
-			} else {
-				it->second.fmtps.emplace_back(value.substr(p + 1));
-			}
-		} else if (key == "rtcp-mux") {
-			// always added
-		} else {
-			Entry::parseSdpLine(line);
-		}
-	} else if (match_prefix(line, "b=AS")) {
-		mBas = to_integer<int>(line.substr(line.find(':') + 1));
-	} else {
-		Entry::parseSdpLine(line);
-	}
-}
-
-Description::Media::RTPMap::RTPMap(string_view mline) {
-	size_t p = mline.find(' ');
-
-	this->pt = to_integer<int>(mline.substr(0, p));
-
-	string_view line = mline.substr(p + 1);
-	size_t spl = line.find('/');
-	this->format = line.substr(0, spl);
-
-	line = line.substr(spl + 1);
-	spl = line.find('/');
-	if (spl == string::npos) {
-		spl = line.find(' ');
-	}
-	if (spl == string::npos)
-		this->clockRate = to_integer<int>(line);
-	else {
-		this->clockRate = to_integer<int>(line.substr(0, spl));
-		this->encParams = line.substr(spl);
-	}
-}
-
-void Description::Media::RTPMap::removeFB(const string &str) {
-	auto it = rtcpFbs.begin();
-	while (it != rtcpFbs.end()) {
-		if (it->find(str) != std::string::npos) {
-			it = rtcpFbs.erase(it);
-		} else
-			it++;
-	}
-}
-
-void Description::Media::RTPMap::addFB(const string &str) { rtcpFbs.emplace_back(str); }
-
-Description::Audio::Audio(string mid, Direction dir)
-    : Media("audio 9 UDP/TLS/RTP/SAVPF", std::move(mid), dir) {}
-
-Description::Video::Video(string mid, Direction dir)
-    : Media("video 9 UDP/TLS/RTP/SAVPF", std::move(mid), dir) {}
-
 Description::Type Description::stringToType(const string &typeString) {
 	if (typeString == "offer")
 		return Type::Offer;
@@ -768,3 +212,4 @@ string Description::roleToString(Role role) {
 std::ostream &operator<<(std::ostream &out, const rtc::Description &description) {
 	return out << std::string(description);
 }
+

src/dtlssrtptransport.cpp

@@ -1,297 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "dtlssrtptransport.hpp"
-#include "tls.hpp"
-
-#if RTC_ENABLE_MEDIA
-
-#include <cstring>
-#include <exception>
-
-using std::shared_ptr;
-using std::to_integer;
-using std::to_string;
-
-namespace rtc {
-
-void DtlsSrtpTransport::Init() { srtp_init(); }
-
-void DtlsSrtpTransport::Cleanup() { srtp_shutdown(); }
-
-DtlsSrtpTransport::DtlsSrtpTransport(std::shared_ptr<IceTransport> lower,
-                                     shared_ptr<Certificate> certificate,
-                                     verifier_callback verifierCallback,
-                                     message_callback srtpRecvCallback,
-                                     state_callback stateChangeCallback)
-    : DtlsTransport(lower, certificate, std::move(verifierCallback),
-                    std::move(stateChangeCallback)),
-      mSrtpRecvCallback(std::move(srtpRecvCallback)) { // distinct from Transport recv callback
-
-	PLOG_DEBUG << "Initializing DTLS-SRTP transport";
-
-#if USE_GNUTLS
-	PLOG_DEBUG << "Setting SRTP profile (GnuTLS)";
-	gnutls::check(gnutls_srtp_set_profile(mSession, GNUTLS_SRTP_AES128_CM_HMAC_SHA1_80),
-	              "Failed to set SRTP profile");
-#else
-	PLOG_DEBUG << "Setting SRTP profile (OpenSSL)";
-	// returns 0 on success, 1 on error
-	if (SSL_set_tlsext_use_srtp(mSsl, "SRTP_AES128_CM_SHA1_80"))
-		throw std::runtime_error("Failed to set SRTP profile: " +
-		                         openssl::error_string(ERR_get_error()));
-#endif
-
-	if (srtp_err_status_t err = srtp_create(&mSrtpIn, nullptr)) {
-		throw std::runtime_error("SRTP create failed, status=" + to_string(static_cast<int>(err)));
-	}
-	if (srtp_err_status_t err = srtp_create(&mSrtpOut, nullptr)) {
-		srtp_dealloc(mSrtpIn);
-		throw std::runtime_error("SRTP create failed, status=" + to_string(static_cast<int>(err)));
-	}
-}
-
-DtlsSrtpTransport::~DtlsSrtpTransport() {
-	stop(); // stop before deallocating
-
-	srtp_dealloc(mSrtpIn);
-	srtp_dealloc(mSrtpOut);
-}
-
-bool DtlsSrtpTransport::sendMedia(message_ptr message) {
-	if (!message)
-		return false;
-
-	if (!mInitDone) {
-		PLOG_WARNING << "SRTP media sent before keys are derived";
-		return false;
-	}
-
-	int size = message->size();
-	PLOG_VERBOSE << "Send size=" << size;
-
-	// The RTP header has a minimum size of 12 bytes
-	// An RTCP packet can have a minimum size of 8 bytes
-	if (size < 8)
-		throw std::runtime_error("RTP/RTCP packet too short");
-
-	// srtp_protect() and srtp_protect_rtcp() assume that they can write SRTP_MAX_TRAILER_LEN (for
-	// the authentication tag) into the location in memory immediately following the RTP packet.
-	message->resize(size + SRTP_MAX_TRAILER_LEN);
-
-	uint8_t value2 = to_integer<uint8_t>(*(message->begin() + 1)) & 0x7F;
-	PLOG_VERBOSE << "Demultiplexing SRTCP and SRTP with RTP payload type, value="
-	             << unsigned(value2);
-
-	// RFC 5761 Multiplexing RTP and RTCP 4. Distinguishable RTP and RTCP Packets
-	// https://tools.ietf.org/html/rfc5761#section-4
-	// It is RECOMMENDED to follow the guidelines in the RTP/AVP profile for the choice of RTP
-	// payload type values, with the additional restriction that payload type values in the
-	// range 64-95 MUST NOT be used. Specifically, dynamic RTP payload types SHOULD be chosen in
-	// the range 96-127 where possible. Values below 64 MAY be used if that is insufficient
-	// [...]
-	if (value2 >= 64 && value2 <= 95) { // Range 64-95 (inclusive) MUST be RTCP
-		if (srtp_err_status_t err = srtp_protect_rtcp(mSrtpOut, message->data(), &size)) {
-			if (err == srtp_err_status_replay_fail)
-				throw std::runtime_error("SRTCP packet is a replay");
-			else
-				throw std::runtime_error("SRTCP protect error, status=" +
-				                         to_string(static_cast<int>(err)));
-		}
-		PLOG_VERBOSE << "Protected SRTCP packet, size=" << size;
-	} else {
-		if (srtp_err_status_t err = srtp_protect(mSrtpOut, message->data(), &size)) {
-			if (err == srtp_err_status_replay_fail)
-				throw std::runtime_error("SRTP packet is a replay");
-			else
-				throw std::runtime_error("SRTP protect error, status=" +
-				                         to_string(static_cast<int>(err)));
-		}
-		PLOG_VERBOSE << "Protected SRTP packet, size=" << size;
-	}
-
-	message->resize(size);
-	return outgoing(message);
-//	return DtlsTransport::send(message);
-}
-
-void DtlsSrtpTransport::incoming(message_ptr message) {
-	if (!mInitDone) {
-		// Bypas
-		DtlsTransport::incoming(message);
-		return;
-	}
-
-	int size = message->size();
-	if (size == 0)
-		return;
-
-	// RFC 5764 5.1.2. Reception
-	// https://tools.ietf.org/html/rfc5764#section-5.1.2
-	// The process for demultiplexing a packet is as follows. The receiver looks at the first byte
-	// of the packet. [...] If the value is in between 128 and 191 (inclusive), then the packet is
-	// RTP (or RTCP [...]). If the value is between 20 and 63 (inclusive), the packet is DTLS.
-	uint8_t value1 = to_integer<uint8_t>(*message->begin());
-	PLOG_VERBOSE << "Demultiplexing DTLS and SRTP/SRTCP with first byte, value="
-	             << unsigned(value1);
-
-	if (value1 >= 20 && value1 <= 63) {
-		PLOG_VERBOSE << "Incoming DTLS packet, size=" << size;
-		DtlsTransport::incoming(message);
-
-	} else if (value1 >= 128 && value1 <= 191) {
-		// The RTP header has a minimum size of 12 bytes
-		// An RTCP packet can have a minimum size of 8 bytes
-		if (size < 8) {
-			PLOG_WARNING << "Incoming SRTP/SRTCP packet too short, size=" << size;
-			return;
-		}
-
-		uint8_t value2 = to_integer<uint8_t>(*(message->begin() + 1)) & 0x7F;
-		PLOG_VERBOSE << "Demultiplexing SRTCP and SRTP with RTP payload type, value="
-		             << unsigned(value2);
-
-		// See RFC 5761 reference above
-		if (value2 >= 64 && value2 <= 95) { // Range 64-95 (inclusive) MUST be RTCP
-			PLOG_VERBOSE << "Incoming SRTCP packet, size=" << size;
-			if (srtp_err_status_t err = srtp_unprotect_rtcp(mSrtpIn, message->data(), &size)) {
-				if (err == srtp_err_status_replay_fail)
-					PLOG_WARNING << "Incoming SRTCP packet is a replay";
-				else if (err == srtp_err_status_auth_fail)
-					PLOG_WARNING << "Incoming SRTCP packet failed authentication check";
-				else
-					PLOG_WARNING << "SRTCP unprotect error, status=" << err;
-				return;
-			}
-			PLOG_VERBOSE << "Unprotected SRTCP packet, size=" << size;
-			message->type = Message::Type::Control;
-			message->stream = to_integer<uint8_t>(*(message->begin() + 1)); // Payload Type
-		} else {
-			PLOG_VERBOSE << "Incoming SRTP packet, size=" << size;
-			if (srtp_err_status_t err = srtp_unprotect(mSrtpIn, message->data(), &size)) {
-				if (err == srtp_err_status_replay_fail)
-					PLOG_WARNING << "Incoming SRTP packet is a replay";
-				else if (err == srtp_err_status_auth_fail)
-					PLOG_WARNING << "Incoming SRTP packet failed authentication check";
-				else
-					PLOG_WARNING << "SRTP unprotect error, status=" << err;
-				return;
-			}
-			PLOG_VERBOSE << "Unprotected SRTP packet, size=" << size;
-			message->type = Message::Type::Binary;
-			message->stream = value2; // Payload Type
-		}
-
-		message->resize(size);
-		mSrtpRecvCallback(message);
-
-	} else {
-		PLOG_WARNING << "Unknown packet type, value=" << unsigned(value1) << ", size=" << size;
-	}
-}
-
-void DtlsSrtpTransport::postHandshake() {
-	if (mInitDone)
-		return;
-
-	const size_t materialLen = SRTP_AES_ICM_128_KEY_LEN_WSALT * 2;
-	unsigned char material[materialLen];
-	const unsigned char *clientKey, *clientSalt, *serverKey, *serverSalt;
-
-#if USE_GNUTLS
-	PLOG_INFO << "Deriving SRTP keying material (GnuTLS)";
-
-	gnutls_datum_t clientKeyDatum, clientSaltDatum, serverKeyDatum, serverSaltDatum;
-	gnutls::check(gnutls_srtp_get_keys(mSession, material, materialLen, &clientKeyDatum,
-	                                   &clientSaltDatum, &serverKeyDatum, &serverSaltDatum),
-	              "Failed to derive SRTP keys");
-
-	if (clientKeyDatum.size != SRTP_AES_128_KEY_LEN)
-		throw std::logic_error("Unexpected SRTP master key length: " +
-		                       to_string(clientKeyDatum.size));
-	if (clientSaltDatum.size != SRTP_SALT_LEN)
-		throw std::logic_error("Unexpected SRTP salt length: " + to_string(clientSaltDatum.size));
-	if (serverKeyDatum.size != SRTP_AES_128_KEY_LEN)
-		throw std::logic_error("Unexpected SRTP master key length: " +
-		                       to_string(serverKeyDatum.size));
-	if (serverSaltDatum.size != SRTP_SALT_LEN)
-		throw std::logic_error("Unexpected SRTP salt size: " + to_string(serverSaltDatum.size));
-
-	clientKey = reinterpret_cast<const unsigned char *>(clientKeyDatum.data);
-	clientSalt = reinterpret_cast<const unsigned char *>(clientSaltDatum.data);
-
-	serverKey = reinterpret_cast<const unsigned char *>(serverKeyDatum.data);
-	serverSalt = reinterpret_cast<const unsigned char *>(serverSaltDatum.data);
-#else
-	PLOG_INFO << "Deriving SRTP keying material (OpenSSL)";
-
-	// The extractor provides the client write master key, the server write master key, the client
-	// write master salt and the server write master salt in that order.
-	const string label = "EXTRACTOR-dtls_srtp";
-
-	// returns 1 on success, 0 or -1 on failure (OpenSSL API is a complete mess...)
-	if (SSL_export_keying_material(mSsl, material, materialLen, label.c_str(), label.size(),
-	                               nullptr, 0, 0) <= 0)
-		throw std::runtime_error("Failed to derive SRTP keys: " +
-		                         openssl::error_string(ERR_get_error()));
-
-	// Order is client key, server key, client salt, and server salt
-	clientKey = material;
-	serverKey = clientKey + SRTP_AES_128_KEY_LEN;
-	clientSalt = serverKey + SRTP_AES_128_KEY_LEN;
-	serverSalt = clientSalt + SRTP_SALT_LEN;
-#endif
-
-	unsigned char clientSessionKey[SRTP_AES_ICM_128_KEY_LEN_WSALT];
-	std::memcpy(clientSessionKey, clientKey, SRTP_AES_128_KEY_LEN);
-	std::memcpy(clientSessionKey + SRTP_AES_128_KEY_LEN, clientSalt, SRTP_SALT_LEN);
-
-	unsigned char serverSessionKey[SRTP_AES_ICM_128_KEY_LEN_WSALT];
-	std::memcpy(serverSessionKey, serverKey, SRTP_AES_128_KEY_LEN);
-	std::memcpy(serverSessionKey + SRTP_AES_128_KEY_LEN, serverSalt, SRTP_SALT_LEN);
-
-	srtp_policy_t inbound = {};
-	srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80(&inbound.rtp);
-	srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80(&inbound.rtcp);
-	inbound.ssrc.type = ssrc_any_inbound;
-	inbound.ssrc.value = 0;
-	inbound.key = mIsClient ? serverSessionKey : clientSessionKey;
-	inbound.next = nullptr;
-
-	if (srtp_err_status_t err = srtp_add_stream(mSrtpIn, &inbound))
-		throw std::runtime_error("SRTP add inbound stream failed, status=" +
-		                         to_string(static_cast<int>(err)));
-
-	srtp_policy_t outbound = {};
-	srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80(&outbound.rtp);
-	srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80(&outbound.rtcp);
-	outbound.ssrc.type = ssrc_any_outbound;
-	outbound.ssrc.value = 0;
-	outbound.key = mIsClient ? clientSessionKey : serverSessionKey;
-	outbound.next = nullptr;
-
-	if (srtp_err_status_t err = srtp_add_stream(mSrtpOut, &outbound))
-		throw std::runtime_error("SRTP add outbound stream failed, status=" +
-		                         to_string(static_cast<int>(err)));
-
-	mInitDone = true;
-}
-
-} // namespace rtc
-
-#endif

src/dtlssrtptransport.hpp

@@ -1,57 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef RTC_DTLS_SRTP_TRANSPORT_H
-#define RTC_DTLS_SRTP_TRANSPORT_H
-
-#include "dtlstransport.hpp"
-#include "include.hpp"
-
-#if RTC_ENABLE_MEDIA
-
-#include <srtp2/srtp.h>
-
-namespace rtc {
-
-class DtlsSrtpTransport final : public DtlsTransport {
-public:
-	static void Init();
-	static void Cleanup();
-
-	DtlsSrtpTransport(std::shared_ptr<IceTransport> lower, std::shared_ptr<Certificate> certificate,
-	                  verifier_callback verifierCallback, message_callback srtpRecvCallback,
-	                  state_callback stateChangeCallback);
-	~DtlsSrtpTransport();
-
-	bool sendMedia(message_ptr message);
-
-private:
-	void incoming(message_ptr message) override;
-	void postHandshake() override;
-
-	message_callback mSrtpRecvCallback;
-
-	srtp_t mSrtpIn, mSrtpOut;
-	bool mInitDone = false;
-};
-
-} // namespace rtc
-
-#endif
-
-#endif

src/dtlstransport.cpp

@@ -18,20 +18,14 @@
 
 #include "dtlstransport.hpp"
 #include "icetransport.hpp"
+#include "message.hpp"
 
+#include <cassert>
 #include <chrono>
 #include <cstring>
 #include <exception>
 #include <iostream>
 
-#if !USE_GNUTLS
-#ifdef _WIN32
-#include <winsock2.h> // for timeval
-#else
-#include <sys/time.h> // for timeval
-#endif
-#endif
-
 using namespace std::chrono;
 
 using std::shared_ptr;
@@ -39,56 +33,73 @@ using std::string;
 using std::unique_ptr;
 using std::weak_ptr;
 
-namespace rtc {
-
 #if USE_GNUTLS
 
-void DtlsTransport::Init() {
-	gnutls_global_init(); // optional
+#include <gnutls/dtls.h>
+
+namespace {
+
+static bool check_gnutls(int ret, const string &message = "GnuTLS error") {
+	if (ret < 0) {
+		if (!gnutls_error_is_fatal(ret)) {
+			PLOG_INFO << gnutls_strerror(ret);
+			return false;
+		}
+		PLOG_ERROR << message << ": " << gnutls_strerror(ret);
+		throw std::runtime_error(message + ": " + gnutls_strerror(ret));
+	}
+	return true;
 }
 
-void DtlsTransport::Cleanup() { gnutls_global_deinit(); }
+} // namespace
 
-DtlsTransport::DtlsTransport(shared_ptr<IceTransport> lower, certificate_ptr certificate,
-                             verifier_callback verifierCallback, state_callback stateChangeCallback)
-    : Transport(lower, std::move(stateChangeCallback)), mCertificate(certificate),
+namespace rtc {
+
+void DtlsTransport::Init() {
+	// Nothing to do
+}
+
+void DtlsTransport::Cleanup() {
+	// Nothing to do
+}
+
+DtlsTransport::DtlsTransport(shared_ptr<IceTransport> lower, shared_ptr<Certificate> certificate,
+                             verifier_callback verifierCallback,
+                             state_callback stateChangeCallback)
+    : Transport(lower), mCertificate(certificate), mState(State::Disconnected),
       mVerifierCallback(std::move(verifierCallback)),
-      mIsClient(lower->role() == Description::Role::Active) {
+      mStateChangeCallback(std::move(stateChangeCallback)) {
 
 	PLOG_DEBUG << "Initializing DTLS transport (GnuTLS)";
 
-	gnutls_certificate_credentials_t creds = mCertificate->credentials();
-	gnutls_certificate_set_verify_function(creds, CertificateCallback);
+	bool active = lower->role() == Description::Role::Active;
+	unsigned int flags = GNUTLS_DATAGRAM | (active ? GNUTLS_CLIENT : GNUTLS_SERVER);
+	check_gnutls(gnutls_init(&mSession, flags));
 
-	unsigned int flags = GNUTLS_DATAGRAM | (mIsClient ? GNUTLS_CLIENT : GNUTLS_SERVER);
-	gnutls::check(gnutls_init(&mSession, flags));
+	// RFC 8261: SCTP performs segmentation and reassembly based on the path MTU.
+	// Therefore, the DTLS layer MUST NOT use any compression algorithm.
+	// See https://tools.ietf.org/html/rfc8261#section-5
+	const char *priorities = "SECURE128:-VERS-SSL3.0:-ARCFOUR-128:-COMP-ALL:+COMP-NULL";
+	const char *err_pos = NULL;
+	check_gnutls(gnutls_priority_set_direct(mSession, priorities, &err_pos),
+	             "Unable to set TLS priorities");
 
-	try {
-		// RFC 8261: SCTP performs segmentation and reassembly based on the path MTU.
-		// Therefore, the DTLS layer MUST NOT use any compression algorithm.
-		// See https://tools.ietf.org/html/rfc8261#section-5
-		const char *priorities = "SECURE128:-VERS-SSL3.0:-ARCFOUR-128:-COMP-ALL:+COMP-NULL";
-		const char *err_pos = NULL;
-		gnutls::check(gnutls_priority_set_direct(mSession, priorities, &err_pos),
-		              "Failed to set TLS priorities");
+	gnutls_certificate_set_verify_function(mCertificate->credentials(), CertificateCallback);
+	check_gnutls(
+	    gnutls_credentials_set(mSession, GNUTLS_CRD_CERTIFICATE, mCertificate->credentials()));
 
-		gnutls::check(gnutls_credentials_set(mSession, GNUTLS_CRD_CERTIFICATE, creds));
+	gnutls_dtls_set_timeouts(mSession,
+	                         1000,   // 1s retransmission timeout recommended by RFC 6347
+	                         30000); // 30s total timeout
+	gnutls_handshake_set_timeout(mSession, 30000);
 
-		gnutls_dtls_set_timeouts(mSession,
-		                         1000,   // 1s retransmission timeout recommended by RFC 6347
-		                         30000); // 30s total timeout
-		gnutls_handshake_set_timeout(mSession, 30000);
+	gnutls_session_set_ptr(mSession, this);
+	gnutls_transport_set_ptr(mSession, this);
+	gnutls_transport_set_push_function(mSession, WriteCallback);
+	gnutls_transport_set_pull_function(mSession, ReadCallback);
+	gnutls_transport_set_pull_timeout_function(mSession, TimeoutCallback);
 
-		gnutls_session_set_ptr(mSession, this);
-		gnutls_transport_set_ptr(mSession, this);
-		gnutls_transport_set_push_function(mSession, WriteCallback);
-		gnutls_transport_set_pull_function(mSession, ReadCallback);
-		gnutls_transport_set_pull_timeout_function(mSession, TimeoutCallback);
-
-	} catch (...) {
-		gnutls_deinit(mSession);
-		throw;
-	}
+	mRecvThread = std::thread(&DtlsTransport::runRecvLoop, this);
 }
 
 DtlsTransport::~DtlsTransport() {
@@ -97,14 +108,7 @@ DtlsTransport::~DtlsTransport() {
 	gnutls_deinit(mSession);
 }
 
-void DtlsTransport::start() {
-	Transport::start();
-
-	registerIncoming();
-
-	PLOG_DEBUG << "Starting DTLS recv thread";
-	mRecvThread = std::thread(&DtlsTransport::runRecvLoop, this);
-}
+DtlsTransport::State DtlsTransport::state() const { return mState; }
 
 bool DtlsTransport::stop() {
 	if (!Transport::stop())
@@ -112,12 +116,14 @@ bool DtlsTransport::stop() {
 
 	PLOG_DEBUG << "Stopping DTLS recv thread";
 	mIncomingQueue.stop();
+	gnutls_bye(mSession, GNUTLS_SHUT_RDWR);
 	mRecvThread.join();
+	onRecv(nullptr);
 	return true;
 }
 
 bool DtlsTransport::send(message_ptr message) {
-	if (!message || state() != State::Connected)
+	if (!message || mState != State::Connected)
 		return false;
 
 	PLOG_VERBOSE << "Send size=" << message->size();
@@ -130,7 +136,7 @@ bool DtlsTransport::send(message_ptr message) {
 	if (ret == GNUTLS_E_LARGE_PACKET)
 		return false;
 
-	return gnutls::check(ret);
+	return check_gnutls(ret);
 }
 
 void DtlsTransport::incoming(message_ptr message) {
@@ -143,12 +149,14 @@ void DtlsTransport::incoming(message_ptr message) {
 	mIncomingQueue.push(message);
 }
 
-void DtlsTransport::postHandshake() {
-	// Dummy
+void DtlsTransport::changeState(State state) {
+	if (mState.exchange(state) != state)
+		mStateChangeCallback(state);
 }
 
 void DtlsTransport::runRecvLoop() {
 	const size_t maxMtu = 4096;
+
 	// Handshake loop
 	try {
 		changeState(State::Connecting);
@@ -162,7 +170,7 @@ void DtlsTransport::runRecvLoop() {
 				throw std::runtime_error("MTU is too low");
 
 		} while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN ||
-		         !gnutls::check(ret, "DTLS handshake failed"));
+		         !check_gnutls(ret, "TLS handshake failed"));
 
 		// RFC 8261: DTLS MUST support sending messages larger than the current path MTU
 		// See https://tools.ietf.org/html/rfc8261#section-5
@@ -176,9 +184,8 @@ void DtlsTransport::runRecvLoop() {
 
 	// Receive loop
 	try {
-		PLOG_INFO << "DTLS handshake finished";
+		PLOG_INFO << "DTLS handshake done";
 		changeState(State::Connected);
-		postHandshake();
 
 		const size_t bufferSize = maxMtu;
 		char buffer[bufferSize];
@@ -195,7 +202,7 @@ void DtlsTransport::runRecvLoop() {
 				break;
 			}
 
-			if (gnutls::check(ret)) {
+			if (check_gnutls(ret)) {
 				if (ret == 0) {
 					// Closed
 					PLOG_DEBUG << "DTLS connection cleanly closed";
@@ -210,9 +217,7 @@ void DtlsTransport::runRecvLoop() {
 		PLOG_ERROR << "DTLS recv: " << e.what();
 	}
 
-	gnutls_bye(mSession, GNUTLS_SHUT_RDWR);
-
-	PLOG_INFO << "DTLS closed";
+	PLOG_INFO << "DTLS disconnected";
 	changeState(State::Disconnected);
 	recv(nullptr);
 }
@@ -231,7 +236,7 @@ int DtlsTransport::CertificateCallback(gnutls_session_t session) {
 	}
 
 	gnutls_x509_crt_t crt;
-	gnutls::check(gnutls_x509_crt_init(&crt));
+	check_gnutls(gnutls_x509_crt_init(&crt));
 	int ret = gnutls_x509_crt_import(crt, &array[0], GNUTLS_X509_FMT_DER);
 	if (ret != GNUTLS_E_SUCCESS) {
 		gnutls_x509_crt_deinit(crt);
@@ -258,7 +263,7 @@ ssize_t DtlsTransport::WriteCallback(gnutls_transport_ptr_t ptr, const void *dat
 ssize_t DtlsTransport::ReadCallback(gnutls_transport_ptr_t ptr, void *data, size_t maxlen) {
 	DtlsTransport *t = static_cast<DtlsTransport *>(ptr);
 	if (auto next = t->mIncomingQueue.pop()) {
-		message_ptr message = std::move(*next);
+		auto message = *next;
 		ssize_t len = std::min(maxlen, message->size());
 		std::memcpy(data, message->data(), len);
 		gnutls_transport_set_errno(t->mSession, 0);
@@ -271,26 +276,71 @@ ssize_t DtlsTransport::ReadCallback(gnutls_transport_ptr_t ptr, void *data, size
 
 int DtlsTransport::TimeoutCallback(gnutls_transport_ptr_t ptr, unsigned int ms) {
 	DtlsTransport *t = static_cast<DtlsTransport *>(ptr);
-	bool notEmpty = t->mIncomingQueue.wait(
-	    ms != GNUTLS_INDEFINITE_TIMEOUT ? std::make_optional(milliseconds(ms)) : nullopt);
-	return notEmpty ? 1 : 0;
+	t->mIncomingQueue.wait(ms != GNUTLS_INDEFINITE_TIMEOUT ? std::make_optional(milliseconds(ms))
+	                                                       : nullopt);
+	return !t->mIncomingQueue.empty() ? 1 : 0;
 }
 
+} // namespace rtc
+
 #else // USE_GNUTLS==0
 
+#include <openssl/bio.h>
+#include <openssl/ec.h>
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+
+namespace {
+
+const int BIO_EOF = -1;
+
+string openssl_error_string(unsigned long err) {
+	const size_t bufferSize = 256;
+	char buffer[bufferSize];
+	ERR_error_string_n(err, buffer, bufferSize);
+	return string(buffer);
+}
+
+bool check_openssl(int success, const string &message = "OpenSSL error") {
+	if (success)
+		return true;
+
+	string str = openssl_error_string(ERR_get_error());
+	PLOG_ERROR << message << ": " << str;
+	throw std::runtime_error(message + ": " + str);
+}
+
+bool check_openssl_ret(SSL *ssl, int ret, const string &message = "OpenSSL error") {
+	if (ret == BIO_EOF)
+		return true;
+
+	unsigned long err = SSL_get_error(ssl, ret);
+	if (err == SSL_ERROR_NONE || err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) {
+		return true;
+	}
+	if (err == SSL_ERROR_ZERO_RETURN) {
+		PLOG_DEBUG << "DTLS connection cleanly closed";
+		return false;
+	}
+	string str = openssl_error_string(err);
+	PLOG_ERROR << str;
+	throw std::runtime_error(message + ": " + str);
+}
+
+} // namespace
+
+namespace rtc {
+
 BIO_METHOD *DtlsTransport::BioMethods = NULL;
 int DtlsTransport::TransportExIndex = -1;
 std::mutex DtlsTransport::GlobalMutex;
 
 void DtlsTransport::Init() {
 	std::lock_guard lock(GlobalMutex);
-
-	openssl::init();
-
 	if (!BioMethods) {
 		BioMethods = BIO_meth_new(BIO_TYPE_BIO, "DTLS writer");
 		if (!BioMethods)
-			throw std::runtime_error("Failed to create BIO methods for DTLS writer");
+			throw std::runtime_error("Unable to BIO methods for DTLS writer");
 		BIO_meth_set_create(BioMethods, BioMethodNew);
 		BIO_meth_set_destroy(BioMethods, BioMethodFree);
 		BIO_meth_set_write(BioMethods, BioMethodWrite);
@@ -307,69 +357,59 @@ void DtlsTransport::Cleanup() {
 
 DtlsTransport::DtlsTransport(shared_ptr<IceTransport> lower, shared_ptr<Certificate> certificate,
                              verifier_callback verifierCallback, state_callback stateChangeCallback)
-    : Transport(lower, std::move(stateChangeCallback)), mCertificate(certificate),
+    : Transport(lower), mCertificate(certificate), mState(State::Disconnected),
       mVerifierCallback(std::move(verifierCallback)),
-      mIsClient(lower->role() == Description::Role::Active) {
+      mStateChangeCallback(std::move(stateChangeCallback)) {
+
 	PLOG_DEBUG << "Initializing DTLS transport (OpenSSL)";
 
-	try {
-		mCtx = SSL_CTX_new(DTLS_method());
-		if (!mCtx)
-			throw std::runtime_error("Failed to create SSL context");
+	if (!(mCtx = SSL_CTX_new(DTLS_method())))
+		throw std::runtime_error("Unable to create SSL context");
 
-		openssl::check(SSL_CTX_set_cipher_list(mCtx, "ALL:!LOW:!EXP:!RC4:!MD5:@STRENGTH"),
-		               "Failed to set SSL priorities");
+	check_openssl(SSL_CTX_set_cipher_list(mCtx, "ALL:!LOW:!EXP:!RC4:!MD5:@STRENGTH"),
+	              "Unable to set SSL priorities");
 
-		// RFC 8261: SCTP performs segmentation and reassembly based on the path MTU.
-		// Therefore, the DTLS layer MUST NOT use any compression algorithm.
-		// See https://tools.ietf.org/html/rfc8261#section-5
-		SSL_CTX_set_options(mCtx, SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION | SSL_OP_NO_QUERY_MTU);
-		SSL_CTX_set_min_proto_version(mCtx, DTLS1_VERSION);
-		SSL_CTX_set_read_ahead(mCtx, 1);
-		SSL_CTX_set_quiet_shutdown(mCtx, 1);
-		SSL_CTX_set_info_callback(mCtx, InfoCallback);
-		SSL_CTX_set_verify(mCtx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
-		                   CertificateCallback);
-		SSL_CTX_set_verify_depth(mCtx, 1);
+	// RFC 8261: SCTP performs segmentation and reassembly based on the path MTU.
+	// Therefore, the DTLS layer MUST NOT use any compression algorithm.
+	// See https://tools.ietf.org/html/rfc8261#section-5
+	SSL_CTX_set_options(mCtx, SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION | SSL_OP_NO_QUERY_MTU);
+	SSL_CTX_set_min_proto_version(mCtx, DTLS1_VERSION);
+	SSL_CTX_set_read_ahead(mCtx, 1);
+	SSL_CTX_set_quiet_shutdown(mCtx, 1);
+	SSL_CTX_set_info_callback(mCtx, InfoCallback);
+	SSL_CTX_set_verify(mCtx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
+	                   CertificateCallback);
+	SSL_CTX_set_verify_depth(mCtx, 1);
 
-		auto [x509, pkey] = mCertificate->credentials();
-		SSL_CTX_use_certificate(mCtx, x509);
-		SSL_CTX_use_PrivateKey(mCtx, pkey);
+	auto [x509, pkey] = mCertificate->credentials();
+	SSL_CTX_use_certificate(mCtx, x509);
+	SSL_CTX_use_PrivateKey(mCtx, pkey);
 
-		openssl::check(SSL_CTX_check_private_key(mCtx), "SSL local private key check failed");
+	check_openssl(SSL_CTX_check_private_key(mCtx), "SSL local private key check failed");
 
-		mSsl = SSL_new(mCtx);
-		if (!mSsl)
-			throw std::runtime_error("Failed to create SSL instance");
+	if (!(mSsl = SSL_new(mCtx)))
+		throw std::runtime_error("Unable to create SSL instance");
 
-		SSL_set_ex_data(mSsl, TransportExIndex, this);
+	SSL_set_ex_data(mSsl, TransportExIndex, this);
 
-		if (mIsClient)
-			SSL_set_connect_state(mSsl);
-		else
-			SSL_set_accept_state(mSsl);
+	if (lower->role() == Description::Role::Active)
+		SSL_set_connect_state(mSsl);
+	else
+		SSL_set_accept_state(mSsl);
 
-		mInBio = BIO_new(BIO_s_mem());
-		mOutBio = BIO_new(BioMethods);
-		if (!mInBio || !mOutBio)
-			throw std::runtime_error("Failed to create BIO");
+	if (!(mInBio = BIO_new(BIO_s_mem())) || !(mOutBio = BIO_new(BioMethods)))
+		throw std::runtime_error("Unable to create BIO");
 
-		BIO_set_mem_eof_return(mInBio, BIO_EOF);
-		BIO_set_data(mOutBio, this);
-		SSL_set_bio(mSsl, mInBio, mOutBio);
+	BIO_set_mem_eof_return(mInBio, BIO_EOF);
+	BIO_set_data(mOutBio, this);
+	SSL_set_bio(mSsl, mInBio, mOutBio);
 
-		auto ecdh = unique_ptr<EC_KEY, decltype(&EC_KEY_free)>(
-		    EC_KEY_new_by_curve_name(NID_X9_62_prime256v1), EC_KEY_free);
-		SSL_set_options(mSsl, SSL_OP_SINGLE_ECDH_USE);
-		SSL_set_tmp_ecdh(mSsl, ecdh.get());
+	auto ecdh = unique_ptr<EC_KEY, decltype(&EC_KEY_free)>(
+	    EC_KEY_new_by_curve_name(NID_X9_62_prime256v1), EC_KEY_free);
+	SSL_set_options(mSsl, SSL_OP_SINGLE_ECDH_USE);
+	SSL_set_tmp_ecdh(mSsl, ecdh.get());
 
-	} catch (...) {
-		if (mSsl)
-			SSL_free(mSsl);
-		if (mCtx)
-			SSL_CTX_free(mCtx);
-		throw;
-	}
+	mRecvThread = std::thread(&DtlsTransport::runRecvLoop, this);
 }
 
 DtlsTransport::~DtlsTransport() {
@@ -379,15 +419,6 @@ DtlsTransport::~DtlsTransport() {
 	SSL_CTX_free(mCtx);
 }
 
-void DtlsTransport::start() {
-	Transport::start();
-
-	registerIncoming();
-
-	PLOG_DEBUG << "Starting DTLS recv thread";
-	mRecvThread = std::thread(&DtlsTransport::runRecvLoop, this);
-}
-
 bool DtlsTransport::stop() {
 	if (!Transport::stop())
 		return false;
@@ -396,17 +427,22 @@ bool DtlsTransport::stop() {
 	mIncomingQueue.stop();
 	mRecvThread.join();
 	SSL_shutdown(mSsl);
+	onRecv(nullptr);
 	return true;
 }
 
+DtlsTransport::State DtlsTransport::state() const { return mState; }
+
 bool DtlsTransport::send(message_ptr message) {
-	if (!message || state() != State::Connected)
+	if (!message || mState != State::Connected)
 		return false;
 
 	PLOG_VERBOSE << "Send size=" << message->size();
 
-	int ret = SSL_write(mSsl, message->data(), int(message->size()));
-	return openssl::check(mSsl, ret);
+	int ret = SSL_write(mSsl, message->data(), message->size());
+	if (!check_openssl_ret(mSsl, ret))
+		return false;
+	return true;
 }
 
 void DtlsTransport::incoming(message_ptr message) {
@@ -419,8 +455,9 @@ void DtlsTransport::incoming(message_ptr message) {
 	mIncomingQueue.push(message);
 }
 
-void DtlsTransport::postHandshake() {
-	// Dummy
+void DtlsTransport::changeState(State state) {
+	if (mState.exchange(state) != state)
+		mStateChangeCallback(state);
 }
 
 void DtlsTransport::runRecvLoop() {
@@ -431,20 +468,20 @@ void DtlsTransport::runRecvLoop() {
 
 		// Initiate the handshake
 		int ret = SSL_do_handshake(mSsl);
-		openssl::check(mSsl, ret, "Handshake failed");
+		check_openssl_ret(mSsl, ret, "Handshake failed");
 
 		const size_t bufferSize = maxMtu;
 		byte buffer[bufferSize];
 		while (true) {
 			// Process pending messages
-			while (auto next = mIncomingQueue.tryPop()) {
-				message_ptr message = std::move(*next);
-				BIO_write(mInBio, message->data(), int(message->size()));
+			while (!mIncomingQueue.empty()) {
+				auto message = *mIncomingQueue.pop();
+				BIO_write(mInBio, message->data(), message->size());
 
-				if (state() == State::Connecting) {
+				if (mState == State::Connecting) {
 					// Continue the handshake
-					ret = SSL_do_handshake(mSsl);
-					if (!openssl::check(mSsl, ret, "Handshake failed"))
+					int ret = SSL_do_handshake(mSsl);
+					if (!check_openssl_ret(mSsl, ret, "Handshake failed"))
 						break;
 
 					if (SSL_is_init_finished(mSsl)) {
@@ -452,15 +489,13 @@ void DtlsTransport::runRecvLoop() {
 						// MTU See https://tools.ietf.org/html/rfc8261#section-5
 						SSL_set_mtu(mSsl, maxMtu + 1);
 
-						PLOG_INFO << "DTLS handshake finished";
+						PLOG_INFO << "DTLS handshake done";
 						changeState(State::Connected);
-						postHandshake();
 					}
 				} else {
-					ret = SSL_read(mSsl, buffer, bufferSize);
-					if (!openssl::check(mSsl, ret))
+					int ret = SSL_read(mSsl, buffer, bufferSize);
+					if (!check_openssl_ret(mSsl, ret))
 						break;
-
 					if (ret > 0)
 						recv(make_message(buffer, buffer + ret));
 				}
@@ -468,9 +503,9 @@ void DtlsTransport::runRecvLoop() {
 
 			// No more messages pending, retransmit and rearm timeout if connecting
 			std::optional<milliseconds> duration;
-			if (state() == State::Connecting) {
+			if (mState == State::Connecting) {
 				// Warning: This function breaks the usual return value convention
-				ret = DTLSv1_handle_timeout(mSsl);
+				int ret = DTLSv1_handle_timeout(mSsl);
 				if (ret < 0) {
 					throw std::runtime_error("Handshake timeout"); // write BIO can't fail
 				} else if (ret > 0) {
@@ -478,7 +513,7 @@ void DtlsTransport::runRecvLoop() {
 				}
 
 				struct timeval timeout = {};
-				if (state() == State::Connecting && DTLSv1_get_timeout(mSsl, &timeout)) {
+				if (mState == State::Connecting && DTLSv1_get_timeout(mSsl, &timeout)) {
 					duration = milliseconds(timeout.tv_sec * 1000 + timeout.tv_usec / 1000);
 					// Also handle handshake timeout manually because OpenSSL actually doesn't...
 					// OpenSSL backs off exponentially in base 2 starting from the recommended 1s
@@ -499,8 +534,8 @@ void DtlsTransport::runRecvLoop() {
 		PLOG_ERROR << "DTLS recv: " << e.what();
 	}
 
-	if (state() == State::Connected) {
-		PLOG_INFO << "DTLS closed";
+	if (mState == State::Connected) {
+		PLOG_INFO << "DTLS disconnected";
 		changeState(State::Disconnected);
 		recv(nullptr);
 	} else {
@@ -509,14 +544,14 @@ void DtlsTransport::runRecvLoop() {
 	}
 }
 
-int DtlsTransport::CertificateCallback(int /*preverify_ok*/, X509_STORE_CTX *ctx) {
+int DtlsTransport::CertificateCallback(int preverify_ok, X509_STORE_CTX *ctx) {
 	SSL *ssl =
 	    static_cast<SSL *>(X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx()));
 	DtlsTransport *t =
 	    static_cast<DtlsTransport *>(SSL_get_ex_data(ssl, DtlsTransport::TransportExIndex));
 
 	X509 *crt = X509_STORE_CTX_get_current_cert(ctx);
-	string fingerprint = make_fingerprint(crt);
+	std::string fingerprint = make_fingerprint(crt);
 
 	return t->mVerifierCallback(fingerprint) ? 1 : 0;
 }
@@ -558,7 +593,7 @@ int DtlsTransport::BioMethodWrite(BIO *bio, const char *in, int inl) {
 	return inl; // can't fail
 }
 
-long DtlsTransport::BioMethodCtrl(BIO * /*bio*/, int cmd, long /*num*/, void * /*ptr*/) {
+long DtlsTransport::BioMethodCtrl(BIO *bio, int cmd, long num, void *ptr) {
 	switch (cmd) {
 	case BIO_CTRL_FLUSH:
 		return 1;
@@ -573,7 +608,7 @@ long DtlsTransport::BioMethodCtrl(BIO * /*bio*/, int cmd, long /*num*/, void * /
 	return 0;
 }
 
-#endif
-
 } // namespace rtc
 
+#endif
+

src/dtlstransport.hpp

@@ -23,7 +23,6 @@
 #include "include.hpp"
 #include "peerconnection.hpp"
 #include "queue.hpp"
-#include "tls.hpp"
 #include "transport.hpp"
 
 #include <atomic>
@@ -32,6 +31,12 @@
 #include <mutex>
 #include <thread>
 
+#if USE_GNUTLS
+#include <gnutls/gnutls.h>
+#else
+#include <openssl/ssl.h>
+#endif
+
 namespace rtc {
 
 class IceTransport;
@@ -41,28 +46,34 @@ public:
 	static void Init();
 	static void Cleanup();
 
-	using verifier_callback = std::function<bool(const std::string &fingerprint)>;
+	enum class State { Disconnected, Connecting, Connected, Failed };
 
-	DtlsTransport(std::shared_ptr<IceTransport> lower, certificate_ptr certificate,
+	using verifier_callback = std::function<bool(const std::string &fingerprint)>;
+	using state_callback = std::function<void(State state)>;
+
+	DtlsTransport(std::shared_ptr<IceTransport> lower, std::shared_ptr<Certificate> certificate,
 	              verifier_callback verifierCallback, state_callback stateChangeCallback);
 	~DtlsTransport();
 
-	virtual void start() override;
-	virtual bool stop() override;
-	virtual bool send(message_ptr message) override; // false if dropped
+	State state() const;
 
-protected:
-	virtual void incoming(message_ptr message) override;
-	virtual void postHandshake();
+	bool stop() override;
+	bool send(message_ptr message) override; // false if dropped
+
+private:
+	void incoming(message_ptr message) override;
+	void changeState(State state);
 	void runRecvLoop();
 
-	const certificate_ptr mCertificate;
-	const verifier_callback mVerifierCallback;
-	const bool mIsClient;
+	const std::shared_ptr<Certificate> mCertificate;
 
 	Queue<message_ptr> mIncomingQueue;
+	std::atomic<State> mState;
 	std::thread mRecvThread;
 
+	verifier_callback mVerifierCallback;
+	state_callback mStateChangeCallback;
+
 #if USE_GNUTLS
 	gnutls_session_t mSession;
 
@@ -71,8 +82,8 @@ protected:
 	static ssize_t ReadCallback(gnutls_transport_ptr_t ptr, void *data, size_t maxlen);
 	static int TimeoutCallback(gnutls_transport_ptr_t ptr, unsigned int ms);
 #else
-	SSL_CTX *mCtx = NULL;
-	SSL *mSsl = NULL;
+	SSL_CTX *mCtx;
+	SSL *mSsl;
 	BIO *mInBio, *mOutBio;
 
 	static BIO_METHOD *BioMethods;

src/icetransport.cpp

@@ -40,17 +40,17 @@ using namespace std::chrono_literals;
 
 using std::shared_ptr;
 using std::weak_ptr;
-using std::chrono::system_clock;
 
-#if !USE_NICE
+#if USE_JUICE
 
 namespace rtc {
 
 IceTransport::IceTransport(const Configuration &config, Description::Role role,
                            candidate_callback candidateCallback, state_callback stateChangeCallback,
                            gathering_state_callback gatheringStateChangeCallback)
-    : Transport(nullptr, std::move(stateChangeCallback)), mRole(role), mMid("0"),
-      mGatheringState(GatheringState::New), mCandidateCallback(std::move(candidateCallback)),
+    : mRole(role), mMid("0"), mState(State::Disconnected), mGatheringState(GatheringState::New),
+      mCandidateCallback(std::move(candidateCallback)),
+      mStateChangeCallback(std::move(stateChangeCallback)),
       mGatheringStateChangeCallback(std::move(gatheringStateChangeCallback)),
       mAgent(nullptr, nullptr) {
 
@@ -58,31 +58,8 @@ IceTransport::IceTransport(const Configuration &config, Description::Role role,
 	if (config.enableIceTcp) {
 		PLOG_WARNING << "ICE-TCP is not supported with libjuice";
 	}
-
-	juice_log_level_t level;
-	switch (plog::get()->getMaxSeverity()) {
-	case plog::none:
-		level = JUICE_LOG_LEVEL_NONE;
-		break;
-	case plog::fatal:
-		level = JUICE_LOG_LEVEL_VERBOSE;
-		break;
-	case plog::error:
-		level = JUICE_LOG_LEVEL_ERROR;
-		break;
-	case plog::warning:
-		level = JUICE_LOG_LEVEL_WARN;
-		break;
-	case plog::info:
-	case plog::debug: // juice debug is output as verbose
-		level = JUICE_LOG_LEVEL_INFO;
-		break;
-	default:
-		level = JUICE_LOG_LEVEL_VERBOSE;
-		break;
-	}
 	juice_set_log_handler(IceTransport::LogCallback);
-	juice_set_log_level(level);
+	juice_set_log_level(JUICE_LOG_LEVEL_VERBOSE);
 
 	juice_config_t jconfig = {};
 	jconfig.cb_state_changed = IceTransport::StateChangeCallback;
@@ -93,7 +70,7 @@ IceTransport::IceTransport(const Configuration &config, Description::Role role,
 
 	// Randomize servers order
 	std::vector<IceServer> servers = config.iceServers;
-	auto seed = static_cast<unsigned int>(system_clock::now().time_since_epoch().count());
+	unsigned seed = std::chrono::system_clock::now().time_since_epoch().count();
 	std::shuffle(servers.begin(), servers.end(), std::default_random_engine(seed));
 
 	// Pick a STUN server (TURN support is not implemented in libjuice yet)
@@ -106,8 +83,7 @@ IceTransport::IceTransport(const Configuration &config, Description::Role role,
 			mStunHostname = server.hostname;
 			mStunService = server.service;
 			jconfig.stun_server_host = mStunHostname.c_str();
-			jconfig.stun_server_port = uint16_t(std::stoul(mStunService));
-			break;
+			jconfig.stun_server_port = std::stoul(mStunService);
 		}
 	}
 
@@ -124,17 +100,17 @@ IceTransport::IceTransport(const Configuration &config, Description::Role role,
 		throw std::runtime_error("Failed to create the ICE agent");
 }
 
-IceTransport::~IceTransport() {
-	stop();
-	mAgent.reset();
-}
+IceTransport::~IceTransport() { stop(); }
 
 bool IceTransport::stop() {
+	onRecv(nullptr);
 	return Transport::stop();
 }
 
 Description::Role IceTransport::role() const { return mRole; }
 
+IceTransport::State IceTransport::state() const { return mState; }
+
 Description IceTransport::getLocalDescription(Description::Type type) const {
 	char sdp[JUICE_MAX_SDP_STRING_LEN];
 	if (juice_get_local_description(mAgent.get(), sdp, JUICE_MAX_SDP_STRING_LEN) < 0)
@@ -146,10 +122,9 @@ Description IceTransport::getLocalDescription(Description::Type type) const {
 void IceTransport::setRemoteDescription(const Description &description) {
 	mRole = description.role() == Description::Role::Active ? Description::Role::Passive
 	                                                        : Description::Role::Active;
-	mMid = description.bundleMid();
-	if (juice_set_remote_description(mAgent.get(),
-	                                 description.generateApplicationSdp("\r\n").c_str()) < 0)
-		throw std::runtime_error("Failed to parse ICE settings from remote SDP");
+	mMid = description.mid();
+	if (juice_set_remote_description(mAgent.get(), string(description).c_str()) < 0)
+		throw std::runtime_error("Failed to parse remote SDP");
 }
 
 bool IceTransport::addRemoteCandidate(const Candidate &candidate) {
@@ -187,42 +162,39 @@ std::optional<string> IceTransport::getRemoteAddress() const {
 }
 
 bool IceTransport::send(message_ptr message) {
-	auto s = state();
-	if (!message || (s != State::Connected && s != State::Completed))
+	if (!message || (mState != State::Connected && mState != State::Completed))
 		return false;
 
 	PLOG_VERBOSE << "Send size=" << message->size();
 	return outgoing(message);
 }
 
+void IceTransport::incoming(message_ptr message) {
+	PLOG_VERBOSE << "Incoming size=" << message->size();
+	recv(message);
+}
+
+void IceTransport::incoming(const byte *data, int size) {
+	incoming(make_message(data, data + size));
+}
+
 bool IceTransport::outgoing(message_ptr message) {
 	return juice_send(mAgent.get(), reinterpret_cast<const char *>(message->data()),
 	                  message->size()) >= 0;
 }
 
+void IceTransport::changeState(State state) {
+	if (mState.exchange(state) != state)
+		mStateChangeCallback(mState);
+}
+
 void IceTransport::changeGatheringState(GatheringState state) {
 	if (mGatheringState.exchange(state) != state)
 		mGatheringStateChangeCallback(mGatheringState);
 }
 
 void IceTransport::processStateChange(unsigned int state) {
-	switch (state) {
-	case JUICE_STATE_DISCONNECTED:
-		changeState(State::Disconnected);
-		break;
-	case JUICE_STATE_CONNECTING:
-		changeState(State::Connecting);
-		break;
-	case JUICE_STATE_CONNECTED:
-		changeState(State::Connected);
-		break;
-	case JUICE_STATE_COMPLETED:
-		changeState(State::Completed);
-		break;
-	case JUICE_STATE_FAILED:
-		changeState(State::Failed);
-		break;
-	};
+	changeState(static_cast<State>(state));
 }
 
 void IceTransport::processCandidate(const string &candidate) {
@@ -231,7 +203,7 @@ void IceTransport::processCandidate(const string &candidate) {
 
 void IceTransport::processGatheringDone() { changeGatheringState(GatheringState::Complete); }
 
-void IceTransport::StateChangeCallback(juice_agent_t *, juice_state_t state, void *user_ptr) {
+void IceTransport::StateChangeCallback(juice_agent_t *agent, juice_state_t state, void *user_ptr) {
 	auto iceTransport = static_cast<rtc::IceTransport *>(user_ptr);
 	try {
 		iceTransport->processStateChange(static_cast<unsigned int>(state));
@@ -240,7 +212,7 @@ void IceTransport::StateChangeCallback(juice_agent_t *, juice_state_t state, voi
 	}
 }
 
-void IceTransport::CandidateCallback(juice_agent_t *, const char *sdp, void *user_ptr) {
+void IceTransport::CandidateCallback(juice_agent_t *agent, const char *sdp, void *user_ptr) {
 	auto iceTransport = static_cast<rtc::IceTransport *>(user_ptr);
 	try {
 		iceTransport->processCandidate(sdp);
@@ -249,7 +221,7 @@ void IceTransport::CandidateCallback(juice_agent_t *, const char *sdp, void *use
 	}
 }
 
-void IceTransport::GatheringDoneCallback(juice_agent_t *, void *user_ptr) {
+void IceTransport::GatheringDoneCallback(juice_agent_t *agent, void *user_ptr) {
 	auto iceTransport = static_cast<rtc::IceTransport *>(user_ptr);
 	try {
 		iceTransport->processGatheringDone();
@@ -258,12 +230,11 @@ void IceTransport::GatheringDoneCallback(juice_agent_t *, void *user_ptr) {
 	}
 }
 
-void IceTransport::RecvCallback(juice_agent_t *, const char *data, size_t size, void *user_ptr) {
+void IceTransport::RecvCallback(juice_agent_t *agent, const char *data, size_t size,
+                                void *user_ptr) {
 	auto iceTransport = static_cast<rtc::IceTransport *>(user_ptr);
 	try {
-		PLOG_VERBOSE << "Incoming size=" << size;
-		auto b = reinterpret_cast<const byte *>(data);
-		iceTransport->incoming(make_message(b, b + size));
+		iceTransport->incoming(reinterpret_cast<const byte *>(data), size);
 	} catch (const std::exception &e) {
 		PLOG_WARNING << e.what();
 	}
@@ -293,15 +264,16 @@ void IceTransport::LogCallback(juice_log_level_t level, const char *message) {
 
 } // namespace rtc
 
-#else // USE_NICE == 1
+#else // USE_JUICE == 0
 
 namespace rtc {
 
 IceTransport::IceTransport(const Configuration &config, Description::Role role,
                            candidate_callback candidateCallback, state_callback stateChangeCallback,
                            gathering_state_callback gatheringStateChangeCallback)
-    : Transport(nullptr, std::move(stateChangeCallback)), mRole(role), mMid("0"),
-      mGatheringState(GatheringState::New), mCandidateCallback(std::move(candidateCallback)),
+    : mRole(role), mMid("0"), mState(State::Disconnected), mGatheringState(GatheringState::New),
+      mCandidateCallback(std::move(candidateCallback)),
+      mStateChangeCallback(std::move(stateChangeCallback)),
       mGatheringStateChangeCallback(std::move(gatheringStateChangeCallback)),
       mNiceAgent(nullptr, nullptr), mMainLoop(nullptr, nullptr) {
 
@@ -361,7 +333,7 @@ IceTransport::IceTransport(const Configuration &config, Description::Role role,
 
 	// Randomize order
 	std::vector<IceServer> servers = config.iceServers;
-	auto seed = static_cast<unsigned int>(system_clock::now().time_since_epoch().count());
+	unsigned seed = std::chrono::system_clock::now().time_since_epoch().count();
 	std::shuffle(servers.begin(), servers.end(), std::default_random_engine(seed));
 
 	// Add one STUN server
@@ -483,9 +455,6 @@ bool IceTransport::stop() {
 		return false;
 
 	PLOG_DEBUG << "Stopping ICE thread";
-	nice_agent_attach_recv(mNiceAgent.get(), mStreamId, 1, g_main_loop_get_context(mMainLoop.get()),
-	                       NULL, NULL);
-	nice_agent_remove_stream(mNiceAgent.get(), mStreamId);
 	g_main_loop_quit(mMainLoop.get());
 	mMainLoopThread.join();
 	return true;
@@ -493,6 +462,8 @@ bool IceTransport::stop() {
 
 Description::Role IceTransport::role() const { return mRole; }
 
+IceTransport::State IceTransport::state() const { return mState; }
+
 Description IceTransport::getLocalDescription(Description::Type type) const {
 	// RFC 8445: The initiating agent that started the ICE processing MUST take the controlling
 	// role, and the other MUST take the controlled role.
@@ -507,13 +478,12 @@ Description IceTransport::getLocalDescription(Description::Type type) const {
 void IceTransport::setRemoteDescription(const Description &description) {
 	mRole = description.role() == Description::Role::Active ? Description::Role::Passive
 	                                                        : Description::Role::Active;
-	mMid = description.bundleMid();
-	mTrickleTimeout = !description.ended() ? 30s : 0s;
+	mMid = description.mid();
+	mTrickleTimeout = description.trickleEnabled() ? 30s : 0s;
 
 	// Warning: libnice expects "\n" as end of line
-	if (nice_agent_parse_remote_sdp(mNiceAgent.get(),
-	                                description.generateApplicationSdp("\n").c_str()) < 0)
-		throw std::runtime_error("Failed to parse ICE settings from remote SDP");
+	if (nice_agent_parse_remote_sdp(mNiceAgent.get(), description.generateSdp("\n").c_str()) < 0)
+		throw std::runtime_error("Failed to parse remote SDP");
 }
 
 bool IceTransport::addRemoteCandidate(const Candidate &candidate) {
@@ -564,19 +534,32 @@ std::optional<string> IceTransport::getRemoteAddress() const {
 }
 
 bool IceTransport::send(message_ptr message) {
-	auto s = state();
-	if (!message || (s != State::Connected && s != State::Completed))
+	if (!message || (mState != State::Connected && mState != State::Completed))
 		return false;
 
 	PLOG_VERBOSE << "Send size=" << message->size();
 	return outgoing(message);
 }
 
+void IceTransport::incoming(message_ptr message) {
+	PLOG_VERBOSE << "Incoming size=" << message->size();
+	recv(message);
+}
+
+void IceTransport::incoming(const byte *data, int size) {
+	incoming(make_message(data, data + size));
+}
+
 bool IceTransport::outgoing(message_ptr message) {
 	return nice_agent_send(mNiceAgent.get(), mStreamId, 1, message->size(),
 	                       reinterpret_cast<const char *>(message->data())) >= 0;
 }
 
+void IceTransport::changeState(State state) {
+	if (mState.exchange(state) != state)
+		mStateChangeCallback(mState);
+}
+
 void IceTransport::changeGatheringState(GatheringState state) {
 	if (mGatheringState.exchange(state) != state)
 		mGatheringStateChangeCallback(mGatheringState);
@@ -607,23 +590,7 @@ void IceTransport::processStateChange(unsigned int state) {
 		mTimeoutId = 0;
 	}
 
-	switch (state) {
-	case NICE_COMPONENT_STATE_DISCONNECTED:
-		changeState(State::Disconnected);
-		break;
-	case NICE_COMPONENT_STATE_CONNECTING:
-		changeState(State::Connecting);
-		break;
-	case NICE_COMPONENT_STATE_CONNECTED:
-		changeState(State::Connected);
-		break;
-	case NICE_COMPONENT_STATE_READY:
-		changeState(State::Completed);
-		break;
-	case NICE_COMPONENT_STATE_FAILED:
-		changeState(State::Failed);
-		break;
-	};
+	changeState(static_cast<State>(state));
 }
 
 string IceTransport::AddressToString(const NiceAddress &addr) {
@@ -647,8 +614,7 @@ void IceTransport::CandidateCallback(NiceAgent *agent, NiceCandidate *candidate,
 	g_free(cand);
 }
 
-void IceTransport::GatheringDoneCallback(NiceAgent * /*agent*/, guint /*streamId*/,
-                                         gpointer userData) {
+void IceTransport::GatheringDoneCallback(NiceAgent *agent, guint streamId, gpointer userData) {
 	auto iceTransport = static_cast<rtc::IceTransport *>(userData);
 	try {
 		iceTransport->processGatheringDone();
@@ -657,8 +623,8 @@ void IceTransport::GatheringDoneCallback(NiceAgent * /*agent*/, guint /*streamId
 	}
 }
 
-void IceTransport::StateChangeCallback(NiceAgent * /*agent*/, guint /*streamId*/,
-                                       guint /*componentId*/, guint state, gpointer userData) {
+void IceTransport::StateChangeCallback(NiceAgent *agent, guint streamId, guint componentId,
+                                       guint state, gpointer userData) {
 	auto iceTransport = static_cast<rtc::IceTransport *>(userData);
 	try {
 		iceTransport->processStateChange(state);
@@ -667,13 +633,11 @@ void IceTransport::StateChangeCallback(NiceAgent * /*agent*/, guint /*streamId*/
 	}
 }
 
-void IceTransport::RecvCallback(NiceAgent * /*agent*/, guint /*streamId*/, guint /*componentId*/,
-                                guint len, gchar *buf, gpointer userData) {
+void IceTransport::RecvCallback(NiceAgent *agent, guint streamId, guint componentId, guint len,
+                                gchar *buf, gpointer userData) {
 	auto iceTransport = static_cast<rtc::IceTransport *>(userData);
 	try {
-		PLOG_VERBOSE << "Incoming size=" << len;
-		auto b = reinterpret_cast<byte *>(buf);
-		iceTransport->incoming(make_message(b, b + len));
+		iceTransport->incoming(reinterpret_cast<byte *>(buf), len);
 	} catch (const std::exception &e) {
 		PLOG_WARNING << e.what();
 	}
@@ -689,8 +653,8 @@ gboolean IceTransport::TimeoutCallback(gpointer userData) {
 	return FALSE;
 }
 
-void IceTransport::LogCallback(const gchar * /*logDomain*/, GLogLevelFlags logLevel,
-                               const gchar *message, gpointer /*userData*/) {
+void IceTransport::LogCallback(const gchar *logDomain, GLogLevelFlags logLevel,
+                               const gchar *message, gpointer userData) {
 	plog::Severity severity;
 	unsigned int flags = logLevel & G_LOG_LEVEL_MASK;
 	if (flags & G_LOG_LEVEL_ERROR)
@@ -734,20 +698,20 @@ bool IceTransport::getSelectedCandidatePair(CandidateInfo *localInfo, CandidateI
 	return true;
 }
 
-CandidateType IceTransport::NiceTypeToCandidateType(NiceCandidateType type) {
+const CandidateType IceTransport::NiceTypeToCandidateType(NiceCandidateType type) {
 	switch (type) {
+	case NiceCandidateType::NICE_CANDIDATE_TYPE_HOST:
+		return CandidateType::Host;
 	case NiceCandidateType::NICE_CANDIDATE_TYPE_PEER_REFLEXIVE:
 		return CandidateType::PeerReflexive;
 	case NiceCandidateType::NICE_CANDIDATE_TYPE_RELAYED:
 		return CandidateType::Relayed;
 	case NiceCandidateType::NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE:
 		return CandidateType::ServerReflexive;
-	default:
-		return CandidateType::Host;
 	}
 }
 
-CandidateTransportType
+const CandidateTransportType
 IceTransport::NiceTransportTypeToCandidateTransportType(NiceCandidateTransport type) {
 	switch (type) {
 	case NiceCandidateTransport::NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE:
@@ -756,7 +720,7 @@ IceTransport::NiceTransportTypeToCandidateTransportType(NiceCandidateTransport t
 		return CandidateTransportType::TcpPassive;
 	case NiceCandidateTransport::NICE_CANDIDATE_TRANSPORT_TCP_SO:
 		return CandidateTransportType::TcpSo;
-	default:
+	case NiceCandidateTransport::NICE_CANDIDATE_TRANSPORT_UDP:
 		return CandidateTransportType::Udp;
 	}
 }

src/icetransport.hpp

@@ -26,7 +26,7 @@
 #include "peerconnection.hpp"
 #include "transport.hpp"
 
-#if !USE_NICE
+#if USE_JUICE
 #include <juice/juice.h>
 #else
 #include <nice/agent.h>
@@ -40,9 +40,29 @@ namespace rtc {
 	
 class IceTransport : public Transport {
 public:
+#if USE_JUICE
+	enum class State : unsigned int{
+	    Disconnected = JUICE_STATE_DISCONNECTED,
+	    Connecting = JUICE_STATE_CONNECTING,
+	    Connected = JUICE_STATE_CONNECTED,
+	    Completed = JUICE_STATE_COMPLETED,
+	    Failed = JUICE_STATE_FAILED,
+	};
+#else
+	enum class State : unsigned int {
+		Disconnected = NICE_COMPONENT_STATE_DISCONNECTED,
+		Connecting = NICE_COMPONENT_STATE_CONNECTING,
+		Connected = NICE_COMPONENT_STATE_CONNECTED,
+		Completed = NICE_COMPONENT_STATE_READY,
+		Failed = NICE_COMPONENT_STATE_FAILED,
+	};
+
+	bool getSelectedCandidatePair(CandidateInfo *local, CandidateInfo *remote);
+#endif
 	enum class GatheringState { New = 0, InProgress = 1, Complete = 2 };
 
 	using candidate_callback = std::function<void(const Candidate &candidate)>;
+	using state_callback = std::function<void(State state)>;
 	using gathering_state_callback = std::function<void(GatheringState state)>;
 
 	IceTransport(const Configuration &config, Description::Role role,
@@ -51,6 +71,7 @@ public:
 	~IceTransport();
 
 	Description::Role role() const;
+	State state() const;
 	GatheringState gatheringState() const;
 	Description getLocalDescription(Description::Type type) const;
 	void setRemoteDescription(const Description &description);
@@ -63,13 +84,12 @@ public:
 	bool stop() override;
 	bool send(message_ptr message) override; // false if dropped
 
-#if USE_NICE
-	bool getSelectedCandidatePair(CandidateInfo *local, CandidateInfo *remote);
-#endif
-
 private:
+	void incoming(message_ptr message) override;
+	void incoming(const byte *data, int size);
 	bool outgoing(message_ptr message) override;
 
+	void changeState(State state);
 	void changeGatheringState(GatheringState state);
 
 	void processStateChange(unsigned int state);
@@ -80,12 +100,14 @@ private:
 	Description::Role mRole;
 	string mMid;
 	std::chrono::milliseconds mTrickleTimeout;
+	std::atomic<State> mState;
 	std::atomic<GatheringState> mGatheringState;
 
 	candidate_callback mCandidateCallback;
+	state_callback mStateChangeCallback;
 	gathering_state_callback mGatheringStateChangeCallback;
 
-#if !USE_NICE
+#if USE_JUICE
 	std::unique_ptr<juice_agent_t, void (*)(juice_agent_t *)> mAgent;
 	string mStunHostname;
 	string mStunService;
@@ -113,9 +135,8 @@ private:
 	static gboolean TimeoutCallback(gpointer userData);
 	static void LogCallback(const gchar *log_domain, GLogLevelFlags log_level, const gchar *message,
 	                        gpointer user_data);
-	static CandidateType NiceTypeToCandidateType(NiceCandidateType type);
-	static CandidateTransportType
-	NiceTransportTypeToCandidateTransportType(NiceCandidateTransport type);
+	static const CandidateType NiceTypeToCandidateType(NiceCandidateType type);
+	static const CandidateTransportType NiceTransportTypeToCandidateTransportType(NiceCandidateTransport type);
 #endif
 };
 

src/init.cpp

@@ -18,128 +18,69 @@
 
 #include "init.hpp"
 
-#include "certificate.hpp"
 #include "dtlstransport.hpp"
 #include "sctptransport.hpp"
-#include "threadpool.hpp"
-#include "tls.hpp"
-
-#if RTC_ENABLE_WEBSOCKET
-#include "tlstransport.hpp"
-#endif
-
-#if RTC_ENABLE_MEDIA
-#include "dtlssrtptransport.hpp"
-#endif
 
 #ifdef _WIN32
 #include <winsock2.h>
 #endif
 
+#if USE_GNUTLS
+// Nothing to do
+#else
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+#endif
+
 using std::shared_ptr;
 
 namespace rtc {
 
-namespace {
+std::weak_ptr<Init> Init::Weak;
+init_token Init::Global;
+std::mutex Init::Mutex;
 
-void doInit() {
-	PLOG_DEBUG << "Global initialization";
+init_token Init::Token() {
+	std::lock_guard lock(Mutex);
 
+	if (!Global) {
+		if (auto token = Weak.lock())
+			Global = token;
+		else
+			Global = shared_ptr<Init>(new Init());
+	}
+	return Global;
+}
+
+void Init::Cleanup() { Global.reset(); }
+
+Init::Init() {
 #ifdef _WIN32
 	WSADATA wsaData;
 	if (WSAStartup(MAKEWORD(2, 2), &wsaData))
 		throw std::runtime_error("WSAStartup failed, error=" + std::to_string(WSAGetLastError()));
 #endif
 
-	ThreadPool::Instance().spawn(THREADPOOL_SIZE);
-
 #if USE_GNUTLS
-	// Nothing to do
+		// Nothing to do
 #else
-	openssl::init();
+	OPENSSL_init_ssl(0, NULL);
+	SSL_load_error_strings();
+	ERR_load_crypto_strings();
 #endif
 
-	SctpTransport::Init();
 	DtlsTransport::Init();
-#if RTC_ENABLE_WEBSOCKET
-	TlsTransport::Init();
-#endif
-#if RTC_ENABLE_MEDIA
-	DtlsSrtpTransport::Init();
-#endif
+	SctpTransport::Init();
 }
 
-void doCleanup() {
-	PLOG_DEBUG << "Global cleanup";
-
-	ThreadPool::Instance().join();
-	CleanupCertificateCache();
-
-	SctpTransport::Cleanup();
+Init::~Init() {
 	DtlsTransport::Cleanup();
-#if RTC_ENABLE_WEBSOCKET
-	TlsTransport::Cleanup();
-#endif
-#if RTC_ENABLE_MEDIA
-	DtlsSrtpTransport::Cleanup();
-#endif
+	SctpTransport::Cleanup();
 
 #ifdef _WIN32
 	WSACleanup();
 #endif
 }
 
-} // namespace
-
-std::weak_ptr<void> Init::Weak;
-std::shared_ptr<void> *Init::Global = nullptr;
-bool Init::Initialized = false;
-std::recursive_mutex Init::Mutex;
-
-init_token Init::Token() {
-	std::unique_lock lock(Mutex);
-	if (auto token = Weak.lock())
-		return token;
-
-	delete Global;
-	Global = new shared_ptr<void>(new Init());
-	Weak = *Global;
-	return *Global;
-}
-
-void Init::Preload() {
-	std::unique_lock lock(Mutex);
-	auto token = Token();
-	if (!Global)
-		Global = new shared_ptr<void>(token);
-
-	PLOG_DEBUG << "Preloading certificate";
-	make_certificate().wait();
-}
-
-void Init::Cleanup() {
-	std::unique_lock lock(Mutex);
-	delete Global;
-	Global = nullptr;
-}
-
-Init::Init() {
-	// Mutex is locked by Token() here
-	if (!std::exchange(Initialized, true))
-		doInit();
-}
-
-Init::~Init() {
-	std::thread t([]() {
-		// We need to lock Mutex ourselves
-		std::unique_lock lock(Mutex);
-		if (Global)
-			return;
-		if (std::exchange(Initialized, false))
-			doCleanup();
-	});
-	t.detach();
-}
-
 } // namespace rtc
 

src/log.cpp

@@ -19,8 +19,6 @@
 #include "log.hpp"
 
 #include "plog/Appenders/ColorConsoleAppender.h"
-#include "plog/Formatters/TxtFormatter.h"
-#include "plog/Init.h"
 #include "plog/Log.h"
 #include "plog/Logger.h"
 

src/message.cpp

@@ -1,60 +0,0 @@
-/**
- * Copyright (c) 2019-2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "message.hpp"
-
-namespace rtc {
-
-message_ptr make_message(size_t size, Message::Type type, unsigned int stream,
-                         std::shared_ptr<Reliability> reliability) {
-	auto message = std::make_shared<Message>(size, type);
-	message->stream = stream;
-	message->reliability = reliability;
-	return message;
-}
-
-message_ptr make_message(binary &&data, Message::Type type, unsigned int stream,
-                         std::shared_ptr<Reliability> reliability) {
-	auto message = std::make_shared<Message>(std::move(data), type);
-	message->stream = stream;
-	message->reliability = reliability;
-	return message;
-}
-
-message_ptr make_message(message_variant data) {
-	return std::visit( //
-	    overloaded{
-	        [&](binary data) { return make_message(std::move(data), Message::Binary); },
-	        [&](string data) {
-		        auto b = reinterpret_cast<const byte *>(data.data());
-		        return make_message(b, b + data.size(), Message::String);
-	        },
-	    },
-	    std::move(data));
-}
-
-message_variant to_variant(Message &&message) {
-	switch (message.type) {
-	case Message::String:
-		return string(reinterpret_cast<const char *>(message.data()), message.size());
-	default:
-		return std::move(message);
-	}
-}
-
-} // namespace rtc

src/peerconnection.cpp

@@ -18,19 +18,12 @@
 
 #include "peerconnection.hpp"
 #include "certificate.hpp"
-#include "include.hpp"
-#include "processor.hpp"
-#include "threadpool.hpp"
-
 #include "dtlstransport.hpp"
 #include "icetransport.hpp"
+#include "include.hpp"
 #include "sctptransport.hpp"
 
-#if RTC_ENABLE_MEDIA
-#include "dtlssrtptransport.hpp"
-#endif
-
-#include <iomanip>
+#include <iostream>
 #include <thread>
 
 namespace rtc {
@@ -40,29 +33,32 @@ using namespace std::placeholders;
 using std::shared_ptr;
 using std::weak_ptr;
 
+template <typename F, typename T, typename... Args> auto weak_bind(F &&f, T *t, Args &&... _args) {
+	return [bound = std::bind(f, t, _args...), weak_this = t->weak_from_this()](auto &&... args) {
+		if (auto shared_this = weak_this.lock())
+			bound(args...);
+	};
+}
+
+template <typename F, typename T, typename... Args>
+auto weak_bind_verifier(F &&f, T *t, Args &&... _args) {
+	return [bound = std::bind(f, t, _args...), weak_this = t->weak_from_this()](auto &&... args) {
+		if (auto shared_this = weak_this.lock())
+			return bound(args...);
+		else
+			return false;
+	};
+}
+
 PeerConnection::PeerConnection() : PeerConnection(Configuration()) {}
 
 PeerConnection::PeerConnection(const Configuration &config)
-    : mConfig(config), mCertificate(make_certificate()), mProcessor(std::make_unique<Processor>()),
-      mState(State::New), mGatheringState(GatheringState::New) {
-	PLOG_VERBOSE << "Creating PeerConnection";
+    : mConfig(config), mCertificate(make_certificate("libdatachannel")), mState(State::New) {}
 
-	if (config.portRangeEnd && config.portRangeBegin > config.portRangeEnd)
-		throw std::invalid_argument("Invalid port range");
-}
-
-PeerConnection::~PeerConnection() {
-	PLOG_VERBOSE << "Destroying PeerConnection";
-	close();
-	mProcessor->join();
-}
+PeerConnection::~PeerConnection() { close(); }
 
 void PeerConnection::close() {
-	PLOG_VERBOSE << "Closing PeerConnection";
-
-	// Close data channels asynchronously
-	mProcessor->enqueue(std::bind(&PeerConnection::closeDataChannels, this));
-
+	closeDataChannels();
 	closeTransports();
 }
 
@@ -82,99 +78,22 @@ std::optional<Description> PeerConnection::remoteDescription() const {
 	return mRemoteDescription;
 }
 
-bool PeerConnection::hasLocalDescription() const {
-	std::lock_guard lock(mLocalDescriptionMutex);
-	return bool(mLocalDescription);
-}
-
-bool PeerConnection::hasRemoteDescription() const {
-	std::lock_guard lock(mRemoteDescriptionMutex);
-	return bool(mRemoteDescription);
-}
-
-bool PeerConnection::hasMedia() const {
-	auto local = localDescription();
-	return local && local->hasAudioOrVideo();
-}
-
-void PeerConnection::setLocalDescription() {
-	PLOG_VERBOSE << "Setting local description";
-
-	if (std::atomic_load(&mIceTransport)) {
-		PLOG_DEBUG << "Local description is already set, ignoring";
-	}
-
-	// RFC 5763: The endpoint that is the offerer MUST use the setup attribute value of
-	// setup:actpass.
-	// See https://tools.ietf.org/html/rfc5763#section-5
-	auto iceTransport = initIceTransport(Description::Role::ActPass);
-	Description localDescription = iceTransport->getLocalDescription(Description::Type::Offer);
-	processLocalDescription(localDescription);
-	iceTransport->gatherLocalCandidates();
-}
-
 void PeerConnection::setRemoteDescription(Description description) {
-	PLOG_VERBOSE << "Setting remote description: " << string(description);
-
-	if (hasRemoteDescription())
-		throw std::logic_error("Remote description is already set");
-
-	if (description.mediaCount() == 0)
-		throw std::invalid_argument("Remote description has no media line");
-
-	int activeMediaCount = 0;
-	for (int i = 0; i < description.mediaCount(); ++i)
-		std::visit( // reciprocate each media
-		    rtc::overloaded{[&](Description::Application *) { ++activeMediaCount; },
-		                    [&](Description::Media *media) {
-			                    if (media->direction() != Description::Direction::Inactive)
-				                    ++activeMediaCount;
-		                    }},
-		    description.media(i));
-
-	if (activeMediaCount == 0)
-		throw std::invalid_argument("Remote description has no active media");
-
-	if (!description.fingerprint())
-		throw std::invalid_argument("Remote description has no fingerprint");
-
-	description.hintType(hasLocalDescription() ? Description::Type::Answer
-	                                           : Description::Type::Offer);
-
-	if (description.type() == Description::Type::Offer) {
-		if (hasLocalDescription()) {
-			PLOG_ERROR << "Got a remote offer description while an answer was expected";
-			throw std::logic_error("Got an unexpected remote offer description");
-		}
-	} else { // Answer
-		if (auto local = localDescription()) {
-			if (description.iceUfrag() == local->iceUfrag() &&
-			    description.icePwd() == local->icePwd())
-				throw std::logic_error("Got the local description as remote description");
-		} else {
-			PLOG_ERROR << "Got a remote answer description while an offer was expected";
-			throw std::logic_error("Got an unexpected remote answer description");
-		}
-	}
-
-	// Candidates will be added at the end, extract them for now
+	description.hintType(localDescription() ? Description::Type::Answer : Description::Type::Offer);
 	auto remoteCandidates = description.extractCandidates();
 
+	std::lock_guard lock(mRemoteDescriptionMutex);
+	mRemoteDescription.emplace(std::move(description));
+
 	auto iceTransport = std::atomic_load(&mIceTransport);
 	if (!iceTransport)
 		iceTransport = initIceTransport(Description::Role::ActPass);
-	iceTransport->setRemoteDescription(description);
 
-	{
-		// Set as remote description
-		std::lock_guard lock(mRemoteDescriptionMutex);
-		mRemoteDescription.emplace(std::move(description));
-	}
+	iceTransport->setRemoteDescription(*mRemoteDescription);
 
-	if (description.type() == Description::Type::Offer) {
+	if (mRemoteDescription->type() == Description::Type::Offer) {
 		// This is an offer and we are the answerer.
-		Description localDescription = iceTransport->getLocalDescription(Description::Type::Answer);
-		processLocalDescription(localDescription);
+		processLocalDescription(iceTransport->getLocalDescription(Description::Type::Answer));
 		iceTransport->gatherLocalCandidates();
 	} else {
 		// This is an answer and we are the offerer.
@@ -201,17 +120,18 @@ void PeerConnection::setRemoteDescription(Description description) {
 }
 
 void PeerConnection::addRemoteCandidate(Candidate candidate) {
-	PLOG_VERBOSE << "Adding remote candidate: " << string(candidate);
+	std::lock_guard lock(mRemoteDescriptionMutex);
 
 	auto iceTransport = std::atomic_load(&mIceTransport);
 	if (!mRemoteDescription || !iceTransport)
 		throw std::logic_error("Remote candidate set without remote description");
 
+	mRemoteDescription->addCandidate(candidate);
+
 	if (candidate.resolve(Candidate::ResolveMode::Simple)) {
 		iceTransport->addRemoteCandidate(candidate);
 	} else {
 		// OK, we might need a lookup, do it asynchronously
-		// We don't use the thread pool because we have no control on the timeout
 		weak_ptr<IceTransport> weakIceTransport{iceTransport};
 		std::thread t([weakIceTransport, candidate]() mutable {
 			if (candidate.resolve(Candidate::ResolveMode::Lookup))
@@ -220,9 +140,6 @@ void PeerConnection::addRemoteCandidate(Candidate candidate) {
 		});
 		t.detach();
 	}
-
-	std::lock_guard lock(mRemoteDescriptionMutex);
-	mRemoteDescription->addCandidate(candidate);
 }
 
 std::optional<string> PeerConnection::localAddress() const {
@@ -235,13 +152,9 @@ std::optional<string> PeerConnection::remoteAddress() const {
 	return iceTransport ? iceTransport->getRemoteAddress() : nullopt;
 }
 
-shared_ptr<DataChannel> PeerConnection::addDataChannel(string label, string protocol,
-                                                       Reliability reliability) {
-	if (auto local = localDescription(); local && !local->hasApplication()) {
-		PLOG_ERROR << "The PeerConnection was negociated without DataChannel support.";
-		throw std::runtime_error("No DataChannel support on the PeerConnection");
-	}
-
+shared_ptr<DataChannel> PeerConnection::createDataChannel(const string &label,
+                                                          const string &protocol,
+                                                          const Reliability &reliability) {
 	// RFC 5763: The answerer MUST use either a setup attribute value of setup:active or
 	// setup:passive. [...] Thus, setup:active is RECOMMENDED.
 	// See https://tools.ietf.org/html/rfc5763#section-5
@@ -249,20 +162,20 @@ shared_ptr<DataChannel> PeerConnection::addDataChannel(string label, string prot
 	auto iceTransport = std::atomic_load(&mIceTransport);
 	auto role = iceTransport ? iceTransport->role() : Description::Role::Passive;
 
-	auto channel =
-	    emplaceDataChannel(role, std::move(label), std::move(protocol), std::move(reliability));
+	auto channel = emplaceDataChannel(role, label, protocol, reliability);
 
-	if (auto transport = std::atomic_load(&mSctpTransport))
-		if (transport->state() == SctpTransport::State::Connected)
-			channel->open(transport);
-
-	return channel;
-}
-
-shared_ptr<DataChannel> PeerConnection::createDataChannel(string label, string protocol,
-                                                          Reliability reliability) {
-	auto channel = addDataChannel(label, protocol, reliability);
-	setLocalDescription();
+	if (!iceTransport) {
+		// RFC 5763: The endpoint that is the offerer MUST use the setup attribute value of
+		// setup:actpass.
+		// See https://tools.ietf.org/html/rfc5763#section-5
+		iceTransport = initIceTransport(Description::Role::ActPass);
+		processLocalDescription(iceTransport->getLocalDescription(Description::Type::Offer));
+		iceTransport->gatherLocalCandidates();
+	} else {
+		if (auto transport = std::atomic_load(&mSctpTransport))
+			if (transport->state() == SctpTransport::State::Connected)
+				channel->open(transport);
+	}
 	return channel;
 }
 
@@ -271,11 +184,12 @@ void PeerConnection::onDataChannel(
 	mDataChannelCallback = callback;
 }
 
-void PeerConnection::onLocalDescription(std::function<void(Description description)> callback) {
+void PeerConnection::onLocalDescription(
+    std::function<void(const Description &description)> callback) {
 	mLocalDescriptionCallback = callback;
 }
 
-void PeerConnection::onLocalCandidate(std::function<void(Candidate candidate)> callback) {
+void PeerConnection::onLocalCandidate(std::function<void(const Candidate &candidate)> callback) {
 	mLocalCandidateCallback = callback;
 }
 
@@ -287,28 +201,6 @@ void PeerConnection::onGatheringStateChange(std::function<void(GatheringState st
 	mGatheringStateChangeCallback = callback;
 }
 
-std::shared_ptr<Track> PeerConnection::addTrack(Description::Media description) {
-	if (hasLocalDescription())
-		throw std::logic_error("Tracks must be created before local description");
-
-	if (auto it = mTracks.find(description.mid()); it != mTracks.end())
-		if (auto track = it->second.lock())
-			return track;
-
-#if !RTC_ENABLE_MEDIA
-	if (mTracks.empty()) {
-		PLOG_WARNING << "Tracks will be inative (not compiled with SRTP support)";
-	}
-#endif
-	auto track = std::make_shared<Track>(std::move(description));
-	mTracks.emplace(std::make_pair(track->mid(), track));
-	return track;
-}
-
-void PeerConnection::onTrack(std::function<void(std::shared_ptr<Track>)> callback) {
-	mTrackCallback = callback;
-}
-
 shared_ptr<IceTransport> PeerConnection::initIceTransport(Description::Role role) {
 	try {
 		if (auto transport = std::atomic_load(&mIceTransport))
@@ -359,9 +251,9 @@ shared_ptr<IceTransport> PeerConnection::initIceTransport(Description::Role role
 		std::atomic_store(&mIceTransport, transport);
 		if (mState == State::Closed) {
 			mIceTransport.reset();
+			transport->stop();
 			throw std::runtime_error("Connection is closed");
 		}
-		transport->start();
 		return transport;
 
 	} catch (const std::exception &e) {
@@ -376,62 +268,35 @@ shared_ptr<DtlsTransport> PeerConnection::initDtlsTransport() {
 		if (auto transport = std::atomic_load(&mDtlsTransport))
 			return transport;
 
-		auto certificate = mCertificate.get();
 		auto lower = std::atomic_load(&mIceTransport);
-		auto verifierCallback = weak_bind(&PeerConnection::checkFingerprint, this, _1);
-		auto stateChangeCallback = [this,
-		                            weak_this = weak_from_this()](DtlsTransport::State state) {
-			auto shared_this = weak_this.lock();
-			if (!shared_this)
-				return;
-
-			switch (state) {
-			case DtlsTransport::State::Connected:
-				if (auto local = localDescription(); local && local->hasApplication())
-					initSctpTransport();
-				else
-					changeState(State::Connected);
-
-				openTracks();
-				break;
-			case DtlsTransport::State::Failed:
-				changeState(State::Failed);
-				break;
-			case DtlsTransport::State::Disconnected:
-				changeState(State::Disconnected);
-				break;
-			default:
-				// Ignore
-				break;
-			}
-		};
-
-		shared_ptr<DtlsTransport> transport;
-		if (hasMedia()) {
-#if RTC_ENABLE_MEDIA
-			PLOG_INFO << "This connection requires media support";
-
-			// DTLS-SRTP
-			transport = std::make_shared<DtlsSrtpTransport>(
-			    lower, certificate, verifierCallback,
-			    std::bind(&PeerConnection::forwardMedia, this, _1), stateChangeCallback);
-#else
-			PLOG_WARNING << "Ignoring media support (not compiled with SRTP support)";
-#endif
-		}
-
-		if (!transport) {
-			// DTLS only
-			transport = std::make_shared<DtlsTransport>(lower, certificate, verifierCallback,
-			                                            stateChangeCallback);
-		}
+		auto transport = std::make_shared<DtlsTransport>(
+		    lower, mCertificate, weak_bind_verifier(&PeerConnection::checkFingerprint, this, _1),
+		    [this, weak_this = weak_from_this()](DtlsTransport::State state) {
+			    auto shared_this = weak_this.lock();
+			    if (!shared_this)
+				    return;
+			    switch (state) {
+			    case DtlsTransport::State::Connected:
+				    initSctpTransport();
+				    break;
+			    case DtlsTransport::State::Failed:
+				    changeState(State::Failed);
+				    break;
+			    case DtlsTransport::State::Disconnected:
+				    changeState(State::Disconnected);
+				    break;
+			    default:
+				    // Ignore
+				    break;
+			    }
+		    });
 
 		std::atomic_store(&mDtlsTransport, transport);
 		if (mState == State::Closed) {
 			mDtlsTransport.reset();
+			transport->stop();
 			throw std::runtime_error("Connection is closed");
 		}
-		transport->start();
 		return transport;
 
 	} catch (const std::exception &e) {
@@ -446,11 +311,7 @@ shared_ptr<SctpTransport> PeerConnection::initSctpTransport() {
 		if (auto transport = std::atomic_load(&mSctpTransport))
 			return transport;
 
-		auto remote = remoteDescription();
-		if (!remote || !remote->application())
-			throw std::logic_error("Initializing SCTP transport without application description");
-
-		uint16_t sctpPort = remote->application()->sctpPort().value_or(DEFAULT_SCTP_PORT);
+		uint16_t sctpPort = remoteDescription()->sctpPort().value_or(DEFAULT_SCTP_PORT);
 		auto lower = std::atomic_load(&mDtlsTransport);
 		auto transport = std::make_shared<SctpTransport>(
 		    lower, sctpPort, weak_bind(&PeerConnection::forwardMessage, this, _1),
@@ -465,7 +326,6 @@ shared_ptr<SctpTransport> PeerConnection::initSctpTransport() {
 				    openDataChannels();
 				    break;
 			    case SctpTransport::State::Failed:
-				    LOG_WARNING << "SCTP transport failed";
 				    remoteCloseDataChannels();
 				    changeState(State::Failed);
 				    break;
@@ -482,9 +342,9 @@ shared_ptr<SctpTransport> PeerConnection::initSctpTransport() {
 		std::atomic_store(&mSctpTransport, transport);
 		if (mState == State::Closed) {
 			mSctpTransport.reset();
+			transport->stop();
 			throw std::runtime_error("Connection is closed");
 		}
-		transport->start();
 		return transport;
 
 	} catch (const std::exception &e) {
@@ -495,21 +355,18 @@ shared_ptr<SctpTransport> PeerConnection::initSctpTransport() {
 }
 
 void PeerConnection::closeTransports() {
-	PLOG_VERBOSE << "Closing transports";
-
-	// Change state to sink state Closed
+	// Change state to sink state Closed to block init methods
 	changeState(State::Closed);
 
 	// Reset callbacks now that state is changed
 	resetCallbacks();
 
-	// Initiate transport stop on the processor after closing the data channels
-	mProcessor->enqueue([this]() {
-		// Pass the pointers to a thread
-		auto sctp = std::atomic_exchange(&mSctpTransport, decltype(mSctpTransport)(nullptr));
-		auto dtls = std::atomic_exchange(&mDtlsTransport, decltype(mDtlsTransport)(nullptr));
-		auto ice = std::atomic_exchange(&mIceTransport, decltype(mIceTransport)(nullptr));
-		ThreadPool::Instance().enqueue([sctp, dtls, ice]() mutable {
+	// Pass the references to a thread, allowing to terminate a transport from its own thread
+	auto sctp = std::atomic_exchange(&mSctpTransport, decltype(mSctpTransport)(nullptr));
+	auto dtls = std::atomic_exchange(&mDtlsTransport, decltype(mDtlsTransport)(nullptr));
+	auto ice = std::atomic_exchange(&mIceTransport, decltype(mIceTransport)(nullptr));
+	if (sctp || dtls || ice) {
+		std::thread t([sctp, dtls, ice]() mutable {
 			if (sctp)
 				sctp->stop();
 			if (dtls)
@@ -521,7 +378,8 @@ void PeerConnection::closeTransports() {
 			dtls.reset();
 			ice.reset();
 		});
-	});
+		t.detach();
+	}
 }
 
 void PeerConnection::endLocalCandidates() {
@@ -545,7 +403,7 @@ void PeerConnection::forwardMessage(message_ptr message) {
 		return;
 	}
 
-	auto channel = findDataChannel(uint16_t(message->stream));
+	auto channel = findDataChannel(message->stream);
 
 	auto iceTransport = std::atomic_load(&mIceTransport);
 	auto sctpTransport = std::atomic_load(&mSctpTransport);
@@ -563,8 +421,8 @@ void PeerConnection::forwardMessage(message_ptr message) {
 			                          weak_ptr<DataChannel>{channel}));
 			mDataChannels.insert(std::make_pair(message->stream, channel));
 		} else {
-			// Invalid, close the DataChannel
-			sctpTransport->closeStream(message->stream);
+			// Invalid, close the DataChannel by resetting the stream
+			sctpTransport->reset(message->stream);
 			return;
 		}
 	}
@@ -572,67 +430,15 @@ void PeerConnection::forwardMessage(message_ptr message) {
 	channel->incoming(message);
 }
 
-void PeerConnection::forwardMedia(message_ptr message) {
-	if (!message)
-		return;
-
-	if (message->type == Message::Type::Control) {
-		std::shared_lock lock(mTracksMutex); // read-only
-		for (auto it = mTracks.begin(); it != mTracks.end(); ++it)
-			if (auto track = it->second.lock())
-				return track->incoming(message);
-
-		PLOG_WARNING << "No track available to receive control, dropping";
-		return;
-	}
-
-	unsigned int payloadType = message->stream;
-	std::optional<string> mid;
-	if (auto it = mMidFromPayloadType.find(payloadType); it != mMidFromPayloadType.end()) {
-		mid = it->second;
-	} else {
-		std::lock_guard lock(mLocalDescriptionMutex);
-		if (!mLocalDescription)
-			return;
-
-		for (int i = 0; i < mLocalDescription->mediaCount(); ++i) {
-			if (auto found = std::visit(
-			        rtc::overloaded{[&](Description::Application *) -> std::optional<string> {
-				                        return std::nullopt;
-			                        },
-			                        [&](Description::Media *media) -> std::optional<string> {
-				                        return media->hasPayloadType(payloadType)
-				                                   ? std::make_optional(media->mid())
-				                                   : nullopt;
-			                        }},
-			        mLocalDescription->media(i))) {
-
-				mMidFromPayloadType.emplace(payloadType, *found);
-				mid = *found;
-				break;
-			}
-		}
-	}
-
-	if (!mid) {
-		PLOG_WARNING << "Track not found for payload type " << payloadType << ", dropping";
-		return;
-	}
-
-	std::shared_lock lock(mTracksMutex); // read-only
-	if (auto it = mTracks.find(*mid); it != mTracks.end())
-		if (auto track = it->second.lock())
-			track->incoming(message);
-}
-
 void PeerConnection::forwardBufferedAmount(uint16_t stream, size_t amount) {
 	if (auto channel = findDataChannel(stream))
 		channel->triggerBufferedAmount(amount);
 }
 
-shared_ptr<DataChannel> PeerConnection::emplaceDataChannel(Description::Role role, string label,
-                                                           string protocol,
-                                                           Reliability reliability) {
+shared_ptr<DataChannel> PeerConnection::emplaceDataChannel(Description::Role role,
+                                                           const string &label,
+                                                           const string &protocol,
+                                                           const Reliability &reliability) {
 	// The active side must use streams with even identifiers, whereas the passive side must use
 	// streams with odd identifiers.
 	// See https://tools.ietf.org/html/draft-ietf-rtcweb-data-protocol-09#section-6
@@ -643,8 +449,8 @@ shared_ptr<DataChannel> PeerConnection::emplaceDataChannel(Description::Role rol
 		if (stream >= 65535)
 			throw std::runtime_error("Too many DataChannels");
 	}
-	auto channel = std::make_shared<DataChannel>(shared_from_this(), stream, std::move(label),
-	                                             std::move(protocol), std::move(reliability));
+	auto channel =
+	    std::make_shared<DataChannel>(shared_from_this(), stream, label, protocol, reliability);
 	mDataChannels.emplace(std::make_pair(stream, channel));
 	return channel;
 }
@@ -701,132 +507,18 @@ void PeerConnection::remoteCloseDataChannels() {
 	iterateDataChannels([&](shared_ptr<DataChannel> channel) { channel->remoteClose(); });
 }
 
-void PeerConnection::incomingTrack(Description::Media description) {
-	std::unique_lock lock(mTracksMutex); // we are going to emplace
-#if !RTC_ENABLE_MEDIA
-	if (mTracks.empty()) {
-		PLOG_WARNING << "Tracks will be inative (not compiled with SRTP support)";
-	}
-#endif
-	if (mTracks.find(description.mid()) == mTracks.end()) {
-		auto track = std::make_shared<Track>(std::move(description));
-		mTracks.emplace(std::make_pair(track->mid(), track));
-		triggerTrack(std::move(track));
-	}
-}
-
-void PeerConnection::openTracks() {
-#if RTC_ENABLE_MEDIA
-	if (auto transport = std::atomic_load(&mDtlsTransport)) {
-		auto srtpTransport = std::reinterpret_pointer_cast<DtlsSrtpTransport>(transport);
-		std::shared_lock lock(mTracksMutex); // read-only
-		for (auto it = mTracks.begin(); it != mTracks.end(); ++it)
-			if (auto track = it->second.lock())
-				track->open(srtpTransport);
-	}
-#endif
-}
-
-
 void PeerConnection::processLocalDescription(Description description) {
-	int activeMediaCount = 0;
+	std::optional<uint16_t> remoteSctpPort;
+	if (auto remote = remoteDescription())
+		remoteSctpPort = remote->sctpPort();
 
-	if (hasLocalDescription())
-		throw std::logic_error("Local description is already set");
+	std::lock_guard lock(mLocalDescriptionMutex);
+	mLocalDescription.emplace(std::move(description));
+	mLocalDescription->setFingerprint(mCertificate->fingerprint());
+	mLocalDescription->setSctpPort(remoteSctpPort.value_or(DEFAULT_SCTP_PORT));
+	mLocalDescription->setMaxMessageSize(LOCAL_MAX_MESSAGE_SIZE);
 
-	if (auto remote = remoteDescription()) {
-		// Reciprocate remote description
-		for (int i = 0; i < remote->mediaCount(); ++i)
-			std::visit( // reciprocate each media
-			    rtc::overloaded{
-			        [&](Description::Application *app) {
-				        auto reciprocated = app->reciprocate();
-				        reciprocated.hintSctpPort(DEFAULT_SCTP_PORT);
-				        reciprocated.setMaxMessageSize(LOCAL_MAX_MESSAGE_SIZE);
-				        ++activeMediaCount;
-
-				        PLOG_DEBUG << "Reciprocating application in local description, mid=\""
-				                   << reciprocated.mid() << "\"";
-
-				        description.addMedia(std::move(reciprocated));
-			        },
-			        [&](Description::Media *media) {
-				        auto reciprocated = media->reciprocate();
-#if RTC_ENABLE_MEDIA
-				        if (reciprocated.direction() != Description::Direction::Inactive)
-					        ++activeMediaCount;
-#else
-				        // No media support, mark as inactive
-				        reciprocated.setDirection(Description::Direction::Inactive);
-#endif
-				        incomingTrack(reciprocated);
-
-				        PLOG_DEBUG
-				            << "Reciprocating media in local description, mid=\""
-				            << reciprocated.mid() << "\", active=" << std::boolalpha
-				            << (reciprocated.direction() != Description::Direction::Inactive);
-
-				        description.addMedia(std::move(reciprocated));
-			        },
-			    },
-			    remote->media(i));
-	} else {
-		// Add application for data channels
-		{
-			std::shared_lock lock(mDataChannelsMutex);
-			if (!mDataChannels.empty()) {
-				Description::Application app("data");
-				app.setSctpPort(DEFAULT_SCTP_PORT);
-				app.setMaxMessageSize(LOCAL_MAX_MESSAGE_SIZE);
-				++activeMediaCount;
-
-				PLOG_DEBUG << "Adding application to local description, mid=\"" << app.mid()
-				           << "\"";
-
-				description.addMedia(std::move(app));
-			}
-		}
-
-		// Add media for local tracks
-		{
-			std::shared_lock lock(mTracksMutex);
-			for (auto it = mTracks.begin(); it != mTracks.end(); ++it) {
-				if (auto track = it->second.lock()) {
-					auto media = track->description();
-#if RTC_ENABLE_MEDIA
-					if (media.direction() != Description::Direction::Inactive)
-						++activeMediaCount;
-#else
-					// No media support, mark as inactive
-					media.setDirection(Description::Direction::Inactive);
-#endif
-					PLOG_DEBUG << "Adding media to local description, mid=\"" << media.mid()
-					           << "\", active=" << std::boolalpha
-					           << (media.direction() != Description::Direction::Inactive);
-
-					description.addMedia(std::move(media));
-				}
-			}
-		}
-	}
-
-	// There must be at least one active media to negociate
-	if (activeMediaCount == 0)
-		throw std::runtime_error("Nothing to negociate");
-
-	// Set local fingerprint (wait for certificate if necessary)
-	description.setFingerprint(mCertificate.get()->fingerprint());
-
-	{
-		// Set as local description
-		std::lock_guard lock(mLocalDescriptionMutex);
-		mLocalDescription.emplace(std::move(description));
-	}
-
-	mProcessor->enqueue([this, description = *mLocalDescription]() {
-		PLOG_VERBOSE << "Issuing local description: " << description;
-		mLocalDescriptionCallback(std::move(description));
-	});
+	mLocalDescriptionCallback(*mLocalDescription);
 }
 
 void PeerConnection::processLocalCandidate(Candidate candidate) {
@@ -836,10 +528,7 @@ void PeerConnection::processLocalCandidate(Candidate candidate) {
 
 	mLocalDescription->addCandidate(candidate);
 
-	mProcessor->enqueue([this, candidate = std::move(candidate)]() {
-		PLOG_VERBOSE << "Issuing local candidate: " << candidate;
-		mLocalCandidateCallback(std::move(candidate));
-	});
+	mLocalCandidateCallback(candidate);
 }
 
 void PeerConnection::triggerDataChannel(weak_ptr<DataChannel> weakDataChannel) {
@@ -847,12 +536,7 @@ void PeerConnection::triggerDataChannel(weak_ptr<DataChannel> weakDataChannel) {
 	if (!dataChannel)
 		return;
 
-	mProcessor->enqueue(
-	    [this, dataChannel = std::move(dataChannel)]() { mDataChannelCallback(dataChannel); });
-}
-
-void PeerConnection::triggerTrack(std::shared_ptr<Track> track) {
-	mProcessor->enqueue([this, track = std::move(track)]() { mTrackCallback(track); });
+	mDataChannelCallback(dataChannel);
 }
 
 bool PeerConnection::changeState(State state) {
@@ -866,18 +550,13 @@ bool PeerConnection::changeState(State state) {
 
 	} while (!mState.compare_exchange_weak(current, state));
 
-	if (state == State::Closed)
-		// This is the last state change, so we may steal the callback
-		mProcessor->enqueue([cb = std::move(mStateChangeCallback)]() { cb(State::Closed); });
-	else
-		mProcessor->enqueue([this, state]() { mStateChangeCallback(state); });
-
+	mStateChangeCallback(state);
 	return true;
 }
 
 bool PeerConnection::changeGatheringState(GatheringState state) {
 	if (mGatheringState.exchange(state) != state)
-		mProcessor->enqueue([this, state] { mGatheringStateChangeCallback(state); });
+		mGatheringStateChangeCallback(state);
 	return true;
 }
 
@@ -890,13 +569,12 @@ void PeerConnection::resetCallbacks() {
 	mGatheringStateChangeCallback = nullptr;
 }
 
-bool PeerConnection::getSelectedCandidatePair([[maybe_unused]] CandidateInfo *local,
-                                              [[maybe_unused]] CandidateInfo *remote) {
-#if USE_NICE
+bool PeerConnection::getSelectedCandidatePair(CandidateInfo *local, CandidateInfo *remote) {
+#if not USE_JUICE
 	auto iceTransport = std::atomic_load(&mIceTransport);
 	return iceTransport->getSelectedCandidatePair(local, remote);
 #else
-	PLOG_WARNING << "getSelectedCandidatePair() is only implemented with libnice as ICE backend";
+	PLOG_WARNING << "getSelectedCandidatePair is not implemented for libjuice";
 	return false;
 #endif
 }

src/processor.cpp

@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "processor.hpp"
-
-namespace rtc {
-
-Processor::~Processor() { join(); }
-
-void Processor::join() {
-	std::unique_lock lock(mMutex);
-	mCondition.wait(lock, [this]() { return !mPending && mTasks.empty(); });
-}
-
-void Processor::schedule() {
-	std::unique_lock lock(mMutex);
-	if (mTasks.empty()) {
-		// No more tasks
-		mPending = false;
-		mCondition.notify_all();
-		return;
-	}
-
-	ThreadPool::Instance().enqueue(std::move(mTasks.front()));
-	mTasks.pop();
-}
-
-} // namespace rtc
-

src/processor.hpp

@@ -1,92 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef RTC_PROCESSOR_H
-#define RTC_PROCESSOR_H
-
-#include "include.hpp"
-#include "init.hpp"
-#include "threadpool.hpp"
-
-#include <condition_variable>
-#include <future>
-#include <memory>
-#include <mutex>
-#include <queue>
-
-namespace rtc {
-
-// Processed tasks in order by delegating them to the thread pool
-class Processor final {
-public:
-	Processor() = default;
-	~Processor();
-
-	Processor(const Processor &) = delete;
-	Processor &operator=(const Processor &) = delete;
-	Processor(Processor &&) = delete;
-	Processor &operator=(Processor &&) = delete;
-
-	void join();
-
-	template <class F, class... Args>
-	auto enqueue(F &&f, Args &&... args) -> invoke_future_t<F, Args...>;
-
-protected:
-	void schedule();
-
-	// Keep an init token
-	const init_token mInitToken = Init::Token();
-
-	std::queue<std::function<void()>> mTasks;
-	bool mPending = false; // true iff a task is pending in the thread pool
-
-	mutable std::mutex mMutex;
-	std::condition_variable mCondition;
-};
-
-template <class F, class... Args>
-auto Processor::enqueue(F &&f, Args &&... args) -> invoke_future_t<F, Args...> {
-	std::unique_lock lock(mMutex);
-	using R = std::invoke_result_t<std::decay_t<F>, std::decay_t<Args>...>;
-	auto task = std::make_shared<std::packaged_task<R()>>(
-	    std::bind(std::forward<F>(f), std::forward<Args>(args)...));
-	std::future<R> result = task->get_future();
-
-	auto bundle = [this, task = std::move(task)]() {
-		try {
-			(*task)();
-		} catch (const std::exception &e) {
-			PLOG_WARNING << "Unhandled exception in task: " << e.what();
-		}
-		schedule(); // chain the next task
-	};
-
-	if (!mPending) {
-		ThreadPool::Instance().enqueue(std::move(bundle));
-		mPending = true;
-	} else {
-		mTasks.emplace(std::move(bundle));
-	}
-
-	return result;
-}
-
-} // namespace rtc
-
-#endif

src/rtc.cpp

@@ -0,0 +1,452 @@
+/**
+ * Copyright (c) 2019 Paul-Louis Ageneau
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "datachannel.hpp"
+#include "include.hpp"
+#include "peerconnection.hpp"
+
+#include <rtc.h>
+
+#include <exception>
+#include <mutex>
+#include <unordered_map>
+#include <utility>
+
+using namespace rtc;
+using std::shared_ptr;
+using std::string;
+
+#define CATCH(statement)                                                                           \
+	try {                                                                                          \
+		statement;                                                                                 \
+	} catch (const std::exception &e) {                                                            \
+		PLOG_ERROR << e.what();                                                                    \
+		return -1;                                                                                 \
+	}
+
+namespace {
+
+std::unordered_map<int, shared_ptr<PeerConnection>> peerConnectionMap;
+std::unordered_map<int, shared_ptr<DataChannel>> dataChannelMap;
+std::unordered_map<int, void *> userPointerMap;
+std::mutex mutex;
+int lastId = 0;
+
+void *getUserPointer(int id) {
+	std::lock_guard lock(mutex);
+	auto it = userPointerMap.find(id);
+	return it != userPointerMap.end() ? it->second : nullptr;
+}
+
+void setUserPointer(int i, void *ptr) {
+	std::lock_guard lock(mutex);
+	if (ptr)
+		userPointerMap.insert(std::make_pair(i, ptr));
+	else
+		userPointerMap.erase(i);
+}
+
+shared_ptr<PeerConnection> getPeerConnection(int id) {
+	std::lock_guard lock(mutex);
+	auto it = peerConnectionMap.find(id);
+	return it != peerConnectionMap.end() ? it->second : nullptr;
+}
+
+shared_ptr<DataChannel> getDataChannel(int id) {
+	std::lock_guard lock(mutex);
+	auto it = dataChannelMap.find(id);
+	return it != dataChannelMap.end() ? it->second : nullptr;
+}
+
+int emplacePeerConnection(shared_ptr<PeerConnection> ptr) {
+	std::lock_guard lock(mutex);
+	int pc = ++lastId;
+	peerConnectionMap.emplace(std::make_pair(pc, ptr));
+	return pc;
+}
+
+int emplaceDataChannel(shared_ptr<DataChannel> ptr) {
+	std::lock_guard lock(mutex);
+	int dc = ++lastId;
+	dataChannelMap.emplace(std::make_pair(dc, ptr));
+	return dc;
+}
+
+bool erasePeerConnection(int pc) {
+	std::lock_guard lock(mutex);
+	if (peerConnectionMap.erase(pc) == 0)
+		return false;
+	userPointerMap.erase(pc);
+	return true;
+}
+
+bool eraseDataChannel(int dc) {
+	std::lock_guard lock(mutex);
+	if (dataChannelMap.erase(dc) == 0)
+		return false;
+	userPointerMap.erase(dc);
+	return true;
+}
+
+} // namespace
+
+void rtcInitLogger(rtcLogLevel level) { InitLogger(static_cast<LogLevel>(level)); }
+
+void rtcSetUserPointer(int i, void *ptr) { setUserPointer(i, ptr); }
+
+int rtcCreatePeerConnection(const rtcConfiguration *config) {
+	Configuration c;
+	for (int i = 0; i < config->iceServersCount; ++i)
+		c.iceServers.emplace_back(string(config->iceServers[i]));
+
+	if (config->portRangeBegin || config->portRangeEnd) {
+		c.portRangeBegin = config->portRangeBegin;
+		c.portRangeEnd = config->portRangeEnd;
+	}
+
+	return emplacePeerConnection(std::make_shared<PeerConnection>(c));
+}
+
+int rtcDeletePeerConnection(int pc) {
+	auto peerConnection = getPeerConnection(pc);
+	if (!peerConnection)
+		return -1;
+
+	peerConnection->onDataChannel(nullptr);
+	peerConnection->onLocalDescription(nullptr);
+	peerConnection->onLocalCandidate(nullptr);
+	peerConnection->onStateChange(nullptr);
+	peerConnection->onGatheringStateChange(nullptr);
+
+	erasePeerConnection(pc);
+	return 0;
+}
+
+int rtcCreateDataChannel(int pc, const char *label) {
+	auto peerConnection = getPeerConnection(pc);
+	if (!peerConnection)
+		return -1;
+
+	int dc = emplaceDataChannel(peerConnection->createDataChannel(string(label)));
+	void *ptr = getUserPointer(pc);
+	rtcSetUserPointer(dc, ptr);
+	return dc;
+}
+
+int rtcDeleteDataChannel(int dc) {
+	auto dataChannel = getDataChannel(dc);
+	if (!dataChannel)
+		return -1;
+
+	dataChannel->onOpen(nullptr);
+	dataChannel->onClosed(nullptr);
+	dataChannel->onError(nullptr);
+	dataChannel->onMessage(nullptr);
+	dataChannel->onBufferedAmountLow(nullptr);
+	dataChannel->onAvailable(nullptr);
+
+	eraseDataChannel(dc);
+	return 0;
+}
+
+int rtcSetDataChannelCallback(int pc, dataChannelCallbackFunc cb) {
+	auto peerConnection = getPeerConnection(pc);
+	if (!peerConnection)
+		return -1;
+
+	if (cb)
+		peerConnection->onDataChannel([pc, cb](std::shared_ptr<DataChannel> dataChannel) {
+			int dc = emplaceDataChannel(dataChannel);
+			void *ptr = getUserPointer(pc);
+			rtcSetUserPointer(dc, ptr);
+			cb(dc, ptr);
+		});
+	else
+		peerConnection->onDataChannel(nullptr);
+	return 0;
+}
+
+int rtcSetLocalDescriptionCallback(int pc, descriptionCallbackFunc cb) {
+	auto peerConnection = getPeerConnection(pc);
+	if (!peerConnection)
+		return -1;
+
+	if (cb)
+		peerConnection->onLocalDescription([pc, cb](const Description &desc) {
+			cb(string(desc).c_str(), desc.typeString().c_str(), getUserPointer(pc));
+		});
+	else
+		peerConnection->onLocalDescription(nullptr);
+	return 0;
+}
+
+int rtcSetLocalCandidateCallback(int pc, candidateCallbackFunc cb) {
+	auto peerConnection = getPeerConnection(pc);
+	if (!peerConnection)
+		return -1;
+
+	if (cb)
+		peerConnection->onLocalCandidate([pc, cb](const Candidate &cand) {
+			cb(cand.candidate().c_str(), cand.mid().c_str(), getUserPointer(pc));
+		});
+	else
+		peerConnection->onLocalCandidate(nullptr);
+	return 0;
+}
+
+int rtcSetStateChangeCallback(int pc, stateChangeCallbackFunc cb) {
+	auto peerConnection = getPeerConnection(pc);
+	if (!peerConnection)
+		return -1;
+
+	if (cb)
+		peerConnection->onStateChange([pc, cb](PeerConnection::State state) {
+			cb(static_cast<rtcState>(state), getUserPointer(pc));
+		});
+	else
+		peerConnection->onStateChange(nullptr);
+	return 0;
+}
+
+int rtcSetGatheringStateChangeCallback(int pc, gatheringStateCallbackFunc cb) {
+	auto peerConnection = getPeerConnection(pc);
+	if (!peerConnection)
+		return -1;
+
+	if (cb)
+		peerConnection->onGatheringStateChange([pc, cb](PeerConnection::GatheringState state) {
+			cb(static_cast<rtcGatheringState>(state), getUserPointer(pc));
+		});
+	else
+		peerConnection->onGatheringStateChange(nullptr);
+	return 0;
+}
+
+int rtcSetRemoteDescription(int pc, const char *sdp, const char *type) {
+	auto peerConnection = getPeerConnection(pc);
+	if (!peerConnection)
+		return -1;
+
+	CATCH(peerConnection->setRemoteDescription({string(sdp), type ? string(type) : ""}));
+	return 0;
+}
+
+int rtcAddRemoteCandidate(int pc, const char *cand, const char *mid) {
+	auto peerConnection = getPeerConnection(pc);
+	if (!peerConnection)
+		return -1;
+
+	CATCH(peerConnection->addRemoteCandidate({string(cand), mid ? string(mid) : ""}))
+	return 0;
+}
+
+int rtcGetLocalAddress(int pc, char *buffer, int size) {
+	auto peerConnection = getPeerConnection(pc);
+	if (!peerConnection)
+		return -1;
+
+	if (auto addr = peerConnection->localAddress()) {
+		size = std::min(size_t(size - 1), addr->size());
+		std::copy(addr->data(), addr->data() + size, buffer);
+		buffer[size] = '\0';
+		return size + 1;
+	}
+	return -1;
+}
+
+int rtcGetRemoteAddress(int pc, char *buffer, int size) {
+	auto peerConnection = getPeerConnection(pc);
+	if (!peerConnection)
+		return -1;
+
+	if (auto addr = peerConnection->remoteAddress()) {
+		size = std::min(size_t(size - 1), addr->size());
+		std::copy(addr->data(), addr->data() + size, buffer);
+		buffer[size] = '\0';
+		return size + 1;
+	}
+	return -1;
+}
+
+int rtcGetDataChannelLabel(int dc, char *buffer, int size) {
+	auto dataChannel = getDataChannel(dc);
+	if (!dataChannel)
+		return -1;
+
+	if (!size)
+		return 0;
+
+	string label = dataChannel->label();
+	size = std::min(size_t(size - 1), label.size());
+	std::copy(label.data(), label.data() + size, buffer);
+	buffer[size] = '\0';
+	return size + 1;
+}
+
+int rtcSetOpenCallback(int dc, openCallbackFunc cb) {
+	auto dataChannel = getDataChannel(dc);
+	if (!dataChannel)
+		return -1;
+
+	if (cb)
+		dataChannel->onOpen([dc, cb]() { cb(getUserPointer(dc)); });
+	else
+		dataChannel->onOpen(nullptr);
+	return 0;
+}
+
+int rtcSetClosedCallback(int dc, closedCallbackFunc cb) {
+	auto dataChannel = getDataChannel(dc);
+	if (!dataChannel)
+		return -1;
+
+	if (cb)
+		dataChannel->onClosed([dc, cb]() { cb(getUserPointer(dc)); });
+	else
+		dataChannel->onClosed(nullptr);
+	return 0;
+}
+
+int rtcSetErrorCallback(int dc, errorCallbackFunc cb) {
+	auto dataChannel = getDataChannel(dc);
+	if (!dataChannel)
+		return -1;
+
+	if (cb)
+		dataChannel->onError(
+		    [dc, cb](const string &error) { cb(error.c_str(), getUserPointer(dc)); });
+	else
+		dataChannel->onError(nullptr);
+	return 0;
+}
+
+int rtcSetMessageCallback(int dc, messageCallbackFunc cb) {
+	auto dataChannel = getDataChannel(dc);
+	if (!dataChannel)
+		return -1;
+
+	if (cb)
+		dataChannel->onMessage(
+		    [dc, cb](const binary &b) {
+			    cb(reinterpret_cast<const char *>(b.data()), b.size(), getUserPointer(dc));
+		    },
+		    [dc, cb](const string &s) { cb(s.c_str(), -1, getUserPointer(dc)); });
+	else
+		dataChannel->onMessage(nullptr);
+
+	return 0;
+}
+
+int rtcSendMessage(int dc, const char *data, int size) {
+	auto dataChannel = getDataChannel(dc);
+	if (!dataChannel)
+		return -1;
+
+	if (size >= 0) {
+		auto b = reinterpret_cast<const byte *>(data);
+		CATCH(dataChannel->send(b, size));
+		return size;
+	} else {
+		string s(data);
+		CATCH(dataChannel->send(s));
+		return s.size();
+	}
+}
+
+int rtcGetBufferedAmount(int dc) {
+	auto dataChannel = getDataChannel(dc);
+	if (!dataChannel)
+		return -1;
+
+	CATCH(return int(dataChannel->bufferedAmount()));
+}
+
+int rtcSetBufferedAmountLowThreshold(int dc, int amount) {
+	auto dataChannel = getDataChannel(dc);
+	if (!dataChannel)
+		return -1;
+
+	CATCH(dataChannel->setBufferedAmountLowThreshold(size_t(amount)));
+	return 0;
+}
+
+int rtcSetBufferedAmountLowCallback(int dc, bufferedAmountLowCallbackFunc cb) {
+	auto dataChannel = getDataChannel(dc);
+	if (!dataChannel)
+		return -1;
+
+	if (cb)
+		dataChannel->onBufferedAmountLow([dc, cb]() { cb(getUserPointer(dc)); });
+	else
+		dataChannel->onBufferedAmountLow(nullptr);
+	return 0;
+}
+
+int rtcGetAvailableAmount(int dc) {
+	auto dataChannel = getDataChannel(dc);
+	if (!dataChannel)
+		return -1;
+
+	CATCH(return int(dataChannel->availableAmount()));
+}
+
+int rtcSetAvailableCallback(int dc, availableCallbackFunc cb) {
+	auto dataChannel = getDataChannel(dc);
+	if (!dataChannel)
+		return -1;
+
+	if (cb)
+		dataChannel->onOpen([dc, cb]() { cb(getUserPointer(dc)); });
+	else
+		dataChannel->onOpen(nullptr);
+	return 0;
+}
+
+int rtcReceiveMessage(int dc, char *buffer, int *size) {
+	auto dataChannel = getDataChannel(dc);
+	if (!dataChannel)
+		return -1;
+
+	if (!size)
+		return -1;
+
+	CATCH({
+		auto message = dataChannel->receive();
+		if (!message)
+			return 0;
+
+		return std::visit( //
+		    overloaded{    //
+		               [&](const binary &b) {
+			               *size = std::min(*size, int(b.size()));
+			               auto data = reinterpret_cast<const char *>(b.data());
+			               std::copy(data, data + *size, buffer);
+			               return *size;
+		               },
+		               [&](const string &s) {
+			               int len = std::min(*size - 1, int(s.size()));
+			               if (len >= 0) {
+				               std::copy(s.data(), s.data() + len, buffer);
+				               buffer[len] = '\0';
+			               }
+			               *size = -(len + 1);
+			               return len + 1;
+		               }},
+		    *message);
+	});
+}

src/rtcp.cpp

@@ -1,426 +0,0 @@
-/**
- * Copyright (c) 2020 Staz M
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "rtcp.hpp"
-
-#include <cmath>
-#include <utility>
-
-#ifdef _WIN32
-#include <winsock2.h>
-#else
-#include <arpa/inet.h>
-#endif
-
-#ifndef htonll
-#define htonll(x)                                                                                  \
-	((uint64_t)htonl(((uint64_t)(x)&0xFFFFFFFF) << 32) | (uint64_t)htonl((uint64_t)(x) >> 32))
-#endif
-#ifndef ntohll
-#define ntohll(x) htonll(x)
-#endif
-
-namespace rtc {
-
-#pragma pack(push, 1)
-
-struct RTP {
-private:
-	uint8_t _first;
-	uint8_t _payloadType;
-	uint16_t _seqNumber;
-	uint32_t _timestamp;
-
-public:
-	SSRC ssrc;
-	SSRC csrc[16];
-
-	inline uint8_t version() const { return _first >> 6; }
-	inline bool padding() const { return (_first >> 5) & 0x01; }
-	inline uint8_t csrcCount() const { return _first & 0x0F; }
-	inline uint8_t payloadType() const { return _payloadType; }
-	inline uint16_t seqNumber() const { return ntohs(_seqNumber); }
-	inline uint32_t timestamp() const { return ntohl(_timestamp); }
-};
-
-struct RTCP_ReportBlock {
-	SSRC ssrc;
-
-private:
-	uint32_t _fractionLostAndPacketsLost; // fraction lost is 8-bit, packets lost is 24-bit
-	uint16_t _seqNoCycles;
-	uint16_t _highestSeqNo;
-	uint32_t _jitter;
-	uint32_t _lastReport;
-	uint32_t _delaySinceLastReport;
-
-public:
-	inline void preparePacket(SSRC ssrc, [[maybe_unused]] unsigned int packetsLost,
-	                          [[maybe_unused]] unsigned int totalPackets, uint16_t highestSeqNo,
-	                          uint16_t seqNoCycles, uint32_t jitter, uint64_t lastSR_NTP,
-	                          uint64_t lastSR_DELAY) {
-		setSeqNo(highestSeqNo, seqNoCycles);
-		setJitter(jitter);
-		setSSRC(ssrc);
-
-		// Middle 32 bits of NTP Timestamp
-		//		  this->lastReport = lastSR_NTP >> 16u;
-		setNTPOfSR(uint32_t(lastSR_NTP));
-		setDelaySinceSR(uint32_t(lastSR_DELAY));
-
-		// The delay, expressed in units of 1/65536 seconds
-		//		  this->delaySinceLastReport = lastSR_DELAY;
-	}
-
-	inline void setSSRC(SSRC ssrc) { this->ssrc = htonl(ssrc); }
-	inline SSRC getSSRC() const { return ntohl(ssrc); }
-
-	inline void setPacketsLost([[maybe_unused]] unsigned int packetsLost,
-	                           [[maybe_unused]] unsigned int totalPackets) {
-		// TODO Implement loss percentages.
-		_fractionLostAndPacketsLost = 0;
-	}
-	inline unsigned int getLossPercentage() const {
-		// TODO Implement loss percentages.
-		return 0;
-	}
-	inline unsigned int getPacketLostCount() const {
-		// TODO Implement total packets lost.
-		return 0;
-	}
-
-	inline uint16_t seqNoCycles() const { return ntohs(_seqNoCycles); }
-	inline uint16_t highestSeqNo() const { return ntohs(_highestSeqNo); }
-	inline uint32_t jitter() const { return ntohl(_jitter); }
-
-	inline void setSeqNo(uint16_t highestSeqNo, uint16_t seqNoCycles) {
-		_highestSeqNo = htons(highestSeqNo);
-		_seqNoCycles = htons(seqNoCycles);
-	}
-
-	inline void setJitter(uint32_t jitter) { _jitter = htonl(jitter); }
-
-	inline void setNTPOfSR(uint32_t ntp) { _lastReport = htonl(ntp >> 16u); }
-	inline uint32_t getNTPOfSR() const { return ntohl(_lastReport) << 16u; }
-
-	inline void setDelaySinceSR(uint32_t sr) {
-		// The delay, expressed in units of 1/65536 seconds
-		_delaySinceLastReport = htonl(sr);
-	}
-	inline uint32_t getDelaySinceSR() const { return ntohl(_delaySinceLastReport); }
-
-	inline void log() const {
-		PLOG_DEBUG << "RTCP report block: "
-		           << "ssrc="
-		           << ntohl(ssrc)
-		           // TODO: Implement these reports
-		           //	<< ", fractionLost=" << fractionLost
-		           //	<< ", packetsLost=" << packetsLost
-		           << ", highestSeqNo=" << highestSeqNo() << ", seqNoCycles=" << seqNoCycles()
-		           << ", jitter=" << jitter() << ", lastSR=" << getNTPOfSR()
-		           << ", lastSRDelay=" << getDelaySinceSR();
-	}
-};
-
-struct RTCP_HEADER {
-private:
-	uint8_t _first;
-	uint8_t _payloadType;
-	uint16_t _length;
-
-public:
-	inline uint8_t version() const { return _first >> 6; }
-	inline bool padding() const { return (_first >> 5) & 0x01; }
-	inline uint8_t reportCount() const { return _first & 0x0F; }
-	inline uint8_t payloadType() const { return _payloadType; }
-	inline uint16_t length() const { return ntohs(_length); }
-
-	inline void setPayloadType(uint8_t type) { _payloadType = type; }
-	inline void setReportCount(uint8_t count) { _first = (_first & 0xF0) | (count & 0x0F); }
-	inline void setLength(uint16_t length) { _length = htons(length); }
-
-	inline void prepareHeader(uint8_t payloadType, uint8_t reportCount, uint16_t length) {
-		_first = 0x02 << 6; // version 2, no padding
-		setReportCount(reportCount);
-		setPayloadType(payloadType);
-		setLength(length);
-	}
-
-	inline void log() const {
-		PLOG_DEBUG << "RTCP header: "
-		           << "version=" << unsigned(version()) << ", padding=" << padding()
-		           << ", reportCount=" << unsigned(reportCount())
-		           << ", payloadType=" << unsigned(payloadType()) << ", length=" << length();
-	}
-};
-
-struct RTCP_SR {
-	RTCP_HEADER header;
-	SSRC senderSSRC;
-
-private:
-	uint64_t _ntpTimestamp;
-	uint32_t _rtpTimestamp;
-	uint32_t _packetCount;
-	uint32_t _octetCount;
-
-	RTCP_ReportBlock _reportBlocks;
-
-public:
-	inline void preparePacket(SSRC senderSSRC, uint8_t reportCount) {
-		unsigned int length =
-		    ((sizeof(header) + 24 + reportCount * sizeof(RTCP_ReportBlock)) / 4) - 1;
-		header.prepareHeader(200, reportCount, uint16_t(length));
-		this->senderSSRC = htonl(senderSSRC);
-	}
-
-	inline RTCP_ReportBlock *getReportBlock(int num) { return &_reportBlocks + num; }
-	inline const RTCP_ReportBlock *getReportBlock(int num) const { return &_reportBlocks + num; }
-
-	[[nodiscard]] inline size_t getSize() const {
-		// "length" in packet is one less than the number of 32 bit words in the packet.
-		return sizeof(uint32_t) * (1 + size_t(header.length()));
-	}
-
-	inline uint32_t ntpTimestamp() const { return ntohll(_ntpTimestamp); }
-	inline uint32_t rtpTimestamp() const { return ntohl(_rtpTimestamp); }
-	inline uint32_t packetCount() const { return ntohl(_packetCount); }
-	inline uint32_t octetCount() const { return ntohl(_octetCount); }
-
-	inline void setNtpTimestamp(uint32_t ts) { _ntpTimestamp = htonll(ts); }
-	inline void setRtpTimestamp(uint32_t ts) { _rtpTimestamp = htonl(ts); }
-
-	inline void log() const {
-		header.log();
-		PLOG_DEBUG << "RTCP SR: "
-		           << " SSRC=" << ntohl(senderSSRC) << ", NTP_TS=" << ntpTimestamp()
-		           << ", RTP_TS=" << rtpTimestamp() << ", packetCount=" << packetCount()
-		           << ", octetCount=" << octetCount();
-
-		for (unsigned i = 0; i < unsigned(header.reportCount()); i++) {
-			getReportBlock(i)->log();
-		}
-	}
-};
-
-struct RTCP_RR {
-	RTCP_HEADER header;
-	SSRC senderSSRC;
-
-private:
-	RTCP_ReportBlock _reportBlocks;
-
-public:
-	inline RTCP_ReportBlock *getReportBlock(int num) { return &_reportBlocks + num; }
-	inline const RTCP_ReportBlock *getReportBlock(int num) const { return &_reportBlocks + num; }
-
-	inline SSRC getSenderSSRC() const { return ntohl(senderSSRC); }
-	inline void setSenderSSRC(SSRC ssrc) { this->senderSSRC = htonl(ssrc); }
-
-	[[nodiscard]] inline size_t getSize() const {
-		// "length" in packet is one less than the number of 32 bit words in the packet.
-		return sizeof(uint32_t) * (1 + size_t(header.length()));
-	}
-
-	inline void preparePacket(SSRC senderSSRC, uint8_t reportCount) {
-		// "length" in packet is one less than the number of 32 bit words in the packet.
-		size_t length = (sizeWithReportBlocks(reportCount) / 4) - 1;
-		header.prepareHeader(201, reportCount, uint16_t(length));
-		this->senderSSRC = htonl(senderSSRC);
-	}
-
-	inline static size_t sizeWithReportBlocks(uint8_t reportCount) {
-		return sizeof(header) + 4 + size_t(reportCount) * sizeof(RTCP_ReportBlock);
-	}
-
-	inline void log() const {
-		header.log();
-		PLOG_DEBUG << "RTCP RR: "
-		           << " SSRC=" << ntohl(senderSSRC);
-
-		for (unsigned i = 0; i < unsigned(header.reportCount()); i++) {
-			getReportBlock(i)->log();
-		}
-	}
-};
-
-struct RTCP_REMB {
-	RTCP_HEADER header;
-	SSRC senderSSRC;
-	SSRC mediaSourceSSRC;
-
-	// Unique identifier
-	const char id[4] = {'R', 'E', 'M', 'B'};
-
-	// Num SSRC, Br Exp, Br Mantissa (bit mask)
-	uint32_t bitrate;
-
-	SSRC ssrc[1];
-
-	[[nodiscard]] inline size_t getSize() const {
-		// "length" in packet is one less than the number of 32 bit words in the packet.
-		return sizeof(uint32_t) * (1 + size_t(header.length()));
-	}
-
-	inline void preparePacket(SSRC senderSSRC, unsigned int numSSRC, unsigned int bitrate) {
-		// Report Count becomes the format here.
-		header.prepareHeader(206, 15, 0);
-
-		// Always zero.
-		mediaSourceSSRC = 0;
-
-		this->senderSSRC = htonl(senderSSRC);
-		setBitrate(numSSRC, bitrate);
-	}
-
-	inline void setBitrate(unsigned int numSSRC, unsigned int bitrate) {
-		unsigned int exp = 0;
-		while (bitrate > pow(2, 18) - 1) {
-			exp++;
-			bitrate /= 2;
-		}
-
-		// "length" in packet is one less than the number of 32 bit words in the packet.
-		header.setLength(uint16_t(((sizeof(header) + 4 * 2 + 4 + 4) / 4) - 1 + numSSRC));
-
-		this->bitrate = htonl((numSSRC << (32u - 8u)) | (exp << (32u - 8u - 6u)) | bitrate);
-	}
-
-	// TODO Make this work
-	//	  uint64_t getBitrate() const{
-	//		  uint32_t ntohed = ntohl(this->bitrate);
-	//		  uint64_t bitrate = ntohed & (unsigned int)(pow(2, 18)-1);
-	//		  unsigned int exp = ntohed & ((unsigned int)( (pow(2, 6)-1)) << (32u-8u-6u));
-	//		  return bitrate * pow(2,exp);
-	//	  }
-	//
-	//	  uint8_t getNumSSRCS() const {
-	//		  return ntohl(this->bitrate) & (((unsigned int) pow(2,8)-1) << (32u-8u));
-	//	  }
-
-	inline void setSSRC(uint8_t iterator, SSRC ssrc) { this->ssrc[iterator] = htonl(ssrc); }
-
-	inline void log() const {
-		header.log();
-		PLOG_DEBUG << "RTCP REMB: "
-		           << " SSRC=" << ntohl(senderSSRC);
-	}
-
-	static unsigned int sizeWithSSRCs(int numSSRC) {
-		return (sizeof(header) + 4 * 2 + 4 + 4) + sizeof(SSRC) * numSSRC;
-	}
-};
-
-#pragma pack(pop)
-
-void RtcpSession::onOutgoing(std::function<void(rtc::message_ptr)> cb) { mTxCallback = cb; }
-
-std::optional<rtc::message_ptr> RtcpSession::incoming(rtc::message_ptr ptr) {
-	if (ptr->type == rtc::Message::Type::Binary) {
-		auto rtp = reinterpret_cast<const RTP *>(ptr->data());
-
-		// https://tools.ietf.org/html/rfc3550#appendix-A.1
-		if (rtp->version() != 2) {
-			PLOG_WARNING << "RTP packet is not version 2";
-
-			return std::nullopt;
-		}
-		if (rtp->payloadType() == 201 || rtp->payloadType() == 200) {
-			PLOG_WARNING << "RTP packet has a payload type indicating RR/SR";
-
-			return std::nullopt;
-		}
-
-		// TODO Implement the padding bit
-		if (rtp->padding()) {
-			PLOG_WARNING << "Padding processing not implemented";
-		}
-
-		mSsrc = ntohl(rtp->ssrc);
-
-		uint32_t seqNo = rtp->seqNumber();
-		// uint32_t rtpTS = rtp->getTS();
-
-		if (mGreatestSeqNo < seqNo)
-			mGreatestSeqNo = seqNo;
-
-		return ptr;
-	}
-
-	assert(ptr->type == rtc::Message::Type::Control);
-	auto rr = reinterpret_cast<const RTCP_RR *>(ptr->data());
-	if (rr->header.payloadType() == 201) {
-		// RR
-		mSsrc = rr->getSenderSSRC();
-		rr->log();
-	} else if (rr->header.payloadType() == 200) {
-		// SR
-		mSsrc = rr->getSenderSSRC();
-		auto sr = reinterpret_cast<const RTCP_SR *>(ptr->data());
-		mSyncRTPTS = sr->rtpTimestamp();
-		mSyncNTPTS = sr->ntpTimestamp();
-		sr->log();
-
-		// TODO For the time being, we will send RR's/REMB's when we get an SR
-		pushRR(0);
-		if (mRequestedBitrate > 0)
-			pushREMB(mRequestedBitrate);
-	}
-	return std::nullopt;
-}
-
-void RtcpSession::requestBitrate(unsigned int newBitrate) {
-	mRequestedBitrate = newBitrate;
-
-	PLOG_DEBUG << "[GOOG-REMB] Requesting bitrate: " << newBitrate << std::endl;
-	pushREMB(newBitrate);
-}
-
-void RtcpSession::pushREMB(unsigned int bitrate) {
-	rtc::message_ptr msg =
-	    rtc::make_message(RTCP_REMB::sizeWithSSRCs(1), rtc::Message::Type::Control);
-	auto remb = reinterpret_cast<RTCP_REMB *>(msg->data());
-	remb->preparePacket(mSsrc, 1, bitrate);
-	remb->setSSRC(0, mSsrc);
-	remb->log();
-
-	tx(msg);
-}
-
-void RtcpSession::pushRR(unsigned int lastSR_delay) {
-	auto msg = rtc::make_message(RTCP_RR::sizeWithReportBlocks(1), rtc::Message::Type::Control);
-	auto rr = reinterpret_cast<RTCP_RR *>(msg->data());
-	rr->preparePacket(mSsrc, 1);
-	rr->getReportBlock(0)->preparePacket(mSsrc, 0, 0, mGreatestSeqNo, 0, 0, mSyncNTPTS,
-	                                     lastSR_delay);
-	rr->log();
-
-	tx(msg);
-}
-
-void RtcpSession::tx(message_ptr msg) {
-	try {
-		mTxCallback(msg);
-	} catch (const std::exception &e) {
-		LOG_DEBUG << "RTCP tx failed: " << e.what();
-	}
-}
-
-} // namespace rtc
-

src/sctptransport.cpp

@@ -21,10 +21,9 @@
 #include <chrono>
 #include <exception>
 #include <iostream>
-#include <thread>
 #include <vector>
 
-#if !USE_NICE
+#ifdef USE_JUICE
 #ifndef __APPLE__
 // libjuice enables Linux path MTU discovery or sets the DF flag
 #define USE_PMTUD 1
@@ -32,7 +31,7 @@
 // Setting the DF flag is not available on Mac OS
 #define USE_PMTUD 0
 #endif
-#else // USE_NICE == 1
+#else
 #ifdef __linux__
 // Linux UDP does path MTU discovery by default (setting DF and returning EMSGSIZE)
 // It should be safe to enable discovery for SCTP.
@@ -50,9 +49,6 @@ using std::shared_ptr;
 
 namespace rtc {
 
-std::unordered_set<SctpTransport *> SctpTransport::Instances;
-std::shared_mutex SctpTransport::InstancesMutex;
-
 void SctpTransport::Init() {
 	usrsctp_init(0, &SctpTransport::WriteCallback, nullptr);
 	usrsctp_sysctl_set_sctp_ecn_enable(0);
@@ -64,42 +60,21 @@ void SctpTransport::Init() {
 	usrsctp_sysctl_set_sctp_rto_initial_default(1 * 1000);         // ms
 	usrsctp_sysctl_set_sctp_init_rto_max_default(10 * 1000);       // ms
 	usrsctp_sysctl_set_sctp_heartbeat_interval_default(10 * 1000); // ms
-
-	usrsctp_sysctl_set_sctp_max_chunks_on_queue(10 * 1024);
-
-	// Change congestion control from the default TCP Reno (RFC 2581) to H-TCP
-	usrsctp_sysctl_set_sctp_default_cc_module(SCTP_CC_HTCP);
-
-	// Enable Non-Renegable Selective Acknowledgments (NR-SACKs)
-	usrsctp_sysctl_set_sctp_nrsack_enable(1);
-
-	// Increase the initial window size to 10 MTUs (RFC 6928)
-	usrsctp_sysctl_set_sctp_initial_cwnd(10);
-
-	// Reduce SACK delay from the default 200ms to 20ms
-	usrsctp_sysctl_set_sctp_delayed_sack_time_default(20); // ms
 }
 
-void SctpTransport::Cleanup() {
-	while (usrsctp_finish() != 0)
-		std::this_thread::sleep_for(100ms);
-}
+void SctpTransport::Cleanup() { usrsctp_finish(); }
 
 SctpTransport::SctpTransport(std::shared_ptr<Transport> lower, uint16_t port,
                              message_callback recvCallback, amount_callback bufferedAmountCallback,
                              state_callback stateChangeCallback)
-    : Transport(lower, std::move(stateChangeCallback)), mPort(port),
-      mSendQueue(0, message_size_func), mBufferedAmountCallback(std::move(bufferedAmountCallback)) {
+    : Transport(lower), mPort(port), mSendQueue(0, message_size_func),
+      mBufferedAmountCallback(std::move(bufferedAmountCallback)),
+      mStateChangeCallback(std::move(stateChangeCallback)), mState(State::Disconnected) {
 	onRecv(recvCallback);
 
 	PLOG_DEBUG << "Initializing SCTP transport";
 
 	usrsctp_register_address(this);
-	{
-		std::unique_lock lock(InstancesMutex);
-		Instances.insert(this);
-	}
-
 	mSock = usrsctp_socket(AF_CONN, SOCK_STREAM, IPPROTO_SCTP, &SctpTransport::RecvCallback,
 	                       &SctpTransport::SendCallback, 0, this);
 	if (!mSock)
@@ -180,39 +155,27 @@ SctpTransport::SctpTransport(std::shared_ptr<Transport> lower, uint16_t port,
 	// The default send and receive window size of usrsctp is 256KiB, which is too small for
 	// realistic RTTs, therefore we increase it to 1MiB for better performance.
 	// See https://bugzilla.mozilla.org/show_bug.cgi?id=1051685
-	int bufferSize = 1024 * 1024;
-	if (usrsctp_setsockopt(mSock, SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize)))
+	int bufSize = 1024 * 1024;
+	if (usrsctp_setsockopt(mSock, SOL_SOCKET, SO_RCVBUF, &bufSize, sizeof(bufSize)))
 		throw std::runtime_error("Could not set SCTP recv buffer size, errno=" +
 		                         std::to_string(errno));
-	if (usrsctp_setsockopt(mSock, SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize)))
+	if (usrsctp_setsockopt(mSock, SOL_SOCKET, SO_SNDBUF, &bufSize, sizeof(bufSize)))
 		throw std::runtime_error("Could not set SCTP send buffer size, errno=" +
 		                         std::to_string(errno));
+
+	connect();
 }
 
 SctpTransport::~SctpTransport() {
 	stop();
-	close();
 
+	usrsctp_close(mSock);
 	usrsctp_deregister_address(this);
-	{
-		std::unique_lock lock(InstancesMutex);
-		Instances.erase(this);
-	}
 }
 
-void SctpTransport::start() {
-	Transport::start();
-
-	registerIncoming();
-	connect();
-}
+SctpTransport::State SctpTransport::state() const { return mState; }
 
 bool SctpTransport::stop() {
-	// Transport::stop() will unregister incoming() from the lower layer, therefore we need to make
-	// sure the thread from lower layers is not blocked in incoming() by the WrittenOnce condition.
-	mWrittenOnce = true;
-	mWrittenCondition.notify_all();
-
 	if (!Transport::stop())
 		return false;
 
@@ -223,18 +186,8 @@ bool SctpTransport::stop() {
 	return true;
 }
 
-void SctpTransport::close() {
-	if (mSock) {
-		usrsctp_close(mSock);
-		mSock = nullptr;
-	}
-}
-
 void SctpTransport::connect() {
-	if (!mSock)
-		return;
-
-	PLOG_DEBUG << "SCTP connecting";
+	PLOG_DEBUG << "SCTP connect";
 	changeState(State::Connecting);
 
 	struct sockaddr_conn sconn = {};
@@ -257,17 +210,12 @@ void SctpTransport::connect() {
 }
 
 void SctpTransport::shutdown() {
-	if (!mSock)
-		return;
-
 	PLOG_DEBUG << "SCTP shutdown";
 
-	if (usrsctp_shutdown(mSock, SHUT_RDWR) != 0 && errno != ENOTCONN) {
+	if (usrsctp_shutdown(mSock, SHUT_RDWR)) {
 		PLOG_WARNING << "SCTP shutdown failed, errno=" << errno;
 	}
 
-	close();
-
 	PLOG_INFO << "SCTP disconnected";
 	changeState(State::Disconnected);
 	mWrittenCondition.notify_all();
@@ -275,7 +223,6 @@ void SctpTransport::shutdown() {
 
 bool SctpTransport::send(message_ptr message) {
 	std::lock_guard lock(mSendMutex);
-
 	if (!message)
 		return mSendQueue.empty();
 
@@ -286,26 +233,42 @@ bool SctpTransport::send(message_ptr message) {
 		return true;
 
 	mSendQueue.push(message);
-	updateBufferedAmount(uint16_t(message->stream), long(message_size_func(message)));
+	updateBufferedAmount(message->stream, message_size_func(message));
 	return false;
 }
 
-void SctpTransport::closeStream(unsigned int stream) {
-	send(make_message(0, Message::Reset, uint16_t(stream)));
-}
-
 void SctpTransport::flush() {
 	std::lock_guard lock(mSendMutex);
 	trySendQueue();
 }
 
+void SctpTransport::reset(unsigned int stream) {
+	PLOG_DEBUG << "SCTP resetting stream " << stream;
+
+	std::unique_lock lock(mWriteMutex);
+	mWritten = false;
+	using srs_t = struct sctp_reset_streams;
+	const size_t len = sizeof(srs_t) + sizeof(uint16_t);
+	byte buffer[len] = {};
+	srs_t &srs = *reinterpret_cast<srs_t *>(buffer);
+	srs.srs_flags = SCTP_STREAM_RESET_OUTGOING;
+	srs.srs_number_streams = 1;
+	srs.srs_stream_list[0] = uint16_t(stream);
+	if (usrsctp_setsockopt(mSock, IPPROTO_SCTP, SCTP_RESET_STREAMS, &srs, len) == 0) {
+		mWrittenCondition.wait_for(lock, 1000ms,
+		                           [&]() { return mWritten || mState != State::Connected; });
+	} else {
+		PLOG_WARNING << "SCTP reset stream " << stream << " failed, errno=" << errno;
+	}
+}
+
 void SctpTransport::incoming(message_ptr message) {
 	// There could be a race condition here where we receive the remote INIT before the local one is
 	// sent, which would result in the connection being aborted. Therefore, we need to wait for data
 	// to be sent on our side (i.e. the local INIT) before proceeding.
-	if (!mWrittenOnce) { // test the atomic boolean is not set first to prevent a lock contention
+	{
 		std::unique_lock lock(mWriteMutex);
-		mWrittenCondition.wait(lock, [&]() { return mWrittenOnce || state() != State::Connected; });
+		mWrittenCondition.wait(lock, [&]() { return mWrittenOnce || mState != State::Connected; });
 	}
 
 	if (!message) {
@@ -319,23 +282,35 @@ void SctpTransport::incoming(message_ptr message) {
 	usrsctp_conninput(this, message->data(), message->size(), 0);
 }
 
+void SctpTransport::changeState(State state) {
+	if (mState.exchange(state) != state)
+		mStateChangeCallback(state);
+}
+
 bool SctpTransport::trySendQueue() {
 	// Requires mSendMutex to be locked
 	while (auto next = mSendQueue.peek()) {
-		message_ptr message = std::move(*next);
+		auto message = *next;
 		if (!trySendMessage(message))
 			return false;
 		mSendQueue.pop();
-		updateBufferedAmount(uint16_t(message->stream), -long(message_size_func(message)));
+		updateBufferedAmount(message->stream, -message_size_func(message));
 	}
 	return true;
 }
 
 bool SctpTransport::trySendMessage(message_ptr message) {
 	// Requires mSendMutex to be locked
-	if (!mSock || state() != State::Connected)
+	if (mState != State::Connected)
 		return false;
 
+	PLOG_VERBOSE << "SCTP try send size=" << message->size();
+
+	// TODO: Implement SCTP ndata specification draft when supported everywhere
+	// See https://tools.ietf.org/html/draft-ietf-tsvwg-sctp-ndata-08
+
+	const Reliability reliability = message->reliability ? *message->reliability : Reliability();
+
 	uint32_t ppid;
 	switch (message->type) {
 	case Message::String:
@@ -344,24 +319,11 @@ bool SctpTransport::trySendMessage(message_ptr message) {
 	case Message::Binary:
 		ppid = !message->empty() ? PPID_BINARY : PPID_BINARY_EMPTY;
 		break;
-	case Message::Control:
+	default:
 		ppid = PPID_CONTROL;
 		break;
-	case Message::Reset:
-		sendReset(uint16_t(message->stream));
-		return true;
-	default:
-		// Ignore
-		return true;
 	}
 
-	PLOG_VERBOSE << "SCTP try send size=" << message->size();
-
-	// TODO: Implement SCTP ndata specification draft when supported everywhere
-	// See https://tools.ietf.org/html/draft-ietf-tsvwg-sctp-ndata-08
-
-	const Reliability reliability = message->reliability ? *message->reliability : Reliability();
-
 	struct sctp_sendv_spa spa = {};
 
 	// set sndinfo
@@ -376,12 +338,12 @@ bool SctpTransport::trySendMessage(message_ptr message) {
 		spa.sendv_sndinfo.snd_flags |= SCTP_UNORDERED;
 
 	switch (reliability.type) {
-	case Reliability::Type::Rexmit:
+	case Reliability::TYPE_PARTIAL_RELIABLE_REXMIT:
 		spa.sendv_flags |= SCTP_SEND_PRINFO_VALID;
 		spa.sendv_prinfo.pr_policy = SCTP_PR_SCTP_RTX;
 		spa.sendv_prinfo.pr_value = uint32_t(std::get<int>(reliability.rexmit));
 		break;
-	case Reliability::Type::Timed:
+	case Reliability::TYPE_PARTIAL_RELIABLE_TIMED:
 		spa.sendv_flags |= SCTP_SEND_PRINFO_VALID;
 		spa.sendv_prinfo.pr_policy = SCTP_PR_SCTP_TTL;
 		spa.sendv_prinfo.pr_value = uint32_t(std::get<milliseconds>(reliability.rexmit).count());
@@ -400,20 +362,18 @@ bool SctpTransport::trySendMessage(message_ptr message) {
 		ret = usrsctp_sendv(mSock, &zero, 1, nullptr, 0, &spa, sizeof(spa), SCTP_SENDV_SPA, 0);
 	}
 
-	if (ret < 0) {
-		if (errno == EWOULDBLOCK || errno == EAGAIN) {
-			PLOG_VERBOSE << "SCTP sending not possible";
-			return false;
-		}
-
+	if (ret >= 0) {
+		PLOG_VERBOSE << "SCTP sent size=" << message->size();
+		if (message->type == Message::Type::Binary || message->type == Message::Type::String)
+			mBytesSent += message->size();
+		return true;
+	} else if (errno == EWOULDBLOCK || errno == EAGAIN) {
+		PLOG_VERBOSE << "SCTP sending not possible";
+		return false;
+	} else {
 		PLOG_ERROR << "SCTP sending failed, errno=" << errno;
 		throw std::runtime_error("Sending failed, errno=" + std::to_string(errno));
 	}
-
-	PLOG_VERBOSE << "SCTP sent size=" << message->size();
-	if (message->type == Message::Type::Binary || message->type == Message::Type::String)
-		mBytesSent += message->size();
-	return true;
 }
 
 void SctpTransport::updateBufferedAmount(uint16_t streamId, long delta) {
@@ -425,40 +385,7 @@ void SctpTransport::updateBufferedAmount(uint16_t streamId, long delta) {
 	else
 		it->second = amount;
 
-	mSendMutex.unlock();
-	try {
-		mBufferedAmountCallback(streamId, amount);
-	} catch (const std::exception &e) {
-		PLOG_DEBUG << "SCTP buffered amount callback: " << e.what();
-	}
-	mSendMutex.lock();
-}
-
-void SctpTransport::sendReset(uint16_t streamId) {
-	// Requires mSendMutex to be locked
-	if (!mSock || state() != State::Connected)
-		return;
-
-	PLOG_DEBUG << "SCTP resetting stream " << streamId;
-
-	using srs_t = struct sctp_reset_streams;
-	const size_t len = sizeof(srs_t) + sizeof(uint16_t);
-	byte buffer[len] = {};
-	srs_t &srs = *reinterpret_cast<srs_t *>(buffer);
-	srs.srs_flags = SCTP_STREAM_RESET_OUTGOING;
-	srs.srs_number_streams = 1;
-	srs.srs_stream_list[0] = streamId;
-
-	mWritten = false;
-	if (usrsctp_setsockopt(mSock, IPPROTO_SCTP, SCTP_RESET_STREAMS, &srs, len) == 0) {
-		std::unique_lock lock(mWriteMutex); // locking before setsockopt might deadlock usrsctp...
-		mWrittenCondition.wait_for(lock, 1000ms,
-		                           [&]() { return mWritten || state() != State::Connected; });
-	} else if (errno == EINVAL) {
-		PLOG_DEBUG << "SCTP stream " << streamId << " already reset";
-	} else {
-		PLOG_WARNING << "SCTP reset stream " << streamId << " failed, errno=" << errno;
-	}
+	mBufferedAmountCallback(streamId, amount);
 }
 
 bool SctpTransport::safeFlush() {
@@ -467,41 +394,37 @@ bool SctpTransport::safeFlush() {
 		return true;
 
 	} catch (const std::exception &e) {
-		PLOG_WARNING << "SCTP flush: " << e.what();
+		PLOG_ERROR << "SCTP flush: " << e.what();
 		return false;
 	}
 }
 
-int SctpTransport::handleRecv(struct socket * /*sock*/, union sctp_sockstore /*addr*/,
-                              const byte *data, size_t len, struct sctp_rcvinfo info, int flags) {
+int SctpTransport::handleRecv(struct socket *sock, union sctp_sockstore addr, const byte *data,
+                              size_t len, struct sctp_rcvinfo info, int flags) {
 	try {
 		PLOG_VERBOSE << "Handle recv, len=" << len;
 		if (!len)
-			return 0; // Ignore
+			return -1;
 
-		// SCTP_FRAGMENT_INTERLEAVE does not seem to work as expected for messages > 64KB,
-		// therefore partial notifications and messages need to be handled separately.
-		if (flags & MSG_NOTIFICATION) {
-			// SCTP event notification
-			mPartialNotification.insert(mPartialNotification.end(), data, data + len);
-			if (flags & MSG_EOR) {
-				// Notification is complete, process it
-				processNotification(
-				    reinterpret_cast<const union sctp_notification *>(mPartialNotification.data()),
-				    mPartialNotification.size());
-				mPartialNotification.clear();
+		// This is valid because SCTP_FRAGMENT_INTERLEAVE is set to level 0
+		// so partial messages and notifications may not be interleaved.
+		if (flags & MSG_EOR) {
+			if (!mPartialRecv.empty()) {
+				mPartialRecv.insert(mPartialRecv.end(), data, data + len);
+				data = mPartialRecv.data();
+				len = mPartialRecv.size();
 			}
+			// Message/Notification is complete, process it
+			if (flags & MSG_NOTIFICATION)
+				processNotification(reinterpret_cast<const union sctp_notification *>(data), len);
+			else
+				processData(data, len, info.rcv_sid, PayloadId(htonl(info.rcv_ppid)));
+
+			mPartialRecv.clear();
 		} else {
-			// SCTP message
-			mPartialMessage.insert(mPartialMessage.end(), data, data + len);
-			if (flags & MSG_EOR) {
-				// Message is complete, process it
-				processData(std::move(mPartialMessage), info.rcv_sid,
-				            PayloadId(htonl(info.rcv_ppid)));
-				mPartialMessage.clear();
-			}
+			// Message/Notification is not complete
+			mPartialRecv.insert(mPartialRecv.end(), data, data + len);
 		}
-
 	} catch (const std::exception &e) {
 		PLOG_ERROR << "SCTP recv: " << e.what();
 		return -1;
@@ -514,14 +437,13 @@ int SctpTransport::handleSend(size_t free) {
 	return safeFlush() ? 0 : -1;
 }
 
-int SctpTransport::handleWrite(byte *data, size_t len, uint8_t /*tos*/, uint8_t /*set_df*/) {
+int SctpTransport::handleWrite(byte *data, size_t len, uint8_t tos, uint8_t set_df) {
 	try {
-		std::unique_lock lock(mWriteMutex);
 		PLOG_VERBOSE << "Handle write, len=" << len;
 
+		std::unique_lock lock(mWriteMutex);
 		if (!outgoing(make_message(data, data + len)))
 			return -1;
-
 		mWritten = true;
 		mWrittenOnce = true;
 		mWrittenCondition.notify_all();
@@ -533,56 +455,62 @@ int SctpTransport::handleWrite(byte *data, size_t len, uint8_t /*tos*/, uint8_t
 	return 0; // success
 }
 
-void SctpTransport::processData(binary &&data, uint16_t sid, PayloadId ppid) {
-	PLOG_VERBOSE << "Process data, size=" << data.size();
+void SctpTransport::processData(const byte *data, size_t len, uint16_t sid, PayloadId ppid) {
+	PLOG_VERBOSE << "Process data, len=" << len;
 
 	// The usage of the PPIDs "WebRTC String Partial" and "WebRTC Binary Partial" is deprecated.
 	// See https://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-13#section-6.6
 	// We handle them at reception for compatibility reasons but should never send them.
 	switch (ppid) {
 	case PPID_CONTROL:
-		recv(make_message(std::move(data), Message::Control, sid));
+		recv(make_message(data, data + len, Message::Control, sid));
 		break;
 
 	case PPID_STRING_PARTIAL: // deprecated
-		mPartialStringData.insert(mPartialStringData.end(), data.begin(), data.end());
+		mPartialStringData.insert(mPartialStringData.end(), data, data + len);
 		break;
 
 	case PPID_STRING:
 		if (mPartialStringData.empty()) {
-			mBytesReceived += data.size();
-			recv(make_message(std::move(data), Message::String, sid));
+			mBytesReceived += len;
+			recv(make_message(data, data + len, Message::String, sid));
 		} else {
-			mPartialStringData.insert(mPartialStringData.end(), data.begin(), data.end());
+			mPartialStringData.insert(mPartialStringData.end(), data, data + len);
 			mBytesReceived += mPartialStringData.size();
-			recv(make_message(std::move(mPartialStringData), Message::String, sid));
+			recv(make_message(mPartialStringData.begin(), mPartialStringData.end(), Message::String,
+			                  sid));
 			mPartialStringData.clear();
 		}
 		break;
 
 	case PPID_STRING_EMPTY:
-		recv(make_message(std::move(mPartialStringData), Message::String, sid));
+		// This only accounts for when the partial data is empty
+		recv(make_message(mPartialStringData.begin(), mPartialStringData.end(), Message::String,
+		                  sid));
 		mPartialStringData.clear();
 		break;
 
 	case PPID_BINARY_PARTIAL: // deprecated
-		mPartialBinaryData.insert(mPartialBinaryData.end(), data.begin(), data.end());
+		mPartialBinaryData.insert(mPartialBinaryData.end(), data, data + len);
 		break;
 
 	case PPID_BINARY:
 		if (mPartialBinaryData.empty()) {
-			mBytesReceived += data.size();
-			recv(make_message(std::move(data), Message::Binary, sid));
+			mBytesReceived += len;
+			recv(make_message(data, data + len, Message::Binary, sid));
 		} else {
-			mPartialBinaryData.insert(mPartialBinaryData.end(), data.begin(), data.end());
-			mBytesReceived += mPartialBinaryData.size();
-			recv(make_message(std::move(mPartialBinaryData), Message::Binary, sid));
+			mPartialBinaryData.insert(mPartialBinaryData.end(), data, data + len);
+			mBytesReceived += mPartialStringData.size();
+			recv(make_message(mPartialBinaryData.begin(), mPartialBinaryData.end(), Message::Binary,
+			                  sid));
 			mPartialBinaryData.clear();
 		}
 		break;
 
 	case PPID_BINARY_EMPTY:
-		recv(make_message(std::move(mPartialBinaryData), Message::Binary, sid));
+		// This only accounts for when the partial data is empty
+		recv(make_message(mPartialBinaryData.begin(), mPartialBinaryData.end(), Message::Binary,
+		                  sid));
 		mPartialBinaryData.clear();
 		break;
 
@@ -600,7 +528,7 @@ void SctpTransport::processNotification(const union sctp_notification *notify, s
 	}
 
 	auto type = notify->sn_header.sn_type;
-	PLOG_VERBOSE << "Processing notification, type=" << type;
+	PLOG_VERBOSE << "Process notification, type=" << type;
 
 	switch (type) {
 	case SCTP_ASSOC_CHANGE: {
@@ -609,7 +537,7 @@ void SctpTransport::processNotification(const union sctp_notification *notify, s
 			PLOG_INFO << "SCTP connected";
 			changeState(State::Connected);
 		} else {
-			if (state() == State::Connecting) {
+			if (mState == State::Connecting) {
 				PLOG_ERROR << "SCTP connection failed";
 				changeState(State::Failed);
 			} else {
@@ -622,8 +550,7 @@ void SctpTransport::processNotification(const union sctp_notification *notify, s
 	}
 
 	case SCTP_SENDER_DRY_EVENT: {
-		PLOG_VERBOSE << "SCTP dry event";
-		// It should not be necessary since the send callback should have been called already,
+		// It not should be necessary since the send callback should have been called already,
 		// but to be sure, let's try to send now.
 		safeFlush();
 		break;
@@ -634,32 +561,10 @@ void SctpTransport::processNotification(const union sctp_notification *notify, s
 		const int count = (reset_event.strreset_length - sizeof(reset_event)) / sizeof(uint16_t);
 		const uint16_t flags = reset_event.strreset_flags;
 
-		IF_PLOG(plog::verbose) {
-			std::ostringstream desc;
-			desc << "flags=";
-			if (flags & SCTP_STREAM_RESET_OUTGOING_SSN && flags & SCTP_STREAM_RESET_INCOMING_SSN)
-				desc << "outgoing|incoming";
-			else if (flags & SCTP_STREAM_RESET_OUTGOING_SSN)
-				desc << "outgoing";
-			else if (flags & SCTP_STREAM_RESET_INCOMING_SSN)
-				desc << "incoming";
-			else
-				desc << "0";
-
-			desc << ", streams=[";
-			for (int i = 0; i < count; ++i) {
-				uint16_t streamId = reset_event.strreset_stream_list[i];
-				desc << (i != 0 ? "," : "") << streamId;
-			}
-			desc << "]";
-
-			PLOG_VERBOSE << "SCTP reset event, " << desc.str();
-		}
-
 		if (flags & SCTP_STREAM_RESET_OUTGOING_SSN) {
 			for (int i = 0; i < count; ++i) {
 				uint16_t streamId = reset_event.strreset_stream_list[i];
-				closeStream(streamId);
+				reset(streamId);
 			}
 		}
 		if (flags & SCTP_STREAM_RESET_INCOMING_SSN) {
@@ -688,56 +593,39 @@ size_t SctpTransport::bytesSent() { return mBytesSent; }
 
 size_t SctpTransport::bytesReceived() { return mBytesReceived; }
 
-std::optional<milliseconds> SctpTransport::rtt() {
-	if (!mSock || state() != State::Connected)
-		return nullopt;
-
+std::optional<std::chrono::milliseconds> SctpTransport::rtt() {
 	struct sctp_status status = {};
 	socklen_t len = sizeof(status);
-	if (usrsctp_getsockopt(mSock, IPPROTO_SCTP, SCTP_STATUS, &status, &len)) {
+
+	if (usrsctp_getsockopt(this->mSock, IPPROTO_SCTP, SCTP_STATUS, &status, &len)) {
 		PLOG_WARNING << "Could not read SCTP_STATUS";
-		return nullopt;
+		return std::nullopt;
 	}
-	return milliseconds(status.sstat_primary.spinfo_srtt);
+	return std::chrono::milliseconds(status.sstat_primary.spinfo_srtt);
 }
 
 int SctpTransport::RecvCallback(struct socket *sock, union sctp_sockstore addr, void *data,
-                                size_t len, struct sctp_rcvinfo recv_info, int flags,
-                                void *ulp_info) {
-	auto *transport = static_cast<SctpTransport *>(ulp_info);
-
-	std::shared_lock lock(InstancesMutex);
-	if (Instances.find(transport) == Instances.end()) {
-		free(data);
-		return -1;
-	}
-
-	int ret =
-	    transport->handleRecv(sock, addr, static_cast<const byte *>(data), len, recv_info, flags);
+                                size_t len, struct sctp_rcvinfo recv_info, int flags, void *ptr) {
+	int ret = static_cast<SctpTransport *>(ptr)->handleRecv(
+	    sock, addr, static_cast<const byte *>(data), len, recv_info, flags);
 	free(data);
 	return ret;
 }
 
-int SctpTransport::SendCallback(struct socket *, uint32_t sb_free, void *ulp_info) {
-	auto *transport = static_cast<SctpTransport *>(ulp_info);
-
-	std::shared_lock lock(InstancesMutex);
-	if (Instances.find(transport) == Instances.end())
+int SctpTransport::SendCallback(struct socket *sock, uint32_t sb_free) {
+	struct sctp_paddrinfo paddrinfo = {};
+	socklen_t len = sizeof(paddrinfo);
+	if (usrsctp_getsockopt(sock, IPPROTO_SCTP, SCTP_GET_PEER_ADDR_INFO, &paddrinfo, &len))
 		return -1;
 
-	return transport->handleSend(size_t(sb_free));
+	auto sconn = reinterpret_cast<struct sockaddr_conn *>(&paddrinfo.spinfo_address);
+	void *ptr = sconn->sconn_addr;
+	return static_cast<SctpTransport *>(ptr)->handleSend(size_t(sb_free));
 }
 
 int SctpTransport::WriteCallback(void *ptr, void *data, size_t len, uint8_t tos, uint8_t set_df) {
-	auto *transport = static_cast<SctpTransport *>(ptr);
-
-	// Workaround for sctplab/usrsctp#405: Send callback is invoked on already closed socket
-	// https://github.com/sctplab/usrsctp/issues/405
-	std::shared_lock lock(InstancesMutex);
-	if (Instances.find(transport) == Instances.end())
-		return -1;
-
-	return transport->handleWrite(static_cast<byte *>(data), len, tos, set_df);
+	return static_cast<SctpTransport *>(ptr)->handleWrite(static_cast<byte *>(data), len, tos,
+	                                                      set_df);
 }
 
 } // namespace rtc

src/sctptransport.hpp

@@ -28,8 +28,6 @@
 #include <functional>
 #include <map>
 #include <mutex>
-#include <shared_mutex>
-#include <unordered_set>
 
 #include "usrsctp.h"
 
@@ -40,17 +38,21 @@ public:
 	static void Init();
 	static void Cleanup();
 
+	enum class State { Disconnected, Connecting, Connected, Failed };
+
 	using amount_callback = std::function<void(uint16_t streamId, size_t amount)>;
+	using state_callback = std::function<void(State state)>;
 
 	SctpTransport(std::shared_ptr<Transport> lower, uint16_t port, message_callback recvCallback,
 	              amount_callback bufferedAmountCallback, state_callback stateChangeCallback);
 	~SctpTransport();
 
-	void start() override;
+	State state() const;
+
 	bool stop() override;
 	bool send(message_ptr message) override; // false if buffered
-	void closeStream(unsigned int stream);
 	void flush();
+	void reset(unsigned int stream);
 
 	// Stats
 	void clearStats();
@@ -73,13 +75,12 @@ private:
 
 	void connect();
 	void shutdown();
-	void close();
 	void incoming(message_ptr message) override;
+	void changeState(State state);
 
 	bool trySendQueue();
 	bool trySendMessage(message_ptr message);
 	void updateBufferedAmount(uint16_t streamId, long delta);
-	void sendReset(uint16_t streamId);
 	bool safeFlush();
 
 	int handleRecv(struct socket *sock, union sctp_sockstore addr, const byte *data, size_t len,
@@ -87,7 +88,7 @@ private:
 	int handleSend(size_t free);
 	int handleWrite(byte *data, size_t len, uint8_t tos, uint8_t set_df);
 
-	void processData(binary &&data, uint16_t streamId, PayloadId ppid);
+	void processData(const byte *data, size_t len, uint16_t streamId, PayloadId ppid);
 	void processNotification(const union sctp_notification *notify, size_t len);
 
 	const uint16_t mPort;
@@ -98,24 +99,23 @@ private:
 	std::map<uint16_t, size_t> mBufferedAmount;
 	amount_callback mBufferedAmountCallback;
 
-	std::mutex mWriteMutex;
-	std::condition_variable mWrittenCondition;
-	std::atomic<bool> mWritten = false; // written outside lock
-	std::atomic<bool> mWrittenOnce = false; // same
+	std::recursive_mutex mWriteMutex;
+	std::condition_variable_any mWrittenCondition;
+	bool mWritten = false;
+	bool mWrittenOnce = false;
 
-	binary mPartialMessage, mPartialNotification;
-	binary mPartialStringData, mPartialBinaryData;
+	state_callback mStateChangeCallback;
+	std::atomic<State> mState;
 
 	// Stats
 	std::atomic<size_t> mBytesSent = 0, mBytesReceived = 0;
 
-	static int RecvCallback(struct socket *sock, union sctp_sockstore addr, void *data, size_t len,
-	                        struct sctp_rcvinfo recv_info, int flags, void *ulp_info);
-	static int SendCallback(struct socket *sock, uint32_t sb_free, void *ulp_info);
-	static int WriteCallback(void *sctp_ptr, void *data, size_t len, uint8_t tos, uint8_t set_df);
+	binary mPartialRecv, mPartialStringData, mPartialBinaryData;
 
-	static std::unordered_set<SctpTransport *> Instances;
-	static std::shared_mutex InstancesMutex;
+	static int RecvCallback(struct socket *sock, union sctp_sockstore addr, void *data, size_t len,
+	                        struct sctp_rcvinfo recv_info, int flags, void *user_data);
+	static int SendCallback(struct socket *sock, uint32_t sb_free);
+	static int WriteCallback(void *sctp_ptr, void *data, size_t len, uint8_t tos, uint8_t set_df);
 };
 
 } // namespace rtc

src/tcptransport.cpp

@@ -1,404 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "tcptransport.hpp"
-
-#if RTC_ENABLE_WEBSOCKET
-
-#include <exception>
-
-#ifndef _WIN32
-#include <fcntl.h>
-#include <unistd.h>
-#endif
-
-namespace rtc {
-
-using std::to_string;
-
-SelectInterrupter::SelectInterrupter() {
-#ifndef _WIN32
-	int pipefd[2];
-	if (::pipe(pipefd) != 0)
-		throw std::runtime_error("Failed to create pipe");
-	::fcntl(pipefd[0], F_SETFL, O_NONBLOCK);
-	::fcntl(pipefd[1], F_SETFL, O_NONBLOCK);
-	mPipeOut = pipefd[1]; // read
-	mPipeIn = pipefd[0];  // write
-#endif
-}
-
-SelectInterrupter::~SelectInterrupter() {
-	std::lock_guard lock(mMutex);
-#ifdef _WIN32
-	if (mDummySock != INVALID_SOCKET)
-		::closesocket(mDummySock);
-#else
-	::close(mPipeIn);
-	::close(mPipeOut);
-#endif
-}
-
-int SelectInterrupter::prepare(fd_set &readfds, [[maybe_unused]] fd_set &writefds) {
-	std::lock_guard lock(mMutex);
-#ifdef _WIN32
-	if (mDummySock == INVALID_SOCKET)
-		mDummySock = ::socket(AF_INET, SOCK_DGRAM, 0);
-	FD_SET(mDummySock, &readfds);
-	return SOCKET_TO_INT(mDummySock) + 1;
-#else
-	char dummy;
-	::read(mPipeIn, &dummy, 1);
-	FD_SET(mPipeIn, &readfds);
-	return mPipeIn + 1;
-#endif
-}
-
-void SelectInterrupter::interrupt() {
-	std::lock_guard lock(mMutex);
-#ifdef _WIN32
-	if (mDummySock != INVALID_SOCKET) {
-		::closesocket(mDummySock);
-		mDummySock = INVALID_SOCKET;
-	}
-#else
-	char dummy = 0;
-	::write(mPipeOut, &dummy, 1);
-#endif
-}
-
-TcpTransport::TcpTransport(const string &hostname, const string &service, state_callback callback)
-    : Transport(nullptr, std::move(callback)), mHostname(hostname), mService(service) {
-
-	PLOG_DEBUG << "Initializing TCP transport";
-}
-
-TcpTransport::~TcpTransport() { stop(); }
-
-void TcpTransport::start() {
-	Transport::start();
-
-	PLOG_DEBUG << "Starting TCP recv thread";
-	mThread = std::thread(&TcpTransport::runLoop, this);
-}
-
-bool TcpTransport::stop() {
-	if (!Transport::stop())
-		return false;
-
-	PLOG_DEBUG << "Waiting for TCP recv thread";
-	close();
-	mThread.join();
-	return true;
-}
-
-bool TcpTransport::send(message_ptr message) {
-	std::unique_lock lock(mSockMutex);
-	if (state() != State::Connected)
-		return false;
-
-	if (!message)
-		return mSendQueue.empty();
-
-	PLOG_VERBOSE << "Send size=" << (message ? message->size() : 0);
-	return outgoing(message);
-}
-
-void TcpTransport::incoming(message_ptr message) {
-	if (!message)
-		return;
-
-	PLOG_VERBOSE << "Incoming size=" << message->size();
-	recv(message);
-}
-
-bool TcpTransport::outgoing(message_ptr message) {
-	// mSockMutex must be locked
-	// If nothing is pending, try to send directly
-	// It's safe because if the queue is empty, the thread is not sending
-	if (mSendQueue.empty() && trySendMessage(message))
-		return true;
-
-	mSendQueue.push(message);
-	interruptSelect(); // so the thread waits for writability
-	return false;
-}
-
-void TcpTransport::connect(const string &hostname, const string &service) {
-	PLOG_DEBUG << "Connecting to " << hostname << ":" << service;
-
-	struct addrinfo hints = {};
-	hints.ai_family = AF_UNSPEC;
-	hints.ai_socktype = SOCK_STREAM;
-	hints.ai_protocol = IPPROTO_TCP;
-	hints.ai_flags = AI_ADDRCONFIG;
-
-	struct addrinfo *result = nullptr;
-	if (getaddrinfo(hostname.c_str(), service.c_str(), &hints, &result))
-		throw std::runtime_error("Resolution failed for \"" + hostname + ":" + service + "\"");
-
-	for (auto p = result; p; p = p->ai_next) {
-		try {
-			connect(p->ai_addr, socklen_t(p->ai_addrlen));
-
-			PLOG_INFO << "Connected to " << hostname << ":" << service;
-			freeaddrinfo(result);
-			return;
-
-		} catch (const std::runtime_error &e) {
-			if (p->ai_next) {
-				PLOG_DEBUG << e.what();
-			} else {
-				PLOG_WARNING << e.what();
-			}
-		}
-	}
-
-	freeaddrinfo(result);
-
-	std::ostringstream msg;
-	msg << "Connection to " << hostname << ":" << service << " failed";
-	throw std::runtime_error(msg.str());
-}
-
-void TcpTransport::connect(const sockaddr *addr, socklen_t addrlen) {
-	std::unique_lock lock(mSockMutex);
-	try {
-		char node[MAX_NUMERICNODE_LEN];
-		char serv[MAX_NUMERICSERV_LEN];
-		if (getnameinfo(addr, addrlen, node, MAX_NUMERICNODE_LEN, serv, MAX_NUMERICSERV_LEN,
-		                NI_NUMERICHOST | NI_NUMERICSERV) == 0) {
-			PLOG_DEBUG << "Trying address " << node << ":" << serv;
-		}
-
-		PLOG_VERBOSE << "Creating TCP socket";
-
-		// Create socket
-		mSock = ::socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
-		if (mSock == INVALID_SOCKET)
-			throw std::runtime_error("TCP socket creation failed");
-
-		ctl_t b = 1;
-		if (::ioctlsocket(mSock, FIONBIO, &b) < 0)
-			throw std::runtime_error("Failed to set socket non-blocking mode");
-
-#ifdef __APPLE__
-		// MacOS lacks MSG_NOSIGNAL and requires SO_NOSIGPIPE instead
-		int opt = 1;
-		if (::setsockopt(mSock, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)) < 0)
-			throw std::runtime_error("Failed to disable SIGPIPE for socket");
-#endif
-
-		// Initiate connection
-		int ret = ::connect(mSock, addr, addrlen);
-		if (ret < 0 && sockerrno != SEINPROGRESS && sockerrno != SEWOULDBLOCK) {
-			std::ostringstream msg;
-			msg << "TCP connection to " << node << ":" << serv << " failed, errno=" << sockerrno;
-			throw std::runtime_error(msg.str());
-		}
-
-		while (true) {
-			fd_set writefds;
-			FD_ZERO(&writefds);
-			FD_SET(mSock, &writefds);
-			struct timeval tv;
-			tv.tv_sec = 10; // TODO: Make the timeout configurable
-			tv.tv_usec = 0;
-			ret = ::select(SOCKET_TO_INT(mSock) + 1, NULL, &writefds, NULL, &tv);
-
-			if (ret < 0) {
-				if (sockerrno == SEINTR || sockerrno == SEAGAIN) // interrupted
-					continue;
-				else
-					throw std::runtime_error("Failed to wait for socket connection");
-			}
-
-			if (ret == 0) {
-				std::ostringstream msg;
-				msg << "TCP connection to " << node << ":" << serv << " timed out";
-				throw std::runtime_error(msg.str());
-			}
-
-			int error = 0;
-			socklen_t errorlen = sizeof(error);
-			if (::getsockopt(mSock, SOL_SOCKET, SO_ERROR, (char *)&error, &errorlen) != 0)
-				throw std::runtime_error("Failed to get socket error code");
-
-			if (error != 0) {
-				std::ostringstream msg;
-				msg << "TCP connection to " << node << ":" << serv << " failed, errno=" << error;
-				throw std::runtime_error(msg.str());
-			}
-
-			PLOG_DEBUG << "TCP connection to " << node << ":" << serv << " succeeded";
-			break;
-		}
-	} catch (...) {
-		if (mSock != INVALID_SOCKET) {
-			::closesocket(mSock);
-			mSock = INVALID_SOCKET;
-		}
-		throw;
-	}
-}
-
-void TcpTransport::close() {
-	std::unique_lock lock(mSockMutex);
-	if (mSock != INVALID_SOCKET) {
-		PLOG_DEBUG << "Closing TCP socket";
-		::closesocket(mSock);
-		mSock = INVALID_SOCKET;
-	}
-	changeState(State::Disconnected);
-	interruptSelect();
-}
-
-bool TcpTransport::trySendQueue() {
-	// mSockMutex must be locked
-	while (auto next = mSendQueue.peek()) {
-		message_ptr message = std::move(*next);
-		if (!trySendMessage(message)) {
-			mSendQueue.exchange(message);
-			return false;
-		}
-		mSendQueue.pop();
-	}
-	return true;
-}
-
-bool TcpTransport::trySendMessage(message_ptr &message) {
-	// mSockMutex must be locked
-	auto data = reinterpret_cast<const char *>(message->data());
-	auto size = message->size();
-	while (size) {
-#if defined(__APPLE__) || defined(_WIN32)
-		int flags = 0;
-#else
-		int flags = MSG_NOSIGNAL;
-#endif
-		int len = ::send(mSock, data, int(size), flags);
-		if (len < 0) {
-			if (sockerrno == SEAGAIN || sockerrno == SEWOULDBLOCK) {
-				message = make_message(message->end() - size, message->end());
-				return false;
-			} else {
-				throw std::runtime_error("Connection lost, errno=" + to_string(sockerrno));
-			}
-		}
-
-		data += len;
-		size -= len;
-	}
-	message = nullptr;
-	return true;
-}
-
-void TcpTransport::runLoop() {
-	const size_t bufferSize = 4096;
-
-	// Connect
-	try {
-		changeState(State::Connecting);
-		connect(mHostname, mService);
-
-	} catch (const std::exception &e) {
-		PLOG_ERROR << "TCP connect: " << e.what();
-		changeState(State::Failed);
-		return;
-	}
-
-	// Receive loop
-	try {
-		PLOG_INFO << "TCP connected";
-		changeState(State::Connected);
-
-		while (true) {
-			std::unique_lock lock(mSockMutex);
-			if (mSock == INVALID_SOCKET)
-				break;
-
-			fd_set readfds, writefds;
-			int n = prepareSelect(readfds, writefds);
-
-			struct timeval tv;
-			tv.tv_sec = 10;
-			tv.tv_usec = 0;
-			lock.unlock();
-			int ret = ::select(n, &readfds, &writefds, NULL, &tv);
-			lock.lock();
-			if (mSock == INVALID_SOCKET)
-				break;
-
-			if (ret < 0) {
-				throw std::runtime_error("Failed to wait on socket");
-			} else if (ret == 0) {
-				PLOG_VERBOSE << "TCP is idle";
-				lock.unlock(); // unlock now since the upper layer might send on incoming
-				incoming(make_message(0));
-				continue;
-			}
-
-			if (FD_ISSET(mSock, &writefds))
-				trySendQueue();
-
-			if (FD_ISSET(mSock, &readfds)) {
-				char buffer[bufferSize];
-				int len = ::recv(mSock, buffer, bufferSize, 0);
-				if (len < 0) {
-					if (sockerrno == SEAGAIN || sockerrno == SEWOULDBLOCK) {
-						continue;
-					} else {
-						throw std::runtime_error("Connection lost");
-					}
-				}
-
-				if (len == 0)
-					break; // clean close
-
-				lock.unlock(); // unlock now since the upper layer might send on incoming
-				auto *b = reinterpret_cast<byte *>(buffer);
-				incoming(make_message(b, b + len));
-			}
-		}
-	} catch (const std::exception &e) {
-		PLOG_ERROR << "TCP recv: " << e.what();
-	}
-
-	PLOG_INFO << "TCP disconnected";
-	changeState(State::Disconnected);
-	recv(nullptr);
-}
-
-int TcpTransport::prepareSelect(fd_set &readfds, fd_set &writefds) {
-	FD_ZERO(&readfds);
-	FD_ZERO(&writefds);
-	FD_SET(mSock, &readfds);
-
-	if (!mSendQueue.empty())
-		FD_SET(mSock, &writefds);
-
-	int n = SOCKET_TO_INT(mSock) + 1;
-	int m = mInterrupter.prepare(readfds, writefds);
-	return std::max(n, m);
-}
-
-void TcpTransport::interruptSelect() { mInterrupter.interrupt(); }
-
-} // namespace rtc
-
-#endif

src/tcptransport.hpp

@@ -1,92 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef RTC_TCP_TRANSPORT_H
-#define RTC_TCP_TRANSPORT_H
-
-#include "include.hpp"
-#include "queue.hpp"
-#include "transport.hpp"
-
-#if RTC_ENABLE_WEBSOCKET
-
-#include <mutex>
-#include <thread>
-
-// Use the socket defines from libjuice
-#include "../deps/libjuice/src/socket.h"
-
-namespace rtc {
-
-// Utility class to interrupt select()
-class SelectInterrupter {
-public:
-	SelectInterrupter();
-	~SelectInterrupter();
-
-	int prepare(fd_set &readfds, fd_set &writefds);
-	void interrupt();
-
-private:
-	std::mutex mMutex;
-#ifdef _WIN32
-	socket_t mDummySock = INVALID_SOCKET;
-#else // assume POSIX
-	int mPipeIn, mPipeOut;
-#endif
-};
-
-class TcpTransport : public Transport {
-public:
-	TcpTransport(const string &hostname, const string &service, state_callback callback);
-	~TcpTransport();
-
-	void start() override;
-	bool stop() override;
-	bool send(message_ptr message) override;
-
-	void incoming(message_ptr message) override;
-	bool outgoing(message_ptr message) override;
-
-private:
-	void connect(const string &hostname, const string &service);
-	void connect(const sockaddr *addr, socklen_t addrlen);
-	void close();
-
-	bool trySendQueue();
-	bool trySendMessage(message_ptr &message);
-
-	void runLoop();
-
-	int prepareSelect(fd_set &readfds, fd_set &writefds);
-	void interruptSelect();
-
-	string mHostname, mService;
-
-	socket_t mSock = INVALID_SOCKET;
-	std::mutex mSockMutex;
-	std::thread mThread;
-	SelectInterrupter mInterrupter;
-	Queue<message_ptr> mSendQueue;
-};
-
-} // namespace rtc
-
-#endif
-
-#endif

src/threadpool.cpp

@@ -1,82 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "threadpool.hpp"
-
-namespace rtc {
-
-ThreadPool &ThreadPool::Instance() {
-	// Init handles joining on cleanup
-	static ThreadPool *instance = new ThreadPool;
-	return *instance;
-}
-
-ThreadPool::~ThreadPool() { join(); }
-
-int ThreadPool::count() const {
-	std::unique_lock lock(mWorkersMutex);
-	return int(mWorkers.size());
-}
-
-void ThreadPool::spawn(int count) {
-	std::unique_lock lock(mWorkersMutex);
-	mJoining = false;
-	while (count-- > 0)
-		mWorkers.emplace_back(std::bind(&ThreadPool::run, this));
-}
-
-void ThreadPool::join() {
-	std::unique_lock lock(mWorkersMutex);
-	mJoining = true;
-	mCondition.notify_all();
-
-	for (auto &w : mWorkers)
-		w.join();
-
-	mWorkers.clear();
-}
-
-void ThreadPool::run() {
-	while (runOne()) {
-	}
-}
-
-bool ThreadPool::runOne() {
-	if (auto task = dequeue()) {
-		try {
-			task();
-		} catch (const std::exception &e) {
-			PLOG_WARNING << "Unhandled exception in task: " << e.what();
-		}
-		return true;
-	}
-	return false;
-}
-
-std::function<void()> ThreadPool::dequeue() {
-	std::unique_lock lock(mMutex);
-	mCondition.wait(lock, [this]() { return !mTasks.empty() || mJoining; });
-	if (mTasks.empty())
-		return nullptr;
-	auto task = std::move(mTasks.front());
-	mTasks.pop();
-	return task;
-}
-
-} // namespace rtc
-

src/threadpool.hpp

@@ -1,87 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef RTC_THREADPOOL_H
-#define RTC_THREADPOOL_H
-
-#include "include.hpp"
-#include "init.hpp"
-
-#include <condition_variable>
-#include <functional>
-#include <future>
-#include <memory>
-#include <mutex>
-#include <queue>
-#include <stdexcept>
-#include <thread>
-#include <vector>
-
-namespace rtc {
-
-template <class F, class... Args>
-using invoke_future_t = std::future<std::invoke_result_t<std::decay_t<F>, std::decay_t<Args>...>>;
-
-class ThreadPool final {
-public:
-	static ThreadPool &Instance();
-
-	ThreadPool(const ThreadPool &) = delete;
-	ThreadPool &operator=(const ThreadPool &) = delete;
-	ThreadPool(ThreadPool &&) = delete;
-	ThreadPool &operator=(ThreadPool &&) = delete;
-
-	int count() const;
-	void spawn(int count = 1);
-	void join();
-	void run();
-	bool runOne();
-
-	template <class F, class... Args>
-	auto enqueue(F &&f, Args &&... args) -> invoke_future_t<F, Args...>;
-
-protected:
-	ThreadPool() = default;
-	~ThreadPool();
-
-	std::function<void()> dequeue(); // returns null function if joining
-
-	std::vector<std::thread> mWorkers;
-	std::queue<std::function<void()>> mTasks;
-	std::atomic<bool> mJoining = false;
-
-	mutable std::mutex mMutex, mWorkersMutex;
-	std::condition_variable mCondition;
-};
-
-template <class F, class... Args>
-auto ThreadPool::enqueue(F &&f, Args &&... args) -> invoke_future_t<F, Args...> {
-	std::unique_lock lock(mMutex);
-	using R = std::invoke_result_t<std::decay_t<F>, std::decay_t<Args>...>;
-	auto task = std::make_shared<std::packaged_task<R()>>(
-	    std::bind(std::forward<F>(f), std::forward<Args>(args)...));
-	std::future<R> result = task->get_future();
-
-	mTasks.emplace([task = std::move(task), token = Init::Token()]() { return (*task)(); });
-	mCondition.notify_one();
-	return result;
-}
-
-} // namespace rtc
-
-#endif

src/tls.cpp

@@ -1,130 +0,0 @@
-/**
- * Copyright (c) 2019-2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "tls.hpp"
-
-#if USE_GNUTLS
-
-namespace rtc::gnutls {
-
-bool check(int ret, const string &message) {
-	if (ret < 0) {
-		if (!gnutls_error_is_fatal(ret)) {
-			PLOG_INFO << gnutls_strerror(ret);
-			return false;
-		}
-		PLOG_ERROR << message << ": " << gnutls_strerror(ret);
-		throw std::runtime_error(message + ": " + gnutls_strerror(ret));
-	}
-	return true;
-}
-
-gnutls_certificate_credentials_t *new_credentials() {
-	auto creds = new gnutls_certificate_credentials_t;
-	gnutls::check(gnutls_certificate_allocate_credentials(creds));
-	return creds;
-}
-
-void free_credentials(gnutls_certificate_credentials_t *creds) {
-	gnutls_certificate_free_credentials(*creds);
-	delete creds;
-}
-
-gnutls_x509_crt_t *new_crt() {
-	auto crt = new gnutls_x509_crt_t;
-	gnutls::check(gnutls_x509_crt_init(crt));
-	return crt;
-}
-
-void free_crt(gnutls_x509_crt_t *crt) {
-	gnutls_x509_crt_deinit(*crt);
-	delete crt;
-}
-
-gnutls_x509_privkey_t *new_privkey() {
-	auto privkey = new gnutls_x509_privkey_t;
-	gnutls::check(gnutls_x509_privkey_init(privkey));
-	return privkey;
-}
-
-void free_privkey(gnutls_x509_privkey_t *privkey) {
-	gnutls_x509_privkey_deinit(*privkey);
-	delete privkey;
-}
-
-gnutls_datum_t make_datum(char *data, size_t size) {
-	gnutls_datum_t datum;
-	datum.data = reinterpret_cast<unsigned char *>(data);
-	datum.size = size;
-	return datum;
-}
-
-} // namespace rtc::gnutls
-
-#else // USE_GNUTLS==0
-
-namespace rtc::openssl {
-
-void init() {
-	static std::mutex mutex;
-	static bool done = false;
-
-	std::lock_guard lock(mutex);
-	if (!std::exchange(done, true)) {
-		OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, nullptr);
-		OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, nullptr);
-	}
-}
-
-string error_string(unsigned long err) {
-	const size_t bufferSize = 256;
-	char buffer[bufferSize];
-	ERR_error_string_n(err, buffer, bufferSize);
-	return string(buffer);
-}
-
-bool check(int success, const string &message) {
-	if (success)
-		return true;
-
-	string str = error_string(ERR_get_error());
-	PLOG_ERROR << message << ": " << str;
-	throw std::runtime_error(message + ": " + str);
-}
-
-bool check(SSL *ssl, int ret, const string &message) {
-	if (ret == BIO_EOF)
-		return true;
-
-	unsigned long err = SSL_get_error(ssl, ret);
-	if (err == SSL_ERROR_NONE || err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) {
-		return true;
-	}
-	if (err == SSL_ERROR_ZERO_RETURN) {
-		PLOG_DEBUG << "DTLS connection cleanly closed";
-		return false;
-	}
-	string str = error_string(err);
-	PLOG_ERROR << str;
-	throw std::runtime_error(message + ": " + str);
-}
-
-} // namespace rtc::openssl
-
-#endif
-

src/tls.hpp

@@ -1,82 +0,0 @@
-/**
- * Copyright (c) 2019-2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef RTC_TLS_H
-#define RTC_TLS_H
-
-#include "include.hpp"
-
-#if USE_GNUTLS
-
-#include <gnutls/gnutls.h>
-
-#include <gnutls/crypto.h>
-#include <gnutls/dtls.h>
-#include <gnutls/x509.h>
-
-namespace rtc::gnutls {
-
-bool check(int ret, const string &message = "GnuTLS error");
-
-gnutls_certificate_credentials_t *new_credentials();
-void free_credentials(gnutls_certificate_credentials_t *creds);
-
-gnutls_x509_crt_t *new_crt();
-void free_crt(gnutls_x509_crt_t *crt);
-
-gnutls_x509_privkey_t *new_privkey();
-void free_privkey(gnutls_x509_privkey_t *privkey);
-
-gnutls_datum_t make_datum(char *data, size_t size);
-
-} // namespace rtc::gnutls
-
-#else // USE_GNUTLS==0
-
-#ifdef _WIN32
-// Include winsock2.h header first since OpenSSL may include winsock.h
-#include <winsock2.h>
-#endif
-
-#include <openssl/ssl.h>
-
-#include <openssl/bio.h>
-#include <openssl/ec.h>
-#include <openssl/err.h>
-#include <openssl/pem.h>
-#include <openssl/x509.h>
-#include <openssl/rsa.h>
-#include <openssl/bn.h>
-
-#ifndef BIO_EOF
-#define BIO_EOF -1
-#endif
-
-namespace rtc::openssl {
-
-void init();
-string error_string(unsigned long err);
-
-bool check(int success, const string &message = "OpenSSL error");
-bool check(SSL *ssl, int ret, const string &message = "OpenSSL error");
-
-} // namespace rtc::openssl
-
-#endif
-
-#endif

src/tlstransport.cpp

@@ -1,449 +0,0 @@
-/**
- * Copyright (c) 2020 Paul-Louis Ageneau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "tlstransport.hpp"
-#include "tcptransport.hpp"
-
-#if RTC_ENABLE_WEBSOCKET
-
-#include <chrono>
-#include <cstring>
-#include <exception>
-#include <iostream>
-
-using namespace std::chrono;
-
-using std::shared_ptr;
-using std::string;
-using std::unique_ptr;
-using std::weak_ptr;
-
-namespace rtc {
-
-#if USE_GNUTLS
-
-void TlsTransport::Init() {
-	// Nothing to do
-}
-
-void TlsTransport::Cleanup() {
-	// Nothing to do
-}
-
-TlsTransport::TlsTransport(shared_ptr<TcpTransport> lower, string host, state_callback callback)
-    : Transport(lower, std::move(callback)), mHost(std::move(host)) {
-
-	PLOG_DEBUG << "Initializing TLS transport (GnuTLS)";
-
-	gnutls::check(gnutls_certificate_allocate_credentials(&mCreds));
-	gnutls::check(gnutls_init(&mSession, GNUTLS_CLIENT));
-
-	try {
-		gnutls::check(gnutls_certificate_set_x509_system_trust(mCreds));
-		gnutls::check(gnutls_credentials_set(mSession, GNUTLS_CRD_CERTIFICATE, mCreds));
-
-		const char *priorities = "SECURE128:-VERS-SSL3.0:-ARCFOUR-128";
-		const char *err_pos = NULL;
-		gnutls::check(gnutls_priority_set_direct(mSession, priorities, &err_pos),
-		              "Failed to set TLS priorities");
-
-       	PLOG_VERBOSE << "Server Name Indication: " << mHost;
-		gnutls_server_name_set(mSession, GNUTLS_NAME_DNS, mHost.data(), mHost.size());
-
- 		gnutls_session_set_ptr(mSession, this);
-		gnutls_transport_set_ptr(mSession, this);
-		gnutls_transport_set_push_function(mSession, WriteCallback);
-		gnutls_transport_set_pull_function(mSession, ReadCallback);
-		gnutls_transport_set_pull_timeout_function(mSession, TimeoutCallback);
-
-	} catch (...) {
-		gnutls_deinit(mSession);
-		gnutls_certificate_free_credentials(mCreds);
-		throw;
-	}
-}
-
-TlsTransport::~TlsTransport() {
-	stop();
-
-	gnutls_deinit(mSession);
-	gnutls_certificate_free_credentials(mCreds);
-}
-
-void TlsTransport::start() {
-	Transport::start();
-
-	registerIncoming();
-
-	PLOG_DEBUG << "Starting TLS recv thread";
-	mRecvThread = std::thread(&TlsTransport::runRecvLoop, this);
-}
-
-bool TlsTransport::stop() {
-	if (!Transport::stop())
-		return false;
-
-	PLOG_DEBUG << "Stopping TLS recv thread";
-	mIncomingQueue.stop();
-	mRecvThread.join();
-	return true;
-}
-
-bool TlsTransport::send(message_ptr message) {
-	if (!message || state() != State::Connected)
-		return false;
-
-	PLOG_VERBOSE << "Send size=" << message->size();
-
-	if(message->size() == 0)
-		return true;
-
-	ssize_t ret;
-	do {
-		ret = gnutls_record_send(mSession, message->data(), message->size());
-	} while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
-
-	return gnutls::check(ret);
-}
-
-void TlsTransport::incoming(message_ptr message) {
-	if (message)
-		mIncomingQueue.push(message);
-	else
-		mIncomingQueue.stop();
-}
-
-void TlsTransport::postHandshake() {
-	// Dummy
-}
-
-void TlsTransport::runRecvLoop() {
-	const size_t bufferSize = 4096;
-	char buffer[bufferSize];
-
-	// Handshake loop
-	try {
-		changeState(State::Connecting);
-
-		int ret;
-		do {
-			ret = gnutls_handshake(mSession);
-		} while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN ||
-		         !gnutls::check(ret, "TLS handshake failed"));
-
-	} catch (const std::exception &e) {
-		PLOG_ERROR << "TLS handshake: " << e.what();
-		changeState(State::Failed);
-		return;
-	}
-
-	// Receive loop
-	try {
-		PLOG_INFO << "TLS handshake finished";
-		changeState(State::Connected);
-		postHandshake();
-
-		while (true) {
-			ssize_t ret;
-			do {
-				ret = gnutls_record_recv(mSession, buffer, bufferSize);
-			} while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
-
-			// Consider premature termination as remote closing
-			if (ret == GNUTLS_E_PREMATURE_TERMINATION) {
-				PLOG_DEBUG << "TLS connection terminated";
-				break;
-			}
-
-			if (gnutls::check(ret)) {
-				if (ret == 0) {
-					// Closed
-					PLOG_DEBUG << "TLS connection cleanly closed";
-					break;
-				}
-				auto *b = reinterpret_cast<byte *>(buffer);
-				recv(make_message(b, b + ret));
-			}
-		}
-	} catch (const std::exception &e) {
-		PLOG_ERROR << "TLS recv: " << e.what();
-	}
-
-	gnutls_bye(mSession, GNUTLS_SHUT_RDWR);
-
-	PLOG_INFO << "TLS closed";
-	changeState(State::Disconnected);
-	recv(nullptr);
-}
-
-ssize_t TlsTransport::WriteCallback(gnutls_transport_ptr_t ptr, const void *data, size_t len) {
-	TlsTransport *t = static_cast<TlsTransport *>(ptr);
-	if (len > 0) {
-		auto b = reinterpret_cast<const byte *>(data);
-		t->outgoing(make_message(b, b + len));
-	}
-	gnutls_transport_set_errno(t->mSession, 0);
-	return ssize_t(len);
-}
-
-ssize_t TlsTransport::ReadCallback(gnutls_transport_ptr_t ptr, void *data, size_t maxlen) {
-	TlsTransport *t = static_cast<TlsTransport *>(ptr);
-
-	message_ptr &message = t->mIncomingMessage;
-	size_t &position = t->mIncomingMessagePosition;
-
-	if(message && position >= message->size())
-		message.reset();
-
-	if(!message) {
-		position = 0;
-		while (auto next = t->mIncomingQueue.pop()) {
-			message = *next;
-			if (message->size() > 0)
-				break;
-			else
-				t->recv(message); // Pass zero-sized messages through
-		}
-	}
-
-	if(message) {
-		size_t available = message->size() - position;
-		ssize_t len = std::min(maxlen, available);
-		std::memcpy(data, message->data() + position, len);
-		position+= len;
-		gnutls_transport_set_errno(t->mSession, 0);
-		return len;
-	}
-	else {
-		// Closed
-		gnutls_transport_set_errno(t->mSession, 0);
-		return 0;
-	}
-}
-
-int TlsTransport::TimeoutCallback(gnutls_transport_ptr_t ptr, unsigned int ms) {
-	TlsTransport *t = static_cast<TlsTransport *>(ptr);
-	bool notEmpty = t->mIncomingQueue.wait(
-	    ms != GNUTLS_INDEFINITE_TIMEOUT ? std::make_optional(milliseconds(ms)) : nullopt);
-	return notEmpty ? 1 : 0;
-}
-
-#else // USE_GNUTLS==0
-
-int TlsTransport::TransportExIndex = -1;
-
-void TlsTransport::Init() {
-	openssl::init();
-
-	if (TransportExIndex < 0) {
-		TransportExIndex = SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL);
-	}
-}
-
-void TlsTransport::Cleanup() {
-	// Nothing to do
-}
-
-TlsTransport::TlsTransport(shared_ptr<TcpTransport> lower, string host, state_callback callback)
-    : Transport(lower, std::move(callback)), mHost(std::move(host)) {
-
-	PLOG_DEBUG << "Initializing TLS transport (OpenSSL)";
-
-	try {
-		if (!(mCtx = SSL_CTX_new(SSLv23_method()))) // version-flexible
-			throw std::runtime_error("Failed to create SSL context");
-
-		openssl::check(SSL_CTX_set_cipher_list(mCtx, "ALL:!LOW:!EXP:!RC4:!MD5:@STRENGTH"),
-		               "Failed to set SSL priorities");
-
-		if (!SSL_CTX_set_default_verify_paths(mCtx)) {
-			PLOG_WARNING << "SSL root CA certificates unavailable";
-		}
-
-		SSL_CTX_set_options(mCtx, SSL_OP_NO_SSLv3);
-		SSL_CTX_set_min_proto_version(mCtx, TLS1_VERSION);
-		SSL_CTX_set_read_ahead(mCtx, 1);
-		SSL_CTX_set_quiet_shutdown(mCtx, 1);
-		SSL_CTX_set_info_callback(mCtx, InfoCallback);
-		SSL_CTX_set_verify(mCtx, SSL_VERIFY_NONE, NULL);
-
-		if (!(mSsl = SSL_new(mCtx)))
-			throw std::runtime_error("Failed to create SSL instance");
-
-		SSL_set_ex_data(mSsl, TransportExIndex, this);
-
-		SSL_set_hostflags(mSsl, 0);
-		openssl::check(SSL_set1_host(mSsl, mHost.c_str()), "Failed to set SSL host");
-
-		PLOG_VERBOSE << "Server Name Indication: " << mHost;
-		SSL_set_tlsext_host_name(mSsl, mHost.c_str());
-
-		SSL_set_connect_state(mSsl);
-
-		if (!(mInBio = BIO_new(BIO_s_mem())) || !(mOutBio = BIO_new(BIO_s_mem())))
-			throw std::runtime_error("Failed to create BIO");
-
-		BIO_set_mem_eof_return(mInBio, BIO_EOF);
-		BIO_set_mem_eof_return(mOutBio, BIO_EOF);
-		SSL_set_bio(mSsl, mInBio, mOutBio);
-
-		auto ecdh = unique_ptr<EC_KEY, decltype(&EC_KEY_free)>(
-		    EC_KEY_new_by_curve_name(NID_X9_62_prime256v1), EC_KEY_free);
-		SSL_set_options(mSsl, SSL_OP_SINGLE_ECDH_USE);
-		SSL_set_tmp_ecdh(mSsl, ecdh.get());
-
-	} catch (...) {
-		if (mSsl)
-			SSL_free(mSsl);
-		if (mCtx)
-			SSL_CTX_free(mCtx);
-		throw;
-	}
-}
-
-TlsTransport::~TlsTransport() {
-	stop();
-
-	SSL_free(mSsl);
-	SSL_CTX_free(mCtx);
-}
-
-void TlsTransport::start() {
-	Transport::start();
-
-	registerIncoming();
-
-	PLOG_DEBUG << "Starting TLS recv thread";
-	mRecvThread = std::thread(&TlsTransport::runRecvLoop, this);
-}
-
-bool TlsTransport::stop() {
-	if (!Transport::stop())
-		return false;
-
-	PLOG_DEBUG << "Stopping TLS recv thread";
-	mIncomingQueue.stop();
-	mRecvThread.join();
-	SSL_shutdown(mSsl);
-	return true;
-}
-
-bool TlsTransport::send(message_ptr message) {
-	if (!message || state() != State::Connected)
-		return false;
-
-	PLOG_VERBOSE << "Send size=" << message->size();
-
-	if (message->size() == 0)
-		return true;
-
-	int ret = SSL_write(mSsl, message->data(), int(message->size()));
-	if (!openssl::check(mSsl, ret))
-		return false;
-
-	const size_t bufferSize = 4096;
-	byte buffer[bufferSize];
-	while ((ret = BIO_read(mOutBio, buffer, bufferSize)) > 0)
-		outgoing(make_message(buffer, buffer + ret));
-
-	return true;
-}
-
-void TlsTransport::incoming(message_ptr message) {
-	if (message)
-		mIncomingQueue.push(message);
-	else
-		mIncomingQueue.stop();
-}
-
-void TlsTransport::postHandshake() {
-	// Dummy
-}
-
-void TlsTransport::runRecvLoop() {
-	const size_t bufferSize = 4096;
-	byte buffer[bufferSize];
-
-	try {
-		changeState(State::Connecting);
-
-		while (true) {
-			if (state() == State::Connecting) {
-				// Initiate or continue the handshake
-				int ret = SSL_do_handshake(mSsl);
-				if (!openssl::check(mSsl, ret, "Handshake failed"))
-					break;
-
-				// Output
-				while ((ret = BIO_read(mOutBio, buffer, bufferSize)) > 0)
-					outgoing(make_message(buffer, buffer + ret));
-
-				if (SSL_is_init_finished(mSsl)) {
-					PLOG_INFO << "TLS handshake finished";
-					changeState(State::Connected);
-					postHandshake();
-				}
-			} else {
-				int ret = SSL_read(mSsl, buffer, bufferSize);
-				if (!openssl::check(mSsl, ret))
-					break;
-
-				if (ret > 0)
-					recv(make_message(buffer, buffer + ret));
-			}
-
-			auto next = mIncomingQueue.pop();
-			if (!next)
-				break;
-
-			message_ptr message = std::move(*next);
-			if (message->size() > 0)
-				BIO_write(mInBio, message->data(), int(message->size())); // Input
-			else
-				recv(message); // Pass zero-sized messages through
-		}
-
-	} catch (const std::exception &e) {
-		PLOG_ERROR << "TLS recv: " << e.what();
-	}
-
-	if (state() == State::Connected) {
-		PLOG_INFO << "TLS closed";
-		recv(nullptr);
-	} else {
-		PLOG_ERROR << "TLS handshake failed";
-	}
-}
-
-void TlsTransport::InfoCallback(const SSL *ssl, int where, int ret) {
-	TlsTransport *t =
-	    static_cast<TlsTransport *>(SSL_get_ex_data(ssl, TlsTransport::TransportExIndex));
-
-	if (where & SSL_CB_ALERT) {
-		if (ret != 256) { // Close Notify
-			PLOG_ERROR << "TLS alert: " << SSL_alert_desc_string_long(ret);
-		}
-		t->mIncomingQueue.stop(); // Close the connection
-	}
-}
-
-#endif
-
-} // namespace rtc
-
-#endif