Compare commits

..

854 Commits

Author SHA1 Message Date
e4ab5273fc Bumped version to 0.12.3 2021-05-07 21:24:17 +02:00
bf0b3ce1b9 Resolve use of deprecated ::result_type typedef.
Also adds #include <utility> since this file names std::move.

```
         D:\buildtrees\libdatachannel\src\v0.12.0-2d418b9dcd.clean\include\rtc\utils.hpp(35,23): error C4996: 'std::_Weak_result_type<std::_Is_memfunptr<void (__cdecl rtc::impl::PeerConnection::* )(std::weak_ptr<_Ty>)>,void>::result_type': warning STL4007: Many result_type typedefs and all argument_type, first_argument_type, and second_argument_type typedefs are deprecated in C++17. You can define _SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING or _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [D:\buildtrees\libdatachannel\x64-uwp-dbg\datachannel.vcxproj]
         D:\buildtrees\libdatachannel\src\v0.12.0-2d418b9dcd.clean\include\rtc\utils.hpp(35,23): error C4996: 'std::_Weak_result_type<std::_Is_memfunptr<void (__cdecl rtc::impl::PeerConnection::* )(rtc::Candidate)>,void>::result_type': warning STL4007: Many result_type typedefs and all argument_type, first_argument_type, and second_argument_type typedefs are deprecated in C++17. You can define _SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING or _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [D:\buildtrees\libdatachannel\x64-uwp-dbg\datachannel.vcxproj]
         D:\buildtrees\libdatachannel\src\v0.12.0-2d418b9dcd.clean\include\rtc\utils.hpp(35,23): error C4996: 'std::_Weak_result_type<std::_Is_memfunptr<bool (__cdecl rtc::impl::PeerConnection::* )(const std::string &) const>,void>::result_type': warning STL4007: Many result_type typedefs and all argument_type, first_argument_type, and second_argument_type typedefs are deprecated in C++17. You can define _SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING or _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [D:\buildtrees\libdatachannel\x64-uwp-dbg\datachannel.vcxproj]
         D:\buildtrees\libdatachannel\src\v0.12.0-2d418b9dcd.clean\include\rtc\utils.hpp(35,23): error C4996: 'std::_Weak_result_type<std::_Is_memfunptr<void (__cdecl rtc::impl::PeerConnection::* )(rtc::message_ptr)>,void>::result_type': warning STL4007: Many result_type typedefs and all argument_type, first_argument_type, and second_argument_type typedefs are deprecated in C++17. You can define _SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING or _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [D:\buildtrees\libdatachannel\x64-uwp-dbg\datachannel.vcxproj]
         D:\buildtrees\libdatachannel\src\v0.12.0-2d418b9dcd.clean\include\rtc\utils.hpp(35,23): error C4996: 'std::_Weak_result_type<std::_Is_memfunptr<void (__cdecl rtc::impl::PeerConnection::* )(uint16_t,size_t)>,void>::result_type': warning STL4007: Many result_type typedefs and all argument_type, first_argument_type, and second_argument_type typedefs are deprecated in C++17. You can define _SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING or _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [D:\buildtrees\libdatachannel\x64-uwp-dbg\datachannel.vcxproj]
```
2021-04-20 09:20:56 +02:00
655175d21e Bumped version to 0.12.2 2021-04-14 12:24:12 +02:00
c85943e916 support finding openssl form homebrew on M1 Macs
homebrew changed its default installation paths for M1 Macs
2021-04-14 12:22:26 +02:00
1cc7910bf1 Made impl::DataChannel destructor virtual 2021-04-13 22:29:25 +02:00
62b435a4aa Fixed compilation warnings 2021-04-10 16:22:05 +02:00
9da756bd12 Updated Jamfile 2021-04-10 10:54:10 +02:00
f5b584f536 Handle empty RTCIceCandidate.candidate as "end of candidates" indicator 2021-04-08 15:10:26 +02:00
3eb8ab567e Bumped version to 0.12.1 2021-04-07 17:45:03 +02:00
f1a7afb28e Merge pull request #392 from paullouisageneau/fix-htonll
Fix htonll fallback implementation
2021-04-07 16:01:53 +02:00
9a7b672d6e Fixed htonll fallback implementation 2021-04-07 15:50:11 +02:00
9da58f4343 Updated Readme 2021-04-06 19:02:33 +02:00
ef2e7c609a Merge pull request #390 from paullouisageneau/fix-dc-double-offer
Fix DataChannel stream number assignment on double offer
2021-04-06 18:52:44 +02:00
d330738b41 Fixed synchronization in DataChannel::shiftStream() 2021-04-06 18:44:29 +02:00
791e6b1e32 Fixed DataChannel shifting on double offer 2021-04-06 18:39:12 +02:00
b5884c84fc Fixed mistakes in Doc 2021-04-04 17:07:17 +02:00
236d0e9b33 Bumped version to 0.12.0 2021-04-03 20:56:36 +02:00
ae2cf2f0d1 Removed deprecated USE_JUICE CMake option 2021-04-03 20:56:01 +02:00
238358b5a3 Updated libjuice to v0.7.1 2021-04-03 20:05:09 +02:00
c0b0917601 Merge pull request #387 from paullouisageneau/pending-datachannels
Queue for incoming Data Channels and Tracks
2021-04-02 12:04:12 +02:00
b2d9332fcd Added pending queue for incoming DataChannels and Tracks 2021-04-02 11:21:44 +02:00
c3e0dbf003 Disabled WebSocket test 2021-04-01 17:21:49 +02:00
ac26d90dfb Merge pull request #386 from paullouisageneau/message-size
Add setting to change local maximum message size
2021-04-01 14:24:43 +02:00
93e985a541 Fixed CI WebSocket test on MacOS 2021-04-01 14:16:48 +02:00
686b8c3aa5 Fixed generated application SDP entry with libnice 2021-03-31 21:34:57 +02:00
b07ebcffa4 Added maxMessageSize to Doc 2021-03-31 18:14:20 +02:00
77dc32da37 Added maxMessageSize configuration setting 2021-03-31 18:10:35 +02:00
17a649b29b Merge pull request #385 from wasphin/feature/install-missing-header
Fix missing header utils.hpp
2021-03-27 08:33:25 +01:00
wxf
82e93062d3 Fix missing header utils.hpp 2021-03-27 15:11:31 +08:00
85b0e11cb8 Reordered Readme 2021-03-26 21:07:55 +01:00
294a1230b0 Re-enabled WebSocket echo test 2021-03-26 20:33:57 +01:00
f61ca226fb Check return of read() and write() to prevent g++ warning 2021-03-26 20:33:36 +01:00
10dcf36f3a Merge pull request #384 from murat-dogan/client-benchmark-readme
Client benchmark readme
2021-03-26 20:33:04 +01:00
ec1a358e66 fix typos 2021-03-25 14:43:51 +03:00
42f59cc033 add client-benchmark readme 2021-03-25 14:35:34 +03:00
4609db256f update examples/readme 2021-03-25 14:08:26 +03:00
91c28fec6c Merge pull request #368 from murat-dogan/client-benchmark
Client for benchmark purposes
2021-03-24 19:11:29 +01:00
5028598728 Merge pull request #383 from paullouisageneau/force-srtp-profile
Always negotiate SRTP profile in DTLS handshake
2021-03-24 19:08:43 +01:00
a70afacfda Always set SRTP profile 2021-03-24 18:30:17 +01:00
7226ecb0b5 change elapsedTimeInMs to elapsedTimeInSecs 2021-03-24 20:17:04 +03:00
9eefc723c2 use elapsedTime for calculation 2021-03-24 12:13:11 +03:00
33c7518b17 Merge pull request #379 from hanseuljun/uwp-examples
Supporting Examples in UWP
2021-03-23 21:54:04 +01:00
d34ee67fbf Fixed Readme 2021-03-23 21:42:50 +01:00
6e7335e844 Merge pull request #382 from paullouisageneau/update-plog
Update plog
2021-03-23 21:32:28 +01:00
73e8ed7344 Merge branch 'master' into uwp-examples 2021-03-23 21:30:05 +01:00
58fbc83df3 Fixed indentation 2021-03-23 21:27:42 +01:00
a624b41cee Merge pull request #381 from hanseuljun/uwp-streamer
Avoid error message coming from UWP MSVC
2021-03-23 21:26:19 +01:00
4cf5f8356a Changed plog URL to https://github.com/SergiusTheBest/plog.git 2021-03-23 21:18:53 +01:00
90c257eab9 Avoid error message coming from UWP MSVC. 2021-03-23 12:39:36 -07:00
aaa7073deb Updated RFC references 2021-03-23 20:28:42 +01:00
6b21637dd5 Make examples in /media, /sfu-media, and /streamer work in UWP. 2021-03-23 11:11:27 -07:00
e33717e077 Make examples in /client, /copy-paste-capi/, and /copy-paste work. 2021-03-23 10:59:10 -07:00
dfc9fdb9b0 As the first example, make copy-paste-answerer work in UWP. 2021-03-23 10:41:43 -07:00
460fe74767 Added certificateType to C API Doc 2021-03-23 11:27:53 +01:00
72eb478b0d Set default certificate type in Configuration 2021-03-22 21:14:27 +01:00
ee37c9bae4 Fixed build with Makefile 2021-03-22 21:08:46 +01:00
9f17522230 Merge pull request #377 from paullouisageneau/ecdsa
ECDSA support
2021-03-22 21:05:29 +01:00
50a6832fb3 Fixed compilation with GnuTLS 2021-03-22 20:55:28 +01:00
fff1912d30 Added certificateType option to C API 2021-03-22 19:57:33 +01:00
08a6c5c45b Lowered RSA bits to 2048 2021-03-22 19:07:48 +01:00
46f2149bae Updated Readme 2021-03-22 19:07:20 +01:00
1a99ad8e91 Disabled renegociation with no_renegociation alert 2021-03-22 19:06:28 +01:00
9b36ac3dd3 Implemented ECDSA certificates support and removed certificate cache 2021-03-22 19:05:43 +01:00
09958faa1a Set CMake policiy CMP0077 to NEW 2021-03-21 21:31:14 +01:00
f904063ccd Merge pull request #374 from paullouisageneau/check-fingerprint
Fingerprint check
2021-03-19 19:56:32 +01:00
016aea7805 Added fingerprint check 2021-03-19 12:49:48 +01:00
4dc0e59309 fix default bufferSize value 2021-03-19 09:30:11 +03:00
31f384f4e0 constant throughput functionality 2021-03-19 09:27:01 +03:00
84e114ebfc Fix params 2021-03-19 09:26:13 +03:00
1c702a1f7f Add Throughput params 2021-03-18 23:03:48 +03:00
77448245a0 KB to kB and time calc 2021-03-18 20:13:04 +03:00
412f94dd96 Fixed getnameinfo() service buffer length for libnice 2021-03-17 11:33:15 +01:00
d5890ecc05 Merge pull request #371 from stazio/fix_typos
Fixed the description of SDPs and refactor RTP_RTX packets
2021-03-16 20:38:34 +01:00
a4ca6858a1 Merge branch 'master' into fix_typos 2021-03-16 20:29:14 +01:00
ec1b253d6c Updated libjuice 2021-03-16 09:25:44 +01:00
sam
b0e1a7989d Fix additional typos made by the previous typos 2021-03-15 22:09:21 -04:00
sam
67644f4fc7 Removed unnecessary code 2021-03-15 21:28:14 -04:00
sam
f83a03fcad Fixed the description of SDPs 2021-03-15 19:31:47 -04:00
c8c4f8db64 fix atomic op 2021-03-15 10:17:39 +03:00
5fab9697f1 delete .vscode files 2021-03-15 10:03:11 +03:00
52494f4855 Fixed dependabot following #367 2021-03-14 19:09:18 +01:00
b765cba3d2 Enhanced Readmes in examples 2021-03-14 18:32:16 +01:00
c8ce1c9379 Merge pull request #370 from paullouisageneau/fix-signaling-server-nodejs
Follow-up on #367
2021-03-14 18:18:45 +01:00
4f7d7b9515 Merge pull request #369 from paullouisageneau/fix-track-setmediahandler-sync
Follow-up on #365
2021-03-14 17:59:38 +01:00
ed392f930b Added dummy HTTP answerer 2021-03-14 17:56:00 +01:00
72b29da674 Updated package-lock for signaling server 2021-03-14 17:55:37 +01:00
7e9996a2ff Fixed npm start and updated package.json for signaling server 2021-03-14 17:54:58 +01:00
758f452950 Reset outgoing callback when switching media handlers 2021-03-14 17:36:08 +01:00
e7a63577bf Fixed synchronization regression in Track::setMediaHandler() 2021-03-14 17:31:27 +01:00
6e70ef35ba Merge pull request #365 from stazio/fix_media_handler
Added a move to the MediaHandler and a null test
2021-03-14 17:21:35 +01:00
47b95661fa Merge pull request #367 from murat-dogan/signaling-server-node
Separate node.js signaling server
2021-03-14 17:20:26 +01:00
367cd09195 add noSend option 2021-03-12 16:41:14 +03:00
9cd01a265f add duration parameter 2021-03-12 16:18:27 +03:00
2935717812 delete static file serve part 2021-03-12 15:26:44 +03:00
895fe88a62 client-benchmark app 2021-03-12 15:17:33 +03:00
080b8f53f8 Some fixes in Doc 2021-03-12 12:44:46 +01:00
19c91ecadb Merge pull request #246 from paullouisageneau/doc
C API documentation
2021-03-12 12:39:06 +01:00
3013324e64 Referenced Doc in Readme 2021-03-12 12:35:53 +01:00
87f71eda79 Documented configuration flags 2021-03-12 12:29:16 +01:00
41e2f93ab6 Added STUN/TURN URI format description in doc 2021-03-12 12:29:12 +01:00
29479d1e91 Updated rtcAddDataChannelEx() in doc 2021-03-12 12:28:21 +01:00
abb01d85df Added DOC.md 2021-03-12 12:28:21 +01:00
e3ffbc0d01 rename file to signaling-server.js 2021-03-12 14:12:09 +03:00
e314318e5a seperate node.js signaling server 2021-03-12 14:09:47 +03:00
3744b8f09d Added thanks section to Readme 2021-03-12 10:38:28 +01:00
f3f8ecfe3b Enhaned Readme and moved building instructions to BUILDING.md 2021-03-12 10:28:23 +01:00
sam
454d31bd82 Added a move to the MediaHandler and a null test 2021-03-11 14:26:07 -05:00
8ab1d80cf8 Updated libjuice to v0.7.0 2021-03-11 13:28:03 +01:00
4cda5fe27b Merge branch 'v0.11' 2021-03-10 18:59:54 +01:00
38db6d7365 Bumped version to 0.11.10 2021-03-10 18:59:14 +01:00
781d864b9f Added missing atomic 2021-03-10 18:59:12 +01:00
8cbcb35bf4 Fixed incorrect scope_guard 2021-03-10 18:58:15 +01:00
f76243fb38 Merge branch 'v0.11' 2021-03-08 19:30:24 +01:00
b63ec9cead Bumped version to 0.11.9 2021-03-08 13:07:58 +01:00
aa6f87f467 Removed rtc::Cleanup() call in each test 2021-03-08 13:07:58 +01:00
eec7a761e8 Replaced incorrect reinterpret_pointer_cast by dynamic_pointer_cast 2021-03-08 13:02:25 +01:00
3e905f8b04 Merge branch 'v0.11' 2021-03-07 20:11:14 +01:00
125edff298 Bumped version to 0.11.8 2021-03-07 20:06:02 +01:00
0813976a5a Use SCTP default congestion control instead of H-TCP 2021-03-07 20:05:18 +01:00
3d6d878354 Merge pull request #361 from murat-dogan/master
Use default congestion control
2021-03-07 19:51:14 +01:00
068691b9d0 Use default congestion control
And disable SCTP_CC_HTCP mode
2021-03-07 17:54:26 +03:00
2fd3f6ad45 Merge branch 'v0.11' 2021-03-06 09:09:18 +01:00
4642504b83 Merge pull request #359 from paullouisageneau/no-nrsack
Do not enable SCTP NR-SACKs
2021-03-06 09:08:47 +01:00
5b760532c2 Do not enable SCTP NR-SACKs 2021-03-05 20:51:09 +01:00
69bcdade50 Merge pull request #358 from paullouisageneau/sctp-limit-flush-scheduling
Limit scheduling of flush tasks in SCTP transport
2021-03-05 20:47:08 +01:00
bd3df48c0b Limit scheduling of flush tasks in SCTP transport 2021-03-05 18:50:10 +01:00
faf3158609 Merge pull request #356 from paullouisageneau/fix-threadpool-workers-access
Fix unsynchronized access in thread pool
2021-03-05 12:20:05 +01:00
b766be1880 Fixed unsynchronized access to mWorkers in ThreadPool 2021-03-05 12:10:29 +01:00
6b4db006f4 Merge branch 'v0.11' 2021-03-04 12:11:07 +01:00
b3edcfa05c Bumped version to 0.11.7 2021-03-04 12:08:43 +01:00
19e148363c Merge pull request #353 from paullouisageneau/fix-buffered-amount-callback
Fix buffered amount callback synchronization
2021-03-04 12:05:11 +01:00
7f6f178177 Fixed buffered amount callback synchronization 2021-03-03 19:27:54 +01:00
7962069762 Fixed compilation for MacOS 2021-03-03 13:54:57 +01:00
30117bc3a3 Renamed Track::*RtcpHandler methods to Track::*MediaHandler 2021-03-03 12:25:43 +01:00
767694a8b8 Use ptrs, optionals and variants from rtc namespace 2021-03-03 12:16:58 +01:00
ff34858e41 Merge pull request #351 from paullouisageneau/config-autonegotiation
Introduce configuration flag to disable auto negotiation
2021-03-03 12:13:58 +01:00
74f376e246 Added configuration flag to disable auto negotiation 2021-03-03 10:59:31 +01:00
40a29fbd55 Removed addDataChannel method from API 2021-03-02 22:13:22 +01:00
7670883b75 Fixed typo in example code 2021-03-02 21:48:25 +01:00
b264774c2a Fixed streamer default directory path assuming default build 2021-03-02 19:54:25 +01:00
3d04fb794a Added custom MTU and STUN server to C API connectivity test 2021-03-02 19:48:50 +01:00
3c9c5bb37b Merge pull request #349 from paullouisageneau/fix-fragment-size
Harmonize MTU with fragment size
2021-03-02 18:59:28 +01:00
32c4427b96 Reorganized defines and added mtu option to C API 2021-03-02 16:25:05 +01:00
a936fed022 Merge pull request #350 from ilsalvopss/candidate_compare
Candidate == operator compares also mNode and mService
2021-03-02 09:20:27 +01:00
9d72c1818a Candidate == operator compares also mNode and mService 2021-03-01 23:47:26 +01:00
83453635a8 Replaced shared_from_this() with weak_from_this() where applicable 2021-03-01 20:20:06 +01:00
b8adccc0ec Harmonized MTU with fragment size and set default MTU to 1280 2021-03-01 20:11:36 +01:00
9f6e99c0a8 Fixed deadlock in MediaChainableHandler (regression introduced in #347) 2021-03-01 15:29:35 +01:00
4b5576d30e Merge branch 'v0.11' 2021-03-01 12:37:27 +01:00
2db14a29a9 Bumped version to 0.11.6 2021-03-01 12:33:38 +01:00
5cbbba2e12 Fixed Track::maxMessageSize() 2021-03-01 12:33:38 +01:00
93aef867d0 Fixed track outgoing no media support issue 2021-03-01 12:25:34 +01:00
2287f6a473 Merge pull request #347 from paullouisageneau/interface-refactoring
Refactor interface
2021-02-28 18:24:37 +01:00
e99ba3c5d8 Bumped version to 0.11.5 2021-02-28 18:11:12 +01:00
4dcd96d9d3 Fixed CheshireCat::operator=() 2021-02-28 18:09:06 +01:00
4082244eb1 Fixed Track::maxMessageSize() dummy value 2021-02-28 17:29:46 +01:00
3e9a769ca1 Made helper classes final 2021-02-28 17:18:02 +01:00
3227d58e74 Moved Queue to impl 2021-02-28 17:14:45 +01:00
e37bea360d Fixed compilation with libnice 2021-02-28 17:04:03 +01:00
f154f3cced Removed warning when adding track without media support 2021-02-28 15:00:00 +01:00
d87be3dd8e Made pimpl objects movable but non-copyable 2021-02-28 14:56:22 +01:00
dbee42b099 Renamed include.hpp to common.hpp 2021-02-28 14:56:21 +01:00
54d0cb898d Split include.hpp 2021-02-28 14:32:59 +01:00
7880d31126 Updated Readme 2021-02-28 12:36:55 +01:00
0638555fef Removed shared_ptr to PeerConnection in tests 2021-02-28 12:36:55 +01:00
dde79d78d4 Moved implementation away with pimpl aka cheshire cat pattern 2021-02-28 11:16:51 +01:00
65dba2c299 Merge pull request #346 from paullouisageneau/fix-mtu
Fix path MTU
2021-02-27 11:39:22 +01:00
6ef8f1e1a7 Added optional MTU setting in configuration 2021-02-27 11:17:49 +01:00
56dbcaad97 Fixed path MTU 2021-02-26 14:12:12 +01:00
d748016446 Merge pull request #344 from paullouisageneau/fix-datachannel-data-race
Fix possible data race in DataChannel
2021-02-25 19:25:40 +01:00
e543d789a4 Refactored Track to follow DataChannel 2021-02-23 22:53:04 +01:00
90e59435c0 Added synchronization to DataChannel 2021-02-23 22:52:56 +01:00
785c3b8149 Renamed "Negociated" to "Negotiated" 2021-02-23 18:34:23 +01:00
c37c88543d Bumped version to 0.11.4 2021-02-22 21:04:31 +01:00
011bfbe46f Merge pull request #342 from paullouisageneau/fix-usrsctp-data-race
Update usrsctp and mitigate possible data race
2021-02-22 19:28:06 +01:00
de2ac6c0c2 Mitigation for data race 2021-02-22 19:05:45 +01:00
75619babd7 Updated usrsctp to v0.9.5.0 2021-02-22 19:00:35 +01:00
fe9a34905b Fixed missing data channels mutex lock 2021-02-22 09:49:03 +01:00
b88f1f5e72 Bumped version to 0.11.3 2021-02-21 20:49:30 +01:00
ab7d7fefe0 Prevent lock order inversion 2021-02-21 20:46:04 +01:00
e592fcf217 Fixed compilation warnings 2021-02-21 15:46:03 +01:00
10567074c3 Bumped version to 0.11.2 2021-02-20 21:58:43 +01:00
524c56dee9 Merge pull request #339 from paullouisageneau/fix-scheduling
Proper fix for possible deadlock at exit
2021-02-17 21:32:22 +01:00
efe12f0b73 Proper fix for thread pool deadlock at exit 2021-02-17 18:21:02 +01:00
82568e3aa0 Revert "Prevent scheduling tasks while joining thread pool"
This reverts commit ab392fe0da.
2021-02-17 17:15:03 +01:00
7082129b54 Merge pull request #337 from hanseuljun/windows-examples-dll-copy
Add copy commands that copies datachannel.dll to examples when examples built
2021-02-16 22:47:09 +01:00
24f8016e4e Merge pull request #336 from hanseuljun/capi-enum-integers
Assign integers to enums rtcCodec and rtcDirection.
2021-02-16 22:45:56 +01:00
98d926a7bf Clean up examples/streamer/CMakeLists.txt a little bit. 2021-02-16 13:32:44 -08:00
ffb589d498 Add dll copy commands to examples for Windows. 2021-02-16 13:28:45 -08:00
4db6afe9e2 Assign integers to enums rtcCodec and rtcDirection. 2021-02-16 13:13:25 -08:00
bdb59905dd Merge pull request #335 from in2core/feature/remove-wrap-macro
Remove WRAP macro
2021-02-16 19:00:20 +01:00
c2b181c6da Remove WRAP macro 2021-02-16 10:28:47 +01:00
3f53365564 Merge pull request #333 from hanseuljun/cmake-add-headers
Add header files to cmake add_library() calls.
2021-02-15 22:15:38 +01:00
95dfa1015d Fixed headers path 2021-02-15 19:27:38 +01:00
1f20f8f1e7 Add header files to cmake add_library() calls. 2021-02-14 23:43:19 -08:00
b2d1a41f7e Merge pull request #332 from paullouisageneau/capi-remote-type
Add description type getters to C API
2021-02-14 16:12:32 +01:00
9e2e7a7722 Added rtcGetLocalDescriptionType() and rtcGetRemoteDescriptionType() 2021-02-14 15:53:19 +01:00
1e02fa34c3 Fixed some compilation warnings 2021-02-11 00:23:43 +01:00
882c605876 Merge pull request #318 from in2core/feature/chainable-rtcp-handlers
Chaining of multiple RTP/RTCP handlers
2021-02-10 22:23:50 +01:00
36a88c605a Merge branch 'master' into feature/chainable-rtcp-handlers
# Conflicts:
#	src/h264packetizationhandler.cpp
2021-02-08 10:19:26 +01:00
09dfc39fd9 Refactor optional pointer to pointer 2021-02-08 10:13:31 +01:00
986e5f985f Merge pull request #328 from in2core/hotfix/split-h264-by-start-sequence
Fix splitting of h264 NALU by start sequence
2021-02-06 10:32:01 +01:00
3e2b0c43ef Merge pull request #327 from in2core/feature/msid-set-trackid
Add API to set track id in msid
2021-02-05 22:29:39 +01:00
557b293934 Fix: splitting of h264 NALU by start sequence now works correctly 2021-02-05 14:37:13 +01:00
7730496bf9 Fix streamer example for safari 2021-02-05 13:58:33 +01:00
2b7dc4c529 Rename RtcpHandler to MediaHandler 2021-02-05 13:17:59 +01:00
b5699239cc Rename RtcpSRReporter to RtcpSrReporter for naming consistency 2021-02-05 12:53:26 +01:00
9f3b004756 Add API to set track id in msid 2021-02-05 12:10:51 +01:00
8a61043bd7 Bumped version to 0.11.1 2021-02-04 19:31:59 +01:00
93eaa67f5c Renamed guards for consistency 2021-02-04 19:30:07 +01:00
690653f8ef Merge pull request #326 from paullouisageneau/fix-deadlock-at-exit
Fix possible deadlock at exit
2021-02-04 19:25:33 +01:00
ab392fe0da Prevent scheduling tasks while joining thread pool 2021-02-04 19:08:44 +01:00
669800b39a Merge pull request #324 from hanseuljun/uwp-fix
Uwp fix (addressing #310 with the error dialog popping up)
2021-02-04 18:40:19 +01:00
4ba8c9e3e8 Move uwp-tests and uwp-benchmark to uwp/tests and uwp/benchmark. 2021-02-03 13:57:09 -08:00
1b74ebb0f4 Make setting OUTPUT_NAME work in UWP. 2021-02-03 02:59:56 -08:00
433d5fbe7f Support datachannel-tests and datachannel-benchmark in UWP. 2021-02-03 02:51:43 -08:00
3204a77e89 Add uwp resources that stops uwp dinging with an error dialog for datachannel-tests. 2021-02-03 02:04:55 -08:00
b347afae14 Fix unexpected deallocation of element in RtcpChainableHandler's chain 2021-02-02 15:52:02 +01:00
0482953062 Refactor capi.cpp to preffer make_shared 2021-02-02 13:59:47 +01:00
b5589dbd57 Merge pull request #322 from paullouisageneau/fix-stoul
Add checks on std::stoul()
2021-01-30 10:13:00 +01:00
c23fb10725 Fixed compilation with libnice 2021-01-30 09:59:43 +01:00
dbfade4eb3 Changed service to port and added checks on std::stoul() 2021-01-30 09:48:55 +01:00
289b71bc8e Merge pull request #320 from paullouisageneau/fix-double-message
Clean up useless message
2021-01-28 17:42:14 +01:00
e43c3730a6 Removed useless message 2021-01-28 16:48:16 +01:00
7b206899a4 Update streamer example 2021-01-28 12:24:31 +01:00
c2c57b16df Add RTCP Nack responder 2021-01-28 12:19:47 +01:00
9805b2fcb5 Rename functions in MessageHandlerElement 2021-01-28 11:56:05 +01:00
569a317bf0 Add chainable Rtcp Handler 2021-01-28 10:16:59 +01:00
d262583879 Renamed rtcpsenderreportable.hpp to rtcpsenderreporter.hpp 2021-01-27 21:38:00 +01:00
100669ad0d Bumped version to 0.11.0 2021-01-27 12:54:33 +01:00
7bda5bd77c Added mention of options NO_MEDIA and NO_WEBSOCKET 2021-01-27 12:53:11 +01:00
52030ca62d Update Makefile with NO_MEDIA and USE_SYSTEM_SRTP 2021-01-27 12:49:24 +01:00
959756526a Updated libjuice to v0.6.3 2021-01-27 12:40:35 +01:00
1ce27423fe Merge pull request #317 from paullouisageneau/fix-candidate-transport-parsing
Fix candidate transport parsing
2021-01-26 12:17:13 +01:00
a0bd65a814 Fixed candidate transport parsing 2021-01-26 11:58:15 +01:00
a7e4b56178 Disabled WebSocket test as echo.websocket.org is down 2021-01-26 11:57:38 +01:00
acaed8ca57 Merge pull request #316 from stazio/fix_candidate_sdp
Fix typo in Candidate SDP parsing
2021-01-26 11:54:09 +01:00
5728f813d1 Fix typo in Candidate SDP parsing 2021-01-26 00:03:44 -05:00
d4d58579d8 Updated libjuice 2021-01-25 20:45:47 +01:00
a7620cca16 Merge pull request #315 from paullouisageneau/cleanup
Clean up
2021-01-25 16:10:20 +01:00
61d0cd064f Merge pull request #314 from stazio/rtcp_lock
Added a mutex for RtcpHandler
2021-01-25 15:57:39 +01:00
f5a6342c60 Updated libjuice 2021-01-25 15:43:47 +01:00
478f9516cd fix indentations 2021-01-25 09:36:26 -05:00
08da5e10b2 refactored to use getRtcpHandler() 2021-01-25 09:35:23 -05:00
c6cd711d74 Fixed build with NO_MEDIA 2021-01-25 14:07:42 +01:00
4428e3dc3e Cleaned up rtc namespace use 2021-01-25 11:44:39 +01:00
fe4afcef85 Cleaned up, renamed and moved a few classes for consistency 2021-01-25 11:31:19 +01:00
03b64e765c fix indentations 2021-01-24 21:18:16 -05:00
c639174f39 Unlock the RtcpHandler lock before calling the handler 2021-01-24 20:56:40 -05:00
ce7bd9f4d0 Merge branch 'rtcp_lock' of https://github.com/stazio/libdatachannel into HEAD 2021-01-24 20:53:38 -05:00
c4c150a60b Added a mutex for the RTCP Handler 2021-01-25 01:51:07 +00:00
e295fa6072 Added a mutex for the RTCP Handler 2021-01-24 20:45:27 -05:00
470d145a9a Merge pull request #313 from paullouisageneau/disable-sctp-pmtud
Disable SCTP Path MTU discovery
2021-01-24 19:52:27 +01:00
ea12530d30 Disabled SCTP Path MTU discovery 2021-01-24 19:34:37 +01:00
329b133383 Merge pull request #309 from in2core/hotfix/capi-h264-maximum-fragment-size
C API - set h264 maximum fragment size
2021-01-23 17:11:38 +01:00
e1833cf34b remove space in #define 2021-01-22 18:04:03 +01:00
a0f17cb64b Add C API to set h264 maximum fragment size 2021-01-22 14:06:17 +01:00
8a5c38c2d8 Update h264 default maximum fragment size 2021-01-22 14:02:51 +01:00
7cddb83ce4 Bumped version to 0.10.5 2021-01-21 14:57:03 +01:00
bb12c071cf Merge pull request #307 from paullouisageneau/libtorrent-fixes
Merge libtorrent-related fixes on v0.10.4
2021-01-21 14:56:13 +01:00
4e3ea69073 Join thread pool at exit to prevent static destruction order issue 2021-01-21 12:08:57 +01:00
b79c886480 Force BUILD_SHARED_LIBS to OFF to build usrsctp as static 2021-01-20 20:27:01 +01:00
08da691911 Added RTC defines to usage requirement in Jamfile 2021-01-20 20:27:01 +01:00
754568506a Fixed implicit conversion of stream from unsigned int to uint16_t 2021-01-20 20:27:01 +01:00
7ac351d1b9 Fixed local variable shadowing 2021-01-20 20:27:01 +01:00
6d5cecbca1 Fixed usrsctp build in Jamfile 2021-01-20 20:27:01 +01:00
fb40e05bab Code formatting 2021-01-15 18:56:20 +01:00
3710a96fb9 Merge pull request #306 from in2core/feature/capi-stream-h264-opus
C api for h264/opus streaming
2021-01-15 18:00:20 +01:00
a1a8ac5203 Replace RTP/RTCP with Rtp/Rtcp in function signatures for consistency with naming convention 2021-01-14 14:15:44 +01:00
4db9f03dd4 Remove "optional" pointers 2021-01-14 14:14:18 +01:00
256170adfe Remove redundant functions 2021-01-14 14:10:47 +01:00
9a4b436e7f Simplify body of rtcGetUserPointer 2021-01-14 13:47:49 +01:00
5928b8d206 Add explicity type name to enums in rtcDirection 2021-01-13 17:41:37 +01:00
1542c78ec5 Add explicit type to enums in rtcCodec 2021-01-13 17:41:00 +01:00
cb73fa0c1a Add C api for h264/opus streaming 2021-01-13 14:59:50 +01:00
1ceb0fd292 Code formatting 2021-01-11 21:46:23 +01:00
7c14d940ef Merge pull request #291 from in2core/feature/stream-h264-opus
Streaming H264 and opus samples
2021-01-08 12:24:15 +01:00
5da67f6ca3 Merge branch 'master' into feature/stream-h264-opus 2021-01-08 10:11:29 +01:00
28a2868edc Add const reference to avoid copy 2021-01-07 13:48:30 +01:00
3210814648 Merge pull request #302 from stazio/refactor_logging
Refactored runtime errors to be logged periodically
2021-01-06 20:45:25 +01:00
1facc8a02f Made the data storred in a log counter a shared pointer 2021-01-06 11:55:04 -05:00
09818c4ab8 Made the destruction of LogCounter safe. 2021-01-05 18:59:14 -05:00
9e49fcc654 The log counter no longer maintains ownership of the future. 2021-01-05 15:02:18 -05:00
e6919bdbf8 Make LogCounter shared 2021-01-05 14:51:03 -05:00
749fa32059 Fix: RTCP_SDES::isValid function checks all chunks now 2021-01-05 15:37:17 +01:00
938bd4dd43 Fix typo in isValid function 2021-01-05 10:03:27 +01:00
c43e82b8cb Check incoming RTCP SDES 2021-01-05 09:58:00 +01:00
adb733d19a Added a couple of warnings back and removed the destructor for the log counter 2021-01-04 17:29:22 -05:00
01085e4492 Add processing for SDES packets in PeerConnection::forwardMedia 2021-01-04 11:33:22 +01:00
43d31caee3 Fix items in SDES packet 2021-01-04 11:16:49 +01:00
9aee655fcd Improve constraint for reinterpret_pointer_cast redeclaration 2021-01-04 09:43:16 +01:00
b8b5110653 Add RTC_CPP_EXPORT before to_variant function 2021-01-04 09:34:12 +01:00
e1087ce8b0 Add RTC_CPP_EXPORT before make_message function 2021-01-04 09:33:54 +01:00
f41baa5c51 Refactored logcounter and added headers 2021-01-04 00:41:15 -05:00
9ee9734473 Refactored runtime errors to be logged on a timer 2021-01-04 00:30:57 -05:00
3745ff5f7a Added enableIceTcp configuration flag to C API 2020-12-31 01:21:40 +01:00
3acddc6897 Merge pull request #300 from paullouisageneau/threadpool-schedule
Add schedule method to ThreadPool
2020-12-31 00:14:29 +01:00
5d0c62e4bc Replaced multimap with priority_queue 2020-12-30 16:50:27 +01:00
06faefd1d6 Refactored ThreadPool::dequeue() 2020-12-30 13:24:13 +01:00
4629e57931 Added schedule() method to ThreadPool 2020-12-28 22:53:09 +01:00
52218272db Removed paragraph about Windows DLL limitation 2020-12-26 22:58:34 +01:00
f20faed180 Merge pull request #299 from paullouisageneau/sctp-recv-loop-state
Check state in SCTP recv loop
2020-12-26 22:50:19 +01:00
2bae3f62c4 Exit SCTP recv loop on disconnected state 2020-12-26 20:55:03 +01:00
6eb663d1c5 Updated libjuice 2020-12-24 17:14:14 +01:00
a5cc76bb85 Merge pull request #298 from paullouisageneau/mitigation-sctp-flush
Fix SCTP not flushing correctly on heavy traffic
2020-12-24 17:12:56 +01:00
8419de1f1c Enhanced TCP send to flush before attempting to send 2020-12-24 16:17:43 +01:00
e34a3bb8ae Enhanced SCTP send to flush before attempting to send 2020-12-24 15:57:28 +01:00
5b66ab2d08 Add NalUnit() constructor 2020-12-18 19:16:03 +01:00
769f26e94e Updated libjuice 2020-12-14 19:09:16 +01:00
31c154e9d9 Merge pull request #295 from paullouisageneau/fix-forwardmedia-bind
Fixed weak bind for forwardMedia()
2020-12-14 14:06:00 +01:00
a56b036940 Merge pull request #293 from paullouisageneau/dependabot/npm_and_yarn/examples/web/websocket-1.0.33
Bump websocket from 1.0.32 to 1.0.33 in /examples/web
2020-12-14 14:05:39 +01:00
d0e8b63ef0 Fixed weak bind for forwardMedia() 2020-12-14 13:37:07 +01:00
d91401775e Add RTC_CPP_EXPORT before struct name 2020-12-14 09:54:22 +01:00
735cb538f7 Define methods inside namespace instead of using namespace 2020-12-14 09:32:03 +01:00
e23d0723d1 Add RTC_CPP_EXPORT before class name 2020-12-14 09:23:37 +01:00
bb530ef44d Move guard before includes 2020-12-14 09:07:12 +01:00
7a219b23d5 Remove if(WIN32) for target_link_libraries in CMakeLists.txt 2020-12-14 08:50:46 +01:00
2cde11e9ea Bump websocket from 1.0.32 to 1.0.33 in /examples/web
Bumps [websocket](https://github.com/theturtle32/WebSocket-Node) from 1.0.32 to 1.0.33.
- [Release notes](https://github.com/theturtle32/WebSocket-Node/releases)
- [Changelog](https://github.com/theturtle32/WebSocket-Node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/theturtle32/WebSocket-Node/compare/v1.0.32...v1.0.33)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-14 05:16:25 +00:00
0bbb0233b7 Updated libjuice 2020-12-12 23:54:02 +01:00
533beda26a Merge pull request #290 from paullouisageneau/revert-srtp-wildcards
Reverted SRTP inbound and outbound wildcards
2020-12-12 23:12:29 +01:00
1427c9e1e4 Merge pull request #287 from paullouisageneau/turn
TURN support for libjuice
2020-12-12 18:28:55 +01:00
6d670726ea Updated TURN support in Readme 2020-12-12 18:16:29 +01:00
7981fed7f4 Added STUN server to TURN test 2020-12-12 18:16:29 +01:00
f2caa8048f Added TURN server test 2020-12-12 18:16:29 +01:00
92a4ed2a81 Enabled TURN servers for libjuice 2020-12-12 18:16:29 +01:00
62522d2c25 Updated libjuice to add TURN support 2020-12-12 18:16:29 +01:00
3f9565b55d Add custom implementation of usleep for windows 2020-12-11 18:44:58 +01:00
7a06e48281 Add custom implementation of gettimeofday for windows 2020-12-11 17:37:49 +01:00
0610bf741f Replace sys/time with ctime 2020-12-11 17:02:54 +01:00
e79a6f08e3 Exclude streamer project when building with NO_MEDIA 2020-12-11 16:53:20 +01:00
4d407cf15e Replace getopt with custom arg parser 2020-12-11 13:20:52 +01:00
226e849915 Include <functional> in dispatchqueue.hpp 2020-12-11 09:09:15 +01:00
068fdf60f9 Include <mutex> and <condition_variable> in dispatchqueue.hpp 2020-12-11 08:59:48 +01:00
74ada01114 Include <cmath> in nalunit.cpp 2020-12-11 08:49:26 +01:00
cd0be9d510 Add streamer example to README 2020-12-10 18:48:56 +01:00
b39fe51365 Add h264 and opus samples 2020-12-10 18:46:03 +01:00
cf9e57564e Add python scripts to generate h264 and opus samples 2020-12-10 18:45:46 +01:00
d9aa1818b2 Add example project for h264 and opus streaming 2020-12-10 18:45:21 +01:00
1d27f5b876 Add h264 and opus streaming support to libdatachannel 2020-12-10 18:44:18 +01:00
28e3fad254 Add .idea to .gitignore 2020-12-10 18:43:27 +01:00
b32a8b884b Add support for RTCP SR and SDES 2020-12-10 18:41:51 +01:00
7751a9bd6b Reverted SRTP inbound and outbound wildcards 2020-12-09 23:46:06 +01:00
3dac651b02 Cleaned up useless const reference 2020-12-09 23:19:20 +01:00
f6f1efb33f Merge pull request #285 from stazio/fix_segfault
Fixes a few potential seg-faults in the sending of RTP and fixes the building of NACK packets
2020-12-09 22:16:54 +01:00
435d471ad8 Fixes a few potential seg-faults in the sending of RTP and fixes the building of NACK packets 2020-12-08 00:28:47 +00:00
7aa2fdda6f Merge pull request #283 from iturrioz/Fix-first-packet-dropped
Fix first packet dropped
2020-12-03 10:13:46 +01:00
67e125b22f Check the error in the "Range 64-95" after addSSRC 2020-12-03 09:47:19 +01:00
f143582de0 Check error after retrying the unprotect call
Don't return without calling receive callback if the unprotect call succeeds after the addSSRC call
2020-12-03 09:27:28 +01:00
4226a96640 Merge pull request #282 from stazio/fix_desc
Audio/Video profile is now only applied to H264/Opus.
2020-12-01 12:28:14 +01:00
d305c4c126 Audio/Video profile is now only applied to H264/Opus. 2020-12-01 05:25:47 -05:00
25b3e13d27 Moved verbose logging when starting transport 2020-11-29 20:51:00 +01:00
abec5fc219 Bumped version to 0.10.4 2020-11-29 19:15:54 +01:00
684b7ba925 Merge pull request #280 from paullouisageneau/default-data-mid
Change default data mid
2020-11-29 17:33:20 +01:00
d8515b6362 Some cleanup 2020-11-29 17:24:20 +01:00
62da885028 Changed default data mid to a number 2020-11-29 17:13:55 +01:00
ff2e83bbdc Call rtcAddRemoteCandidate() with NULL mid 2020-11-29 17:06:19 +01:00
8f9e8e718e Uncluttered client example to keep it simple 2020-11-29 17:02:01 +01:00
c6bee7b0d4 Added console logging in web example 2020-11-29 17:00:43 +01:00
4d93303be8 Updated libjuice to v0.6.2 2020-11-29 16:26:31 +01:00
1620ddfb03 Merge pull request #279 from paullouisageneau/fix-candidates-mid
Fix mid on local candidates
2020-11-29 16:25:50 +01:00
452b742adc Fixed mid on local candidates 2020-11-29 16:03:57 +01:00
244c834992 Cleanup and reformatting 2020-11-28 17:03:51 +01:00
ffe202a6a2 Merge pull request #278 from hhgyu/add-support-protocols
support Subprotocols
2020-11-28 13:18:06 +01:00
ea87e5ae09 Exposed send(data, size) on Channel 2020-11-27 21:20:24 +01:00
4259b4e968 fixed build failed for windows 2020-11-27 12:22:22 +09:00
6aff5dc5bc fixed build failed for macos 2020-11-27 12:11:16 +09:00
99bae7f830 support WebSocket Protocol RFC6455 2020-11-27 11:15:37 +09:00
7598d992dc Merge pull request #274 from stazio/newdesc
Exposed Additional rtc::Description::Media calls
2020-11-25 22:24:07 +01:00
6380038584 Merge pull request #277 from paullouisageneau/fix-websocket-case
Fix WebSocket Upgrade header check
2020-11-25 22:23:18 +01:00
6144bca0f7 Changed update header check to be case-insensitive 2020-11-25 20:46:02 +01:00
6ec129f8f8 Re-Formatting to use spaces 2020-11-23 20:37:29 -05:00
be394b7185 Cleaned up addVideoCodec 2020-11-23 20:33:26 -05:00
f008b5b447 Merge remote-tracking branch 'paulgit/master' into newdesc 2020-11-23 20:22:03 -05:00
5482912e18 Merge pull request #273 from stazio/fix_rtp_protect
Fixed a typo during the protection of RTP packets
2020-11-23 22:59:29 +01:00
fcc4eaf78b Fixed a typo during the protection of RTP packets 2020-11-23 15:55:36 -05:00
cca0742973 Added some more description options 2020-11-23 15:54:01 -05:00
495b389e05 Fixed signaling state callback in C API test 2020-11-21 18:05:43 +01:00
e83494df09 Bumped version to 0.10.3 2020-11-21 17:28:24 +01:00
7bf87c6989 Updated libjuice to 0.6.1 2020-11-21 17:27:51 +01:00
cb591de15f Added DiffServ QoS in features 2020-11-21 16:06:09 +01:00
eb4540e319 Merge pull request #271 from paullouisageneau/fix-dscp-rtcp
Send RTCP with the same DSCP as RTP
2020-11-21 16:04:44 +01:00
5d34439cb7 Added warning when track queue is full 2020-11-21 15:55:51 +01:00
b19e9077af Reformatting 2020-11-21 15:52:58 +01:00
4ff010b20b Added maybe_unused 2020-11-21 15:51:49 +01:00
442e50825c Changed warnings for media support 2020-11-21 15:47:51 +01:00
9f2801b7b9 Set the same DSCP for RTP and RTCP 2020-11-21 15:46:54 +01:00
3b0bf3a152 Updated libjuice 2020-11-21 15:30:14 +01:00
fe4a9ec453 Merge pull request #269 from paullouisageneau/update-libsrtp
Update libsrtp
2020-11-21 13:17:45 +01:00
dc1d14adf1 Merge pull request #270 from paullouisageneau/fix-dscp
Fix DSCP for tracks
2020-11-21 13:17:31 +01:00
14918c16e8 Fixed track DSCP 2020-11-21 12:43:34 +01:00
a023acfa33 Updated libsrtp 2020-11-21 12:43:00 +01:00
f098019c1f Merge pull request #268 from paullouisageneau/dscp
Differentiated Services support
2020-11-21 00:56:05 +01:00
a67ca9da9b Implemented support for DSCP 2020-11-21 00:45:18 +01:00
613ebf2564 Merge pull request #267 from paullouisageneau/windows-examples-dynamic
Link examples against dynamic library on Windows
2020-11-20 00:46:36 +01:00
dc6427770c Made winsock library dependency public 2020-11-20 00:29:39 +01:00
81e0a05a1a Added missing exports 2020-11-20 00:29:31 +01:00
9ea613f05f Also link tests against the dynamic library on Windows 2020-11-20 00:13:56 +01:00
eb4a764648 Disable MSVC warning 4251 in header rather than in CMakeLists 2020-11-20 00:04:53 +01:00
baf8a3adce Made examples also link against the dynamic library on Windows 2020-11-19 23:39:49 +01:00
d9aec59352 Fixed include 2020-11-19 23:29:44 +01:00
3ff5801512 Merge pull request #264 from hanseuljun/cpp-export
Exporting C++ API for Windows
2020-11-19 23:02:34 +01:00
fcc2577e11 Merge pull request #266 from supercairos/fix/msvc-w4-build-error-shadow-class-member
fix build warning on windows when built with MSVC /W4.
2020-11-19 23:00:10 +01:00
b4865f26e4 Move RTC_CPP_EXPORT from log.hpp to include.hpp, remove RTC_CPP_EXPORT from /src classes, and add RTC_CPP_EXPORT to Description. 2020-11-19 08:09:00 -08:00
fc6d5afdd9 fix build warning on windows when built with MSVC /W4.
Some arguments where conflicting with data member names.
2020-11-19 14:10:52 +01:00
7a49c0b88b Updated libjuice 2020-11-19 09:41:29 +01:00
679c0ccd2e Add more dllexports, leave RTC_CPP_EXPORT only in log.hpp, and ignore C4251 warning. 2020-11-18 14:55:17 -08:00
ee3bc9694b Bumped version to 0.10.2 2020-11-18 23:39:06 +01:00
0c0ba77de5 Merge pull request #265 from paullouisageneau/optimize-sctp-recv
Schedule SCTP recv task only if necessary
2020-11-18 23:38:49 +01:00
8729e0d2aa Scheduled SCTP recv task only if there is no pending task 2020-11-18 23:26:47 +01:00
12098e7c41 Start exporting c++ API for windows. 2020-11-17 22:20:54 -08:00
90eb610bfe Merge pull request #263 from paullouisageneau/release-rdesc-lock
Prevent holding multiple locks
2020-11-17 23:02:15 +01:00
08ddfa1276 Release remote description lock before passing candidate to transport 2020-11-17 22:41:42 +01:00
87df64a002 Merge pull request #262 from paullouisageneau/fix-duplicate-candidates
Prevent duplicate candidates
2020-11-17 20:40:15 +01:00
5af414d0df Cosmetic fixes in Description 2020-11-17 20:23:59 +01:00
2443c72350 Refactored trimming with util functions 2020-11-17 20:10:47 +01:00
f033e4ab8f Prevent whitspaces at the end of candidates as they confuse libnice 2020-11-17 19:57:51 +01:00
1a6dcdce6f Reordered Candidate getters 2020-11-17 19:28:13 +01:00
100039eba8 Enforce candidates uniqueness in description 2020-11-17 19:23:29 +01:00
e2005c789a Refactored candidate storage and split parsing and resolution 2020-11-17 19:21:48 +01:00
819566b4c1 Merge pull request #261 from paullouisageneau/fix-remote-unordered-flag
Fix remote unordered flag
2020-11-17 00:15:35 +01:00
82caab8906 Added tests for remote protocol and reliability in C API 2020-11-16 23:59:59 +01:00
802516b2db Fixed remote DataChannel unordered flag 2020-11-16 23:59:59 +01:00
0fcafad9c7 Bumped version to 0.10.1 2020-11-16 01:00:49 +01:00
aab876d346 Removed SCTP transport receiving flag 2020-11-16 01:00:49 +01:00
11ec8f7247 Made the logging of an RTP packet be verbose 2020-11-16 01:00:49 +01:00
1597c9ae6f Exposed a function to log an RTP packet 2020-11-16 01:00:49 +01:00
b093c4c3d5 Merge pull request #255 from paullouisageneau/fix-renegociation-role
Fix roles during renegociation
2020-11-16 00:02:35 +01:00
447624322c Removed useless role from ICE transport constructor 2020-11-15 23:50:41 +01:00
422713cbdc Added safety check on remote description role 2020-11-15 23:41:52 +01:00
d3d4187021 Fixed roles when receiving actpass during a renegociation 2020-11-15 23:40:16 +01:00
f2dd46e589 Merge pull request #254 from paullouisageneau/usrsctp-no-callback
Change usrsctp callbacks to upcall
2020-11-15 23:37:28 +01:00
5b5debf260 Use upcall and recv instead of message callback for usrsctp 2020-11-15 23:23:40 +01:00
86c3f914fb Merge pull request #252 from paullouisageneau/update-usrsctp
Update usrsctp and enhance threading
2020-11-15 18:31:09 +01:00
6a1fff13c1 Fixed SCTP processor limit 2020-11-15 18:23:00 +01:00
91a854aa5b Refactored processor enqueueing 2020-11-15 18:15:45 +01:00
1181fdc599 Introduced SCTP transport processor 2020-11-15 16:09:29 +01:00
fe3d92cebf Removed usrsctp-static from CMakeLists 2020-11-15 14:44:22 +01:00
c06d77bd8e Updated usrsctp 2020-11-15 14:38:50 +01:00
c20aebbac2 Bumped version to 0.10.0 2020-11-15 12:37:48 +01:00
9bd12567e6 Enable OpenSSL when compiling SRTP 2020-11-15 12:36:27 +01:00
bce5faf8ba Merge pull request #251 from paullouisageneau/fix-test
Fix failing tests
2020-11-15 12:35:44 +01:00
64a5d6ecb0 Changed tests cleanup timing 2020-11-15 12:12:05 +01:00
ed606b7d7e Merge pull request #219 from paullouisageneau/fix-uwp
Fix compilation of tests and examples for UWP
2020-11-15 01:02:06 +01:00
4a526f66b6 Merge branch 'master' into fix-uwp 2020-11-15 00:01:27 +01:00
f8dcfc32ed Updated libjuice to v0.6.0 2020-11-14 23:58:32 +01:00
cfb10e52e6 Merge pull request #250 from paullouisageneau/fix-windows-test
Fix wait on SCTP written condition
2020-11-14 23:08:56 +01:00
d390c04ca9 Fixed wait on written condition 2020-11-14 23:00:15 +01:00
7856ad45fd Cleanup 2020-11-14 18:26:23 +01:00
fc95b397a6 Merge pull request #249 from paullouisageneau/remove-field-sizes
Remove field sizes
2020-11-14 18:20:38 +01:00
db74daae1d Removed field sizes 2020-11-14 18:16:15 +01:00
96d6b84c30 Updated libsrtp in dependencies 2020-11-14 17:56:39 +01:00
776ff342c0 Merge pull request #248 from paullouisageneau/refactoring-peerconnection
Refactor RTCP dispatching
2020-11-14 17:52:09 +01:00
519e81727a Refactored the RTCP dispatching monstruosity 2020-11-14 17:39:50 +01:00
2d403247fb Set libsrtp to version 2.3.0 2020-11-14 16:41:27 +01:00
cfddfae1c5 Merge pull request #247 from paullouisageneau/dev
Merge dev in master
2020-11-14 16:39:33 +01:00
31b5d6f84a Throw if SCTP is connected after close 2020-11-14 16:27:32 +01:00
44bf8b99ef Added /MP to nmake build 2020-11-14 16:04:22 +01:00
344895ced1 Added verbose logging 2020-11-14 15:58:22 +01:00
9e22770281 Fixed compilation warning 2020-11-14 12:54:51 +01:00
3e2f4a2ac7 Fixed CMakeLists and updated workflows 2020-11-13 23:30:46 +01:00
a4fe5cb874 Fixed sfu-media example compilation 2020-11-13 21:42:19 +01:00
ece1bd9352 Retabbing and reformatting 2020-11-13 21:25:52 +01:00
b7a682cc50 Fixed compilation issues 2020-11-13 21:19:11 +01:00
d47492a54e Merge pull request #176 from stazio/api_updates
Changing Behavior of RtcpSession and Many Bug Fixes
2020-11-13 20:57:43 +01:00
fcf33d32a0 Renamed rtcAddDataChannelExt() to rtcAddDataChannelExt() for consistency 2020-11-13 19:05:49 +01:00
a5eb653064 Fixed building rtp.hpp on Windows 2020-11-12 17:54:29 -05:00
ae2abfebad Merged with master 2020-11-12 17:53:21 -05:00
da4bf1fb49 Renamed id to stream in C API 2020-11-12 22:28:56 +01:00
82fab04721 Formatting 2020-11-12 22:02:36 +01:00
fec3b1ad8b Merge pull request #245 from paullouisageneau/oob-datachannels
Out-of-band negotiated Data Channels
2020-11-12 22:00:06 +01:00
eb61f6cb3c Fixed spelling negociated -> negotiated 2020-11-12 20:36:38 +01:00
fe6cf79f02 Changed runtime_error to invalid_argument 2020-11-12 20:36:38 +01:00
a7bc03c4b3 Removed designed identifiers 2020-11-12 20:36:38 +01:00
06b46aba91 Reformatting 2020-11-12 20:36:38 +01:00
f83843d054 Added connectivity test for negotiated DataChannel 2020-11-12 20:36:38 +01:00
e7d45db210 Uniformized DataChannel stream type to uint16_t 2020-11-12 20:36:38 +01:00
7a388bdffe Changed rtcAddDataChannelExt() to accomodate negotiated DataChannels 2020-11-12 20:36:33 +01:00
8cb00f81ee Added DataChannel::id() getter 2020-11-12 20:34:20 +01:00
37ebe8cc58 Implemented user-negotiated DataChannels 2020-11-12 20:34:15 +01:00
5eaed06b01 Added optional stream to emplaceDataChannel() 2020-11-11 18:27:38 +01:00
973f58ec8b Merge pull request #240 from in2core/feature/mac-compatibility
Mac compatibility
2020-11-11 12:12:13 +01:00
6cb9dd8bad Remove reinterpret_pointer_cast from std 2020-11-11 09:41:13 +01:00
556104e8d5 Merge pull request #241 from in2core/bugfix/parsing-encParams
encParams should not contain '/ '
2020-11-10 18:39:03 +01:00
d38ce2b575 Add contributor at the beginning of the edited file 2020-11-10 16:02:19 +01:00
e8628b203f encParams should not contain '/ ' 2020-11-10 15:58:32 +01:00
ffa4e4bb20 Add reinterpret_pointer_cast implementation to fix build error
Apple clang does not implement reinterpret_pointer_cast as mentioned here: https://github.com/conda-forge/libcxx-feedstock/issues/44
2020-11-10 15:47:56 +01:00
79155d618e Add generate XCode project to README 2020-11-10 15:35:36 +01:00
be8ffae0fe Updated libjuice 2020-11-10 10:28:45 +01:00
1a723c59aa Exposed some more APIs in Description 2020-11-09 19:23:23 -05:00
6e7c082a7c Merge pull request #239 from paullouisageneau/fix-tls-host
Fix WebSocket explicit port with TLS
2020-11-09 21:16:41 +01:00
037b9c9703 Add explicit port number to WebSocket test 2020-11-09 19:15:12 +01:00
202d2cb5e4 Fixed host passed to TLS transport instead of hostname 2020-11-09 19:09:42 +01:00
03e9eca7d1 Merged libdatachannel/master into api_updates 2020-11-08 20:41:24 -05:00
875defd17f Merge branch 'api_updates' of https://github.com/stazio/libdatachannel into api_updates 2020-11-08 20:38:34 -05:00
97e23d00be Assume passive role in an actpass scenario; Exposed the RTP Map iterator; Fixed setting the payload type 2020-11-08 20:38:18 -05:00
de47fec19b Merge pull request #237 from paullouisageneau/fix-capi-receive
Fix rtcReceiveMessage() and harmonize C API
2020-11-08 16:42:54 +01:00
c85b9c31fe Make rtcGetSelectedCandidatePair() return the max size for consistency 2020-11-08 16:31:51 +01:00
be96e8b1fa Fixed setting the payload type 2020-11-07 19:52:38 -05:00
2bcdab027c Fixed rtcReceiveMessage() and refactor C API buffer handling 2020-11-07 20:11:34 +01:00
2eca2c4040 Merge pull request #236 from paullouisageneau/fix-capi-available-cb
Fix rtcSetAvailableCallback
2020-11-07 15:11:20 +01:00
26cd6e4a59 Fixed rtcSetAvailableCallback() not setting the right callback 2020-11-07 15:01:45 +01:00
be7a6324dd Temporary commit while bugs are being worked out 2020-11-07 02:18:48 -05:00
a7d5ba0232 Merge remote-tracking branch 'paulgit/master' into merge_with_master 2020-11-06 19:26:31 -05:00
3e53706869 Fixed the parsing of m= lines 2020-11-06 19:06:56 -05:00
dcb0a0282e Merge pull request #235 from paullouisageneau/auto-mid
Automatically set candidate mid if missing
2020-11-05 20:22:08 +01:00
99e78b68a4 Merge pull request #234 from paullouisageneau/fix-track-answer
Fix regressions with answers after renegociation
2020-11-05 20:05:03 +01:00
5bb0979c3a Automatically set candidate mid if missing 2020-11-05 19:35:54 +01:00
40bed4e740 Fixed typo in Description::stringToType() 2020-11-05 19:34:56 +01:00
8f0c91d1cb Fixed deadlock when reciprocating locally existing track 2020-11-05 19:23:44 +01:00
de4192747c (Mostly) fixed forwardMedia; It still does not work with chrome compound packets 2020-11-05 08:56:07 -05:00
dfe8436954 Fixed bug where closing a track crashes the server 2020-11-04 23:36:49 -05:00
7d0d0ea229 Fixed some unused variables 2020-11-04 23:30:45 -05:00
30ca8fb9c3 This commit removes the processing of strings in the forwarding of media to tracks 2020-11-04 20:30:05 -05:00
4f89e479bc Merged with paullouisageneau/libdatachannel 2020-11-04 18:48:34 -05:00
3faf053bbd Fixed how media is offered during renegotiations 2020-11-04 18:40:49 -05:00
dc91d2cb6d Fixed the dereferencing of a nullptr 2020-11-04 03:15:48 +00:00
626ecaa5bb Fix some locks; Changed audio bitrate to 96k 2020-11-04 02:08:04 +00:00
a88c2dd1bf Merge pull request #230 from ecotarobles/master
Fix typo in example/web/script.js
2020-11-03 12:57:45 +01:00
ed89fe3e94 Merge pull request #9 from paullouisageneau/master
Sync
2020-11-03 13:48:28 +02:00
1b73c7fb45 Typo. See https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/onclose. 2020-11-03 12:05:46 +02:00
d563d63c89 Merge branch 'master' into fix-uwp 2020-11-03 09:14:29 +01:00
e25bda7108 Bypass setting OUTPUT_NAME for UWP 2020-11-03 09:10:05 +01:00
12579825a9 Merge pull request #228 from paullouisageneau/update-tracks
Allow updating local track description
2020-11-02 19:28:41 +01:00
00cccc1e7b Added check for description mid 2020-11-02 09:27:28 +01:00
f1fa2abd6e Prefer local media when building local description 2020-11-02 09:27:27 +01:00
476528b464 Allow updating track description 2020-11-02 08:52:04 +01:00
bc0b14288b Merged paullouisageneau/libdatachannel with stazio/libdatachannel 2020-11-01 23:26:54 -05:00
02e4ed5221 Hid a common warning 2020-11-02 00:32:57 +00:00
5e876a4686 Merge pull request #227 from paullouisageneau/resetcallbacks-once
Reset callbacks of PeerConnection only once on close
2020-11-01 23:00:29 +01:00
3ac3a98e26 Made PeerConnection::changeState() return value consistent with the rest 2020-11-01 22:53:08 +01:00
25077878a1 Reset callbacks of PeerConnection only once 2020-11-01 22:43:46 +01:00
704d6ab15f Merge pull request #226 from paullouisageneau/renegociation
Implement renegotiation
2020-11-01 19:39:07 +01:00
5ce699d33b Keep candidates when rolling back the local description 2020-11-01 19:28:20 +01:00
e91d721b20 Added signaling state to tests 2020-11-01 18:59:10 +01:00
752c4bf5a1 Added rtcSetSignalingStateChangeCallback() to C API 2020-11-01 18:58:46 +01:00
bb73da2351 Fixed spelling 2020-11-01 18:33:59 +01:00
02105f5da3 Add locally created data channels and tracks only in offers 2020-11-01 18:28:36 +01:00
7fac0a7618 Removed active media count check 2020-11-01 18:06:47 +01:00
69e5cab0a5 Added renegociation to track test 2020-11-01 17:34:59 +01:00
b220c5df99 Changed description reciprocating logic 2020-11-01 17:34:54 +01:00
73273d6e81 Fixed call to rtcSetLocalDescription() 2020-11-01 13:55:15 +01:00
61fe8732a6 Cosmetic changes to verbose logging 2020-11-01 13:49:21 +01:00
9f12c19a02 Handle local description rollback 2020-11-01 13:47:21 +01:00
72016a7d26 Added type to setLocalDescription() in C API 2020-11-01 11:37:15 +01:00
f40c899b4f Fixes distribution of media 2020-11-01 04:04:54 -05:00
496163dbbe Merge branch 'api_updates' of https://github.com/stazio/libdatachannel into api_updates 2020-11-01 03:01:29 -05:00
c0756aaa05 Fixed the distribution of RTCP packets regarding RTCP and RTCPFB packets 2020-11-01 03:01:24 -05:00
2cee070cee Fixed description type checking logic 2020-11-01 00:38:39 +01:00
5fec28e9b7 Added some verbose logging 2020-11-01 00:10:51 +01:00
bbec827fef Properly handle exceptions from threadpool tasks 2020-11-01 00:09:50 +01:00
35e3c7ee3a Refactored description processing 2020-10-31 20:58:23 +01:00
0c47c66bb1 Added signaling state to PeerConnection 2020-10-31 18:50:14 +01:00
a3cc74c8f1 Added NegociationNeeded flag 2020-10-31 10:26:12 +01:00
db19eded61 Allow all Android devices to be able to connect; Allow repeat transmissions in SRTP 2020-10-31 03:45:10 +00:00
de73af4b80 Fixed bits type for GnuTLS 2020-10-29 12:09:29 +01:00
3e70af915f Compiling libsrtp inline 2020-10-29 01:10:33 -04:00
97311230d0 Merge branch 'paullouisageneau-api_updates_fix_openssl' into api_updates 2020-10-29 00:36:00 -04:00
e966710988 Merge branch 'api_updates_fix_openssl' of https://github.com/paullouisageneau/libdatachannel into paullouisageneau-api_updates_fix_openssl 2020-10-29 00:33:15 -04:00
198d0746b9 Allow rtp.hpp to be used on it's own 2020-10-28 20:49:39 -04:00
7782f6a5fd Merge pull request #224 from paullouisageneau/cert-bits
Add compilation option for RSA key size
2020-10-28 23:22:57 +01:00
cb71695364 Added RSA_KEY_BITS_2048 option 2020-10-28 23:16:47 +01:00
3af0e3b38b Merge pull request #221 from hanseuljun/fix-uwp
Remove RTC_API from the deletePeer()s.
2020-10-27 23:57:05 +01:00
89e84e7b81 Removed random string in SDP 2020-10-27 18:07:31 -04:00
68bb97b3a3 Merge branch 'api_updates' of https://github.com/stazio/libdatachannel into api_updates 2020-10-27 18:05:16 -04:00
41cf60c18b Made SRTP policies to be made in flight rather than during configuration. Added some missing API fields. 2020-10-27 18:04:53 -04:00
01eddaca13 Remove RTC_API from deletePeer()s. 2020-10-27 14:23:22 -07:00
6ec75d7c70 Add RTC_API to deletePeer()s. 2020-10-26 13:29:29 -07:00
6221855f27 Merge branch 'fix-uwp' of https://github.com/paullouisageneau/libdatachannel into fix-uwp 2020-10-26 13:19:10 -07:00
a8490f5e1c Changed Opus parameters 2020-10-26 18:09:53 +00:00
55d3336465 Fixed postHandshake order for OpenSSL and added check for init 2020-10-25 15:18:23 +01:00
d59c209c20 Merge pull request #220 from paullouisageneau/cmake-srtp-option
Add cmake USE_SRTP option
2020-10-25 09:11:40 +01:00
46c4bf3ff0 Added USE_SRTP to cmake defaulting to autodetection 2020-10-24 23:10:00 +02:00
0227e1c755 Removed unicode version of getopt 2020-10-24 22:48:57 +02:00
456365bc7c Enforce RTC_API in tests and examples in case stdcall is used 2020-10-24 22:43:18 +02:00
789ecd7977 Updated libjuice 2020-10-24 22:15:44 +02:00
45bbe642fc Added ability to see how many nack parts there are in a NACK packet 2020-10-24 00:53:45 -04:00
2eb523e2ea Merge pull request #215 from hanseuljun/wsock32-removal
Remove wsock32 for compatibility with uwp.
2020-10-21 10:04:33 +02:00
5adc62b970 Remove wsock32 for compatibility with uwp. 2020-10-20 19:34:31 -07:00
fcb8d7b3df Added support to route RTCP packets with SSRC=1's to the right client 2020-10-20 02:11:40 -04:00
1cb53362d1 Added a requestKeyframe() 2020-10-20 01:52:11 -04:00
0fad9c0a16 Add SSRC=1 to DtlsSrtp because Chrome 2020-10-19 22:59:23 -04:00
16208d00ca Fixed media demo; Refactored mediaCount to be unsigned (aka size type) 2020-10-19 16:15:52 -04:00
8dbcd155e5 Disabled RTX because Firefox; Fixed a typo causing things to identify as SSRC=0 2020-10-19 16:09:10 -04:00
46dd2fb515 Updated libjuice 2020-10-19 18:35:45 +02:00
129c8b187a Merge pull request #213 from paullouisageneau/sdp-default-addr-port
Enhancements for candidates
2020-10-18 13:40:33 +02:00
036b972fbe Updated libjuice 2020-10-18 13:30:27 +02:00
51bbaa99e1 Set mid of selected candidates 2020-10-18 12:18:18 +02:00
37804c0327 Properly handle SDP origin line 2020-10-18 11:15:10 +02:00
e1f60cd34d Added rtcGetSelectedCandidatePair() to C API 2020-10-18 11:03:35 +02:00
6d6ab9eeb7 Added candidate transport type getter 2020-10-17 12:20:46 +02:00
05b7141478 Implemented getSelectedCandidatePair() for libjuice 2020-10-16 23:50:14 +02:00
c3c77010f6 Updated profile-levels to allow mobile devices to work 2020-10-16 00:59:44 -04:00
0a46aa2c6d SRTP has to be aware of every RTP stream. This commit makes that work. 2020-10-15 23:31:49 -04:00
e4057c48f6 Open tracks when the remote description has been set. 2020-10-15 21:51:49 -04:00
d26fa30655 Added support for peer connection renegotiation 2020-10-15 20:56:54 -04:00
137d4e3e8e Enhance candidate parsing and expose the info directly 2020-10-16 00:05:05 +02:00
1a992708a0 Removed try/catch preventing re-negotiations 2020-10-15 17:09:37 -04:00
ff76ec1998 Fixed outgoing/incoming track direction check 2020-10-15 16:03:26 -04:00
5df78ee3c3 Merge branch 'api_updates' of https://github.com/stazio/libdatachannel into api_updates 2020-10-15 15:59:21 -04:00
549e194bb3 Changed the message stream from being a payloadType to SSRC 2020-10-15 15:59:01 -04:00
65631f06a6 Wait for websocket connection with promise 2020-10-14 19:33:12 +02:00
3c1b411a76 Fixed typo 2020-10-13 19:43:44 +02:00
8d8374e826 Renamed confirmOnStdout() to printReceived() 2020-10-13 19:36:32 +02:00
41194229d3 Properly catch and print exceptions 2020-10-13 19:33:49 +02:00
fc1f54a0e4 Updated libjuice 2020-10-13 12:40:14 +02:00
8fb4997967 Merge pull request #210 from paullouisageneau/dc-processor
Asynchronous data channels open and close
2020-10-12 22:56:13 +02:00
efa6eb8c34 Added logging on state change 2020-10-12 22:22:03 +02:00
944e80e85c Move datachannels open and close on the processor 2020-10-12 22:04:55 +02:00
2cb3186661 Merge pull request #8 from paullouisageneau/master
Sync
2020-10-06 12:13:01 +03:00
10d3e2e3d6 Updated libjuice 2020-10-06 11:02:21 +02:00
a4afa7382d Merge pull request #209 from ecotarobles/master
Support CMake versions <= 3.8
2020-10-06 10:59:23 +02:00
efe252dee3 Merge pull request #7 from paullouisageneau/master
Sync
2020-10-06 11:24:14 +03:00
fd1ca035f9 Properly support CMake versions <= 3.8. 2020-10-06 03:56:48 -04:00
62973b6e2f Merge pull request #208 from hanseuljun/capi-callback-add-id
Add id as a parameter to C API callbacks.
2020-10-05 19:32:34 +02:00
501fa45560 Support CMake versions <= 3.8. 2020-10-05 15:49:12 +03:00
1a8d8ec2f9 Merge pull request #6 from paullouisageneau/master
Sync forward
2020-10-05 15:07:04 +03:00
b3b4c27bb4 Update copy-paste-capi examples reflecting the callback update adding ID. 2020-10-04 15:39:10 -07:00
44eaaf038a Update test files to match the C API callback update with adding an ID parameter. 2020-10-04 11:32:52 -07:00
c38edd089b Add id as a parameter to C API callbacks. 2020-10-04 11:23:16 -07:00
8ea828f1b0 Bumped version to 0.9.4 2020-10-04 14:12:21 +02:00
35da6636aa Merge pull request #207 from paullouisageneau/capi-description
Improve consistency of C API
2020-10-03 22:11:15 +02:00
363827594b Added tests for rtcSetLocalDescription() and rtcSetRemoteDescription() 2020-10-03 21:57:31 +02:00
cbc027f144 Added rtcGetRemoteDescription() for the sake of completeness 2020-10-03 19:55:14 +02:00
ebc6a4b65c Renamed rtcGetLocalDescriptionSdp() to rtcGetLocalDescription() 2020-10-03 19:54:11 +02:00
37d47d28a8 Made rtcGet*Address() return RTC_ERR_FAILURE if unavailable 2020-10-03 19:51:06 +02:00
46878519c0 Merge pull request #205 from hanseuljun/rtcgetlocaldescriptionsdp
Add rtcGetLocalDescriptionSdp() as a C API
2020-10-03 19:48:58 +02:00
84c298f4f8 Add return RTC_ERR_FAILURE at the end of rtcGetLocalDescriptionSdp. 2020-10-03 09:57:21 -07:00
23aed2b844 Add rtcGetLocalDescription(). 2020-10-02 15:11:32 -07:00
df62d6d51c Merge pull request #201 from paullouisageneau/fix-rtcinitlogger
Fix rtcInitLogger to prevent logging multiple times
2020-10-02 13:35:02 +02:00
26241f00b7 Fixed case plog_appender -> plogAppender 2020-10-02 09:15:09 +02:00
873d14c824 Merge pull request #203 from hanseuljun/capi-stdcall
Add CAPI_STDCALL in cmake as an option
2020-10-02 09:14:46 +02:00
4953a112ad Reset callback on plog_appender move 2020-10-02 09:11:54 +02:00
c31e1bf0be Make addition of CAPI_STDCALL as definition per target. 2020-10-01 09:24:43 -07:00
98ddba192f Added move constructor to plog_appender 2020-10-01 13:31:25 +02:00
b02b30eea8 Make plog_appender use its own mutex 2020-10-01 13:13:39 +02:00
324d97a9b7 Merge pull request #202 from hanseuljun/fix-rtcinitlogger
A tiny modification to #201
2020-10-01 09:06:25 +02:00
0a1dd4db01 Add CAPI_STDCALL in cmake as an option and definition to set the calling convention of the C callback functions __stdcall. 2020-09-30 19:40:40 -07:00
b1de9acb20 Remove lock_guard inside rtcInitLogger since the same mutex gets locked inside appender->set_callback, causing a deadlock. 2020-09-30 17:47:50 -07:00
960300a7cd Updated libjuice to v0.5.2 2020-09-30 23:21:36 +02:00
3f084d7527 Added datachannel-unity 2020-09-30 23:13:36 +02:00
64096d599c Make rtcInitLogger and InitLogger thread-safe 2020-09-30 23:08:10 +02:00
552e443ef1 Fixed rtcInitLogger to prevent logging multiple times 2020-09-30 22:52:36 +02:00
52cb8d68a0 Updated libjuice 2020-09-29 21:47:11 +02:00
372e2b7a1f Merge pull request #199 from paullouisageneau/fix-websocket-url-parsing
Fix WebSocket URL parsing to handle user and password
2020-09-29 19:07:16 +02:00
a92e63720c Fixed WebSocket URL parsing to handle user and password 2020-09-29 12:42:41 +02:00
8d121c086e Merge pull request #196 from paullouisageneau/fix-null-logger
Fix null pointer access if the logger is not initialized
2020-09-29 00:13:24 +02:00
b538e454aa Fixed null pointer access if plog is not initialized 2020-09-28 23:54:32 +02:00
60d09d5c6f Bumped version to 0.9.3 2020-09-28 00:13:01 +02:00
266159fe41 Merge pull request #194 from paullouisageneau/fix-openssl-loop-quit
Fix OpenSSL recv loop quitting too early
2020-09-28 00:10:58 +02:00
458decb12d Fixed OpenSSL recv loop quitting too early 2020-09-27 23:53:35 +02:00
635c2e5513 Merge pull request #192 from paullouisageneau/fix-multiple-createdc
Fix exception on second call to createDataChannel()
2020-09-27 13:42:57 +02:00
adc4223617 Added a test creating a second data channel 2020-09-27 13:26:22 +02:00
326ae27ad1 Added missing return 2020-09-27 13:10:43 +02:00
6d33d19816 Merge pull request #191 from paullouisageneau/fix-message-size-checks
Clarify message size checks
2020-09-27 00:29:07 +02:00
734efb391a Removed misplaced len check 2020-09-27 00:21:36 +02:00
cba864507f Added control message size check when reading it 2020-09-27 00:21:18 +02:00
3432b233ff Updated libjuice to v0.5.1 2020-09-26 20:19:14 +02:00
ef9bfe811b Bumped version to 0.9.2 2020-09-26 18:28:22 +02:00
949e1de9cd Only retrieve pointers to transport if necessary when forwarding 2020-09-26 17:54:11 +02:00
57c52cf7ae Fixed compilation warnings 2020-09-26 17:24:44 +02:00
eaac06546e Merge pull request #189 from paullouisageneau/fix-websocket-incoming-null
Handle remote close on null message in websocket
2020-09-26 16:29:13 +02:00
9e38d08c0b Merge pull request #188 from paullouisageneau/fix-freeaddrinfo
Fix freeaddrinfo() called with NULL on getaddrinfo() failure
2020-09-26 16:25:04 +02:00
47db28617a Handle remote close on null message in websocket 2020-09-26 16:20:21 +02:00
de8c4a55cf Added some logging on address resolution failure 2020-09-26 16:13:12 +02:00
08d94e59c7 Call freeaddrinfo only if getaddrinfo succeeds 2020-09-26 16:08:27 +02:00
e8a6698abd Merge pull request #185 from ecotarobles/master
example/client has "-n" option to not use STUN server
2020-09-25 18:35:16 +02:00
7348b2b350 example/client has "-n" option to not use STUN server 2020-09-25 16:25:26 +03:00
71e5d2bf43 Define STATIC_GETOPT to client compilation on Windows 2020-09-25 12:35:14 +02:00
7188bc9d8d Minor compilation fixes 2020-09-25 11:49:01 +02:00
49180e826e Bumped version to 0.9.1 2020-09-25 11:10:05 +02:00
c6fbbb499f Updated libjuice to v0.5.0 2020-09-25 11:09:20 +02:00
7b565f0f0e Updated libjuice 2020-09-25 10:18:40 +02:00
a7cc637aa2 Fixed benchmark when connection fails 2020-09-24 20:19:26 +02:00
824bb93b0a Updated libjuice with aggressive pair nomination 2020-09-24 20:11:08 +02:00
a99efd27d2 Merge pull request #5 from paullouisageneau/master
Sync with master
2020-09-24 16:48:22 +03:00
6266e16644 Merge pull request #184 from paullouisageneau/signaling-server-endpoint
Add parameters to change servers port/endpoint
2020-09-24 15:37:39 +02:00
edd4fcfcc0 Handle optional non-localhost endpoint in rust signaling server 2020-09-24 15:24:03 +02:00
30dc229477 Handle optional non-localhost endpoint in web signaling server 2020-09-24 15:07:27 +02:00
d288885a89 Handle optional non-localhost endpoint in python signaling server 2020-09-24 14:42:26 +02:00
bd19d9d5b4 Updated libjuice 2020-09-24 14:41:40 +02:00
a284af2000 Merge pull request #182 from paullouisageneau/safe-queue-pop
Safer message queue
2020-09-24 14:35:06 +02:00
88e8d028b4 Refactored queue and introduced tryPop() 2020-09-24 12:15:45 +02:00
8cab2b9d87 Changed to const ref 2020-09-24 11:38:44 +02:00
9b62a543f6 Changed the message stream from being a payloadType to SSRC 2020-09-23 12:32:55 -04:00
5a797e1170 Renamed all RTP logs to Verbose 2020-09-23 11:43:48 -04:00
14f8858d3d Merge pull request #172 from paullouisageneau/workaround-getline
Workaround for std::getline()
2020-09-23 17:13:37 +02:00
62f7642de9 Change getline logic to work around bug where getline does not erase 2020-09-23 16:24:21 +02:00
77475b57b0 Fixed cicular dependency on RtcpHandler 2020-09-23 09:37:48 -04:00
98048a178e Merge pull request #179 from paullouisageneau/enhance-juice-log
Enhance libjuice logging
2020-09-23 15:37:46 +02:00
26eb9bf300 Optimized libjuice logging by selecting the right level 2020-09-23 15:27:48 +02:00
d4ff4a3e0d Updated libjuice 2020-09-23 15:26:30 +02:00
488e143e1f Merge pull request #178 from paullouisageneau/update-usrsctp
Update usrsctp
2020-09-23 14:13:12 +02:00
4d5c5ef404 Connected new ulp_info parameter in usrsctp send callback 2020-09-23 13:56:54 +02:00
628742c2f3 Updated usrsctp 2020-09-23 13:52:32 +02:00
2492a42151 Merge pull request #177 from paullouisageneau/peerconnection-guards
Add guards to PeerConnection
2020-09-23 12:30:55 +02:00
4a0b6e99d4 Added guards to setRemoteDescription() 2020-09-23 12:19:52 +02:00
65946fe254 Merge pull request #173 from ecotarobles/master
Command line options for example server client
2020-09-23 11:07:57 +02:00
3286b5c05e Merge pull request #4 from paullouisageneau/master
Merge
2020-09-23 11:27:02 +03:00
ac8e02604d Swap out ancient getopt for a newer one and address review feedback. 2020-09-23 11:22:51 +03:00
dd296e4408 Many many bug fixes 2020-09-23 04:10:30 +00:00
1be877132c Added audio controls 2020-09-22 23:00:16 -04:00
7e79fd9721 Merge branch 'api_updates' of https://github.com/stazio/libdatachannel into HEAD 2020-09-22 21:23:01 +00:00
5d78aecabb Fixed the payload type being wrong 2020-09-22 17:22:27 -04:00
9fbc894fdb Revert "Fixed breaking API changes in sctp"
This reverts commit b8b6b913a9.
2020-09-22 20:38:03 +00:00
4930e666ac Modified the RtcpSession class to a better API design 2020-09-22 16:30:25 -04:00
e5e337a0a5 Changed the targetSSRC to be the number 4. 2020-09-22 13:01:24 -04:00
704e604b8f Added Description::addSSRC 2020-09-22 12:56:53 -04:00
b5d3cdc9b1 Added media demo/rtp.hpp to CMakeLists.txt 2020-09-22 12:45:36 -04:00
b8b6b913a9 Fixed breaking API changes in sctp 2020-09-22 12:45:25 -04:00
f461a40a6d Added the SFU Media Demo. Fixed copyrights. Moved RTP stuff back into an header file :) 2020-09-22 12:43:07 -04:00
ddf71ffdac Merge pull request #174 from paullouisageneau/fix-wrap-rtcaddtrack
Fix missing wrap in rtcAddTrack()
2020-09-22 14:19:57 +02:00
5dd57204dd Fixed missing wrap in rtcAddTrack() 2020-09-22 11:13:58 +02:00
9a622a5e44 Comment out illegal const #define 2020-09-22 11:47:41 +03:00
42e79ce921 Command line options for example server client:
examples/client/client -s 192.168.0.68 -t 3478 -w 192.168.0.61 -x 8000 -e

STUN server is 192.168.0.68:3478, web-socket server is 192.168.0.61:8000.
-e option echoes recd messages back to sender (useful for ping timing).
2020-09-22 11:11:20 +03:00
cdde6ad36e Merge pull request #3 from paullouisageneau/master
Update to tip.
2020-09-22 10:29:30 +03:00
78769ecde2 Fixed rtp to rtcp renaming 2020-09-20 21:54:29 +02:00
430f6dbb1a Fixed C API link 2020-09-20 14:08:57 +02:00
1c01246886 Bumped version to 0.9.0 2020-09-20 13:51:54 +02:00
1f3a0f1ba7 Some cleanup 2020-09-20 13:48:08 +02:00
5622b39ed0 Made RtcpSession print to debug log instead of cout 2020-09-20 12:44:00 +02:00
5e36364145 Moved rtc.cpp to capi.cpp 2020-09-20 12:32:50 +02:00
75b0b6dcdf Moved rtp.hpp into rtcp.hpp and rtcp.cpp 2020-09-20 12:31:28 +02:00
8e5b84ccca Updated libjuice to v0.4.6 2020-09-20 12:03:24 +02:00
a3b96e1abf Added verbose log lines when issuing local description and candidates 2020-09-19 18:55:39 +02:00
9492a6729e Updated libjuice 2020-09-19 18:52:51 +02:00
4ecf9795ee Updated libjuice 2020-09-19 12:24:18 +02:00
ada13e21d3 Merge pull request #167 from paullouisageneau/api-add
Rename createTrack to addTrack()
2020-09-18 23:13:39 +02:00
a1721268a2 Renamed createTrack() to addTrack() and added addDataChannel() 2020-09-18 23:01:50 +02:00
6a876dda49 Updated libjuice 2020-09-17 14:50:37 +02:00
6c02e7ed2b Merge pull request #164 from paullouisageneau/fix-macos-workflow
Fix MacOS workflow
2020-09-16 11:02:06 +02:00
09b8a86d8f Fixed OpenSSL 1.1 installation on macOS workflow 2020-09-16 10:52:36 +02:00
d718447e7a Updated libjuice 2020-09-16 10:27:34 +02:00
57cb6b3616 Added GitHub Sponsor to funding 2020-09-15 17:59:12 +02:00
00e6de2e15 Added Media Transport in compatiblity section 2020-09-14 22:55:31 +02:00
64e49f6e03 Changed description: 2020-09-14 22:52:55 +02:00
35933853a4 Added a few clarifications about implementation 2020-09-14 21:55:29 +02:00
d64fa4a7a7 Added links to RFCs used for demultiplexing 2020-09-14 21:37:23 +02:00
2857eb3787 Changed description 2020-09-14 20:40:10 +02:00
7c9e3c4e57 Changed description 2020-09-14 20:36:34 +02:00
5cb124f185 Updated Readme to mention media transport 2020-09-14 17:10:18 +02:00
7489e3851e Changed media example log level to warning 2020-09-14 16:53:11 +02:00
d323c40c0a Merge pull request #162 from paullouisageneau/fix-h264-firefox
Fix media example with Firefox
2020-09-14 16:46:15 +02:00
03a78aaa0c Updated libjuice 2020-09-14 16:45:27 +02:00
0e31c1d985 Some cleanup 2020-09-14 16:27:40 +02:00
bab30a06c7 Added profile-level-id when video codec is H264 2020-09-14 16:25:46 +02:00
c7d1c6ed54 Updated libjuice 2020-09-14 16:22:35 +02:00
7219b8e999 Merge pull request #161 from paullouisageneau/track-capi
Add Track C API
2020-09-13 16:30:26 +02:00
d9de5080e5 Added track C API test 2020-09-13 15:17:11 +02:00
649a5d0e88 Fixed track open callback 2020-09-13 15:16:41 +02:00
8323f6b82c Fixed duplicate attributes 2020-09-13 14:59:40 +02:00
d16f2b9e2f Added rtcSetLocalDescription() to C API 2020-09-13 14:44:54 +02:00
a43dbdd1b0 Added Track C API 2020-09-13 13:44:06 +02:00
8f9945b4b9 Merge pull request #159 from paullouisageneau/handle-eintr
Handle select interruption
2020-09-13 13:43:28 +02:00
d60ec4bf59 Fixed generated SDP description order 2020-09-11 19:08:28 +02:00
e8a4c859e6 Removed rtcp-mux-only attribute 2020-09-11 18:13:31 +02:00
359c19652b Handle select() interruption with EINTR 2020-09-11 11:57:18 +02:00
7ff0e309e5 Updated libjuice 2020-09-11 11:29:54 +02:00
b2b7bfe32a Merge pull request #157 from paullouisageneau/finish-track
Finish track API
2020-09-10 18:28:05 +02:00
96e978a8e7 Fixed compilation on macOS 2020-09-10 18:01:10 +02:00
ccbd4497ca Updated libjuice 2020-09-10 17:53:19 +02:00
d49035f361 Fixed media example page title 2020-09-10 17:47:24 +02:00
d289ccecf5 Raise error on remote description without active media 2020-09-10 15:24:31 +02:00
65d1268082 Implemented differenciated application and media handling 2020-09-10 14:37:37 +02:00
d1c798c695 Auto-detect libSRTP with cmake 2020-09-10 14:19:34 +02:00
33ff0cd7cc Added track test 2020-09-10 11:15:12 +02:00
6ddba307e6 Changed state to connected when no SCTP transport is needed 2020-09-10 09:45:01 +02:00
f720cbac0c Added media constructor from SDP 2020-09-09 21:44:37 +02:00
66e05677e4 Merge pull request #156 from paullouisageneau/incoming-tracks
Incoming tracks
2020-09-08 12:44:06 +02:00
810cafe09b Trigger track callback on new track 2020-09-08 12:35:01 +02:00
28e9cd5196 Implemented incoming tracks and media direction 2020-09-08 12:07:38 +02:00
cc954cc74c Added inactive as media direction 2020-09-08 11:23:40 +02:00
6731e46386 Updated libjuice 2020-09-07 19:17:27 +02:00
b608a192c0 Use discard port 9 instead of 0 in description media entries 2020-09-07 18:05:27 +02:00
a18e9c50c4 Merge pull request #153 from paullouisageneau/track-api
Add Track API
2020-09-07 17:39:53 +02:00
d836b95c5d Pass RTCP messages to first track and do not start SCTP without application 2020-09-07 17:32:49 +02:00
66e9b9dd8b Removed unreliable bit fields in RTP structures 2020-09-07 16:48:48 +02:00
6c3aaf8a77 Refactored description for media handling 2020-09-07 16:48:42 +02:00
31aac35d2c Finished fixing media example 2020-09-01 15:26:53 +02:00
f1b680df4a Fixes for RTP 2020-09-01 15:03:29 +02:00
4e426d75e0 Cleaned up unused stuff 2020-09-01 14:25:01 +02:00
d4f464bf89 Fixed broken byte-order-specific structs 2020-09-01 14:21:09 +02:00
d90a5d628f Refactored media API into track API 2020-09-01 12:33:18 +02:00
7775f5da4f Merge pull request #154 from paullouisageneau/dependabot/npm_and_yarn/examples/web/websocket-1.0.32
Bump websocket from 1.0.31 to 1.0.32 in /examples/web
2020-08-31 11:54:41 +02:00
f15204c370 Bump websocket from 1.0.31 to 1.0.32 in /examples/web
Bumps [websocket](https://github.com/theturtle32/WebSocket-Node) from 1.0.31 to 1.0.32.
- [Release notes](https://github.com/theturtle32/WebSocket-Node/releases)
- [Changelog](https://github.com/theturtle32/WebSocket-Node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/theturtle32/WebSocket-Node/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-08-31 06:25:23 +00:00
fdea83cdfd Fixes 2020-08-27 10:15:30 +02:00
f6be5d6db0 Merge pull request #143 from stazio/webrtc_media
Create API for WebRTC Media Streams
2020-08-27 10:14:52 +02:00
bc27393e62 Merge branch 'track-api' into webrtc_media 2020-08-27 10:14:11 +02:00
71ebf7a62e Fixed copy on return 2020-08-22 22:19:02 +02:00
24e502712f Added media description to track 2020-08-22 22:11:44 +02:00
749836b1fe Integrated Track into PeerConnection 2020-08-22 18:23:54 +02:00
0b055ac17d Added Track class 2020-08-22 16:11:21 +02:00
09db03ba02 Merge pull request #152 from paullouisageneau/prevent-message-copy
Prevent message copy
2020-08-22 12:20:17 +02:00
9c4428810c Updated Readme 2020-08-22 00:23:15 +02:00
3e559f18d9 Updated description and candidate callbacks with move semantics 2020-08-22 00:22:19 +02:00
159da088a9 Updated Readme 2020-08-22 00:10:40 +02:00
942152dd8c Updated examples to callbacks with move semantics 2020-08-22 00:04:49 +02:00
c001bb3f9d Refactored include/message.hpp 2020-08-21 23:58:47 +02:00
3c971e05dd Prevent message copy with move semantics 2020-08-21 23:46:12 +02:00
f4ceaaa31b Updated libjuice 2020-08-19 20:50:16 +02:00
e6e03d4cfd Merge pull request #151 from paullouisageneau/fix-srtp-key-openssl
Fix SRTP key derivation with OpenSSL
2020-08-19 19:34:56 +02:00
0556abd4ee Fixed SRTP key derivation with OpenSSL 2020-08-19 19:27:58 +02:00
3a3df80c2c Updated libjuice 2020-08-19 18:31:42 +02:00
ac78ba48d9 Merge pull request #150 from paullouisageneau/fix-tlsext-use-srtp-openssl
Fix SSL_set_tlsext_use_srtp() error checking
2020-08-18 12:12:53 +02:00
6ed692325f Fixed SSL_set_tlsext_use_srtp() error checking 2020-08-18 11:59:47 +02:00
bf044080e8 Added bitrate control via SDP 2020-08-17 07:21:24 -04:00
22ffaacc5c Renamed Direction enums to be inline with other enums 2020-08-17 06:31:17 -04:00
91f4c3699c Undid CMake's changes to Makefile 2020-08-17 06:27:48 -04:00
07abd640fd Added RTCP Sessions; Added copy/paste example demo to use in the browser 2020-08-16 21:01:44 -04:00
f34d2bb2fe Merge pull request #141 from paullouisageneau/fix-sdp-media
Fix media SDP generation
2020-08-15 22:56:08 +02:00
642861f3be Fixed comment 2020-08-15 22:39:18 +02:00
fcd4228b56 merged with master and changed things 2020-08-14 11:11:18 -04:00
c03e615483 Merge pull request #1 from paullouisageneau/master
Update 14.08.2020
2020-08-14 12:40:09 +03:00
fed51f354a Check remote description on setRemoteDescription() 2020-08-14 09:47:47 +02:00
29bc19aa12 Merged with master 2020-08-13 11:32:10 -04:00
0620de5e62 Merge branch 'master' into fix-sdp-media 2020-08-13 14:12:30 +02:00
672287bbcf Merge pull request #147 from paullouisageneau/transport-init
Redesign transport initialization
2020-08-13 14:11:43 +02:00
d98a056469 Prevented stopping non-started transports 2020-08-13 13:53:20 +02:00
352f640756 Redesigned transport init and moved thread start to dedicated method 2020-08-13 12:32:13 +02:00
3f5eecb2e0 Fixed SRTP not wrapping outbound packets in DTLS 2020-08-12 07:56:59 -04:00
b5f8397936 Changed onMedia to use message_ptr; Applying control/binary type to media messages 2020-08-11 23:52:43 -04:00
9a63919925 Fixed use_srtp not being requested on srtp traffic 2020-08-11 21:31:59 -04:00
e1a95c2eee Use bundle mid for candidates mid 2020-08-11 18:47:48 +02:00
b7e1481621 Compatibility fixes for SDP generation 2020-08-11 18:37:22 +02:00
3deb50e460 Generate simplified SDP for libnice 2020-08-11 14:16:04 +02:00
6e733dab0c Fixed indentation 2020-08-11 11:16:38 +02:00
4a1c866117 Merge pull request #142 from stazio/fix-sdp-media
Move comon lines before m= lines
2020-08-11 11:11:41 +02:00
9c3b3ffb08 Fixed some typos 2020-08-10 21:32:16 -04:00
7e5edd1fa6 Moved comon lines before m= line 2020-08-10 19:15:47 -04:00
48443e9e95 Moved SDP common part under the first m-line 2020-08-11 00:13:48 +02:00
152eacc22d Merge pull request #140 from paullouisageneau/media-sdp
Add optional parameter for answerer media SDP
2020-08-10 17:47:52 +02:00
a6d2729556 Added optional parameter for media SDP to setRemoteDescription() 2020-08-10 17:05:26 +02:00
3f67a10720 Bumped version to 0.8.0 2020-08-10 14:17:22 +02:00
c0ea85025b Added hostname to web example server 2020-08-10 14:14:14 +02:00
b44f90b87f Added cmake flag for warnings as errors 2020-08-10 14:04:45 +02:00
498e7246a0 Fixed compilation on MSVC 2020-08-10 11:36:41 +02:00
8b1a67760c Fixed compilation with libnice 2020-08-10 11:18:20 +02:00
381d0ead1a Fixed compilation on MacOS 2020-08-10 11:06:15 +02:00
d1f77ebb10 Set warnings as errors 2020-08-10 11:01:22 +02:00
6223967bca Merge pull request #138 from paullouisageneau/reliability-c-api
Add Data Channel reliability to C API
2020-08-10 10:24:17 +02:00
e2c42ff73b Fixed unordered flag and renamed reliability type for consistency 2020-08-10 10:13:03 +02:00
980ee303c8 Fixed conversion for maxRetransmits 2020-08-08 22:10:36 +02:00
2967444678 Added Data Channel reliability to C API 2020-08-08 22:09:13 +02:00
35cad4e916 Added link to murat-dogan/node-datachannel following #122 2020-07-31 15:33:06 +02:00
ccc4d61fd3 Added Android explicitly following #44 2020-07-31 15:33:06 +02:00
aac9b101d8 Merge pull request #135 from murat-dogan/master
add NO_TESTS option
2020-07-28 13:36:13 +02:00
8d9eeda6e5 Update CMakeLists.txt 2020-07-28 13:46:55 +03:00
5eaee49e1e add NO_TESTS option 2020-07-28 10:59:55 +03:00
68fd331a9c Fixed setLocalDescription() so it doesn't require a fingerprint 2020-07-26 18:46:03 +02:00
0bb246785b Updated libjuice to v0.4.5 2020-07-26 12:55:07 +02:00
0fbdde73e7 Bumped version to 0.7.2 2020-07-25 15:08:08 +02:00
98ea6102b5 Added some verbose logging 2020-07-25 15:05:31 +02:00
ff702139e4 Merge pull request #133 from paullouisageneau/usrsctp-mitigation-fix
Extend mitigation for usrsctp send after unregistering
2020-07-25 12:53:07 +00:00
0593566ba6 Free data when instance is invalid on recv callback 2020-07-24 22:12:57 +02:00
b325100a7a Enforce usrsctp instance pointer check on every callback 2020-07-24 18:38:50 +02:00
2654 changed files with 20761 additions and 4360 deletions

2
.github/FUNDING.yml vendored
View File

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

View File

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

View File

@ -12,11 +12,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: install packages
run: sudo apt update && sudo apt install libgnutls28-dev nettle-dev
run: sudo apt update && sudo apt install libgnutls28-dev nettle-dev libsrtp2-dev
- name: submodules
run: git submodule update --init --recursive
- name: cmake
run: cmake -B build -DUSE_GNUTLS=1
run: cmake -B build -DUSE_GNUTLS=1 -DUSE_SYSTEM_SRTP=1 -DWARNINGS_AS_ERRORS=1
- name: make
run: (cd build; make -j2)
- name: test
@ -30,7 +30,7 @@ jobs:
- name: submodules
run: git submodule update --init --recursive
- name: cmake
run: cmake -B build -DUSE_GNUTLS=1
run: cmake -B build -DUSE_GNUTLS=1 -DWARNINGS_AS_ERRORS=1 -DENABLE_LOCAL_ADDRESS_TRANSLATION=1
- name: make
run: (cd build; make -j2)
- name: test

View File

@ -7,7 +7,7 @@ on:
branches:
- master
jobs:
build-linux:
build-media:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@ -16,7 +16,21 @@ jobs:
- name: submodules
run: git submodule update --init --recursive
- name: cmake
run: cmake -B build -DUSE_GNUTLS=1 -DUSE_NICE=1
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
build-no-media:
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 -DNO_MEDIA=1 -DWARNINGS_AS_ERRORS=1
- name: make
run: (cd build; make -j2)
- name: test

View File

@ -12,11 +12,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: install packages
run: sudo apt update && sudo apt install libssl-dev
run: sudo apt update && sudo apt install libssl-dev libsrtp2-dev
- name: submodules
run: git submodule update --init --recursive
- name: cmake
run: cmake -B build -DUSE_GNUTLS=0
run: cmake -B build -DUSE_GNUTLS=0 -DUSE_SYSTEM_SRTP=1 -DWARNINGS_AS_ERRORS=1
- name: make
run: (cd build; make -j2)
- name: test
@ -26,11 +26,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: install packages
run: brew reinstall openssl@1.1
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
run: cmake -B build -DUSE_GNUTLS=0 -WARNINGS_AS_ERRORS=1 -DENABLE_LOCAL_ADDRESS_TRANSLATION=1
env:
OPENSSL_ROOT_DIR: /usr/local/opt/openssl
OPENSSL_LIBRARIES: /usr/local/opt/openssl/lib
@ -48,10 +48,11 @@ jobs:
- name: submodules
run: git submodule update --init --recursive
- name: cmake
run: cmake -B build -G "NMake Makefiles" -DUSE_GNUTLS=0
run: cmake -B build -G "NMake Makefiles" -DUSE_GNUTLS=0 -WARNINGS_AS_ERRORS=1
- name: nmake
run: |
cd build
set CL=/MP
nmake
- name: test
run: build/tests.exe

3
.gitignore vendored
View File

@ -5,6 +5,7 @@ node_modules/
*.a
*.so
compile_commands.json
tests
/tests
.DS_Store
.idea

5
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "deps/plog"]
path = deps/plog
url = https://github.com/paullouisageneau/plog
url = https://github.com/SergiusTheBest/plog.git
[submodule "usrsctp"]
path = deps/usrsctp
url = https://github.com/sctplab/usrsctp.git
@ -10,3 +10,6 @@
[submodule "deps/json"]
path = deps/json
url = https://github.com/nlohmann/json.git
[submodule "deps/libsrtp"]
path = deps/libsrtp
url = https://github.com/cisco/libsrtp.git

71
BUILDING.md Normal file
View File

@ -0,0 +1,71 @@
# libdatachannel - Building instructions
## Clone repository and submodules
```bash
$ git clone https://github.com/paullouisageneau/libdatachannel.git
$ cd libdatachannel
$ git submodule update --init --recursive
```
## Build 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.
If you only need Data Channels, the option `NO_MEDIA` allows to make the library lighter by removing media support. Similarly, `NO_WEBSOCKET` removes WebSocket support.
### POSIX-compliant operating systems (including Linux and Apple macOS)
```bash
$ cmake -B build -DUSE_GNUTLS=1 -DUSE_NICE=0
$ cd build
$ make -j2
```
### Apple macOS with XCode project
```bash
$ cmake -B "$BUILD_DIR" -DUSE_GNUTLS=0 -DUSE_NICE=0 -G Xcode
```
Xcode project is generated in *build/* directory.
#### Solving **Could NOT find OpenSSL** error
You need to add OpenSSL root directory if your build fails with the following message:
```
Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the
system variable OPENSSL_ROOT_DIR (missing: OPENSSL_CRYPTO_LIBRARY
OPENSSL_INCLUDE_DIR)
```
for example:
```bash
$ cmake -B build -DUSE_GNUTLS=0 -DUSE_NICE=0 -G Xcode -DOPENSSL_ROOT_DIR=/usr/local/Cellar/openssl\@1.1/1.1.1h/
```
### 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
```
## Build 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.
If you only need Data Channels, the option `NO_MEDIA` removes media support. Similarly, `NO_WEBSOCKET` removes WebSocket support.
```bash
$ make USE_GNUTLS=1 USE_NICE=0
```

View File

@ -1,34 +1,36 @@
cmake_minimum_required(VERSION 3.7)
project(libdatachannel
DESCRIPTION "WebRTC Data Channels Library"
VERSION 0.7.1
VERSION 0.12.3
LANGUAGES CXX)
set(PROJECT_DESCRIPTION "WebRTC Data Channels Library")
# Options
option(USE_GNUTLS "Use GnuTLS instead of OpenSSL" OFF)
option(USE_NICE "Use libnice instead of libjuice" OFF)
option(USE_SRTP "Enable SRTP for media support" OFF)
option(USE_SYSTEM_SRTP "Use system libSRTP" OFF)
option(NO_WEBSOCKET "Disable WebSocket support" OFF)
option(NO_MEDIA "Disable media transport support" OFF)
option(NO_EXAMPLES "Disable examples" OFF)
if(USE_NICE)
option(USE_JUICE "Use libjuice" OFF)
else()
option(USE_JUICE "Use libjuice" ON)
endif()
option(NO_TESTS "Disable tests build" OFF)
option(WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
option(CAPI_STDCALL "Set calling convention of C API callbacks stdcall" OFF)
if(USE_GNUTLS)
option(USE_NETTLE "Use Nettle instead of OpenSSL in libjuice" ON)
option(USE_NETTLE "Use Nettle in libjuice" ON)
else()
option(USE_NETTLE "Use Nettle instead of OpenSSL in libjuice" OFF)
option(USE_NETTLE "Use Nettle in libjuice" OFF)
if(NOT USE_SYSTEM_SRTP)
option(ENABLE_OPENSSL "Enable OpenSSL crypto engine for SRTP" ON)
endif()
endif()
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static
if(WIN32)
add_definitions(-DWIN32_LEAN_AND_MEAN)
if (MSVC)
if(MSVC)
add_definitions(-DNOMINMAX)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)
@ -37,31 +39,30 @@ endif()
set(LIBDATACHANNEL_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/candidate.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/certificate.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/channel.cpp
${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/rtc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/sctptransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/tls.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/threadpool.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/processor.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/rtcpreceivingsession.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/track.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/websocket.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/wstransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/rtppacketizationconfig.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/rtcpsrreporter.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/rtppacketizer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/opusrtppacketizer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/opuspacketizationhandler.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/h264rtppacketizer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/nalunit.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/h264packetizationhandler.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/mediachainablehandler.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/mediahandlerelement.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/mediahandlerrootelement.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/rtcpnackresponder.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/capi.cpp
)
set(LIBDATACHANNEL_HEADERS
@ -71,26 +72,110 @@ 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/include.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/mediahandler.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/rtcpreceivingsession.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/common.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/init.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/log.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/message.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/peerconnection.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/queue.hpp
${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/rtp.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/track.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/websocket.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/rtppacketizationconfig.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/rtcpsrreporter.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/rtppacketizer.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/opusrtppacketizer.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/opuspacketizationhandler.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/h264rtppacketizer.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/nalunit.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/h264packetizationhandler.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/mediachainablehandler.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/mediahandlerelement.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/mediahandlerrootelement.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/rtcpnackresponder.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/utils.hpp
)
set(LIBDATACHANNEL_IMPL_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/certificate.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/channel.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/datachannel.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/dtlssrtptransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/dtlstransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/icetransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/peerconnection.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/logcounter.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/sctptransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/threadpool.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/tls.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/track.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/processor.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/base64.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/tcptransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/tlstransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/verifiedtlstransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/websocket.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/wstransport.cpp
)
set(LIBDATACHANNEL_IMPL_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/certificate.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/channel.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/datachannel.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/dtlssrtptransport.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/dtlstransport.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/icetransport.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/peerconnection.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/queue.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/logcounter.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/sctptransport.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/threadpool.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/tls.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/track.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/processor.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/base64.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/tcptransport.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/tlstransport.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/verifiedtlstransport.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/websocket.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/wstransport.hpp
)
set(TESTS_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/test/main.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test/connectivity.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test/capi.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test/turn_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
)
set(TESTS_UWP_RESOURCES
${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/tests/Logo.png
${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/tests/package.appxManifest
${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/tests/SmallLogo.png
${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/tests/SmallLogo44x44.png
${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/tests/SplashScreen.png
${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/tests/StoreLogo.png
${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/tests/Windows_TemporaryKey.pfx
)
set(BENCHMARK_UWP_RESOURCES
${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/benchmark/Logo.png
${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/benchmark/package.appxManifest
${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/benchmark/SmallLogo.png
${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/benchmark/SmallLogo44x44.png
${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/benchmark/SplashScreen.png
${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/benchmark/StoreLogo.png
${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/benchmark/Windows_TemporaryKey.pfx
)
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads REQUIRED)
@ -99,35 +184,27 @@ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
add_subdirectory(deps/plog)
option(sctp_build_programs 0)
option(sctp_build_shared_lib 0)
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
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)
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
add_library(datachannel SHARED
${LIBDATACHANNEL_SOURCES}
${LIBDATACHANNEL_WEBSOCKET_SOURCES})
add_library(datachannel-static STATIC EXCLUDE_FROM_ALL
${LIBDATACHANNEL_HEADERS}
${LIBDATACHANNEL_IMPL_SOURCES}
${LIBDATACHANNEL_IMPL_HEADERS})
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()
${LIBDATACHANNEL_HEADERS}
${LIBDATACHANNEL_IMPL_SOURCES}
${LIBDATACHANNEL_IMPL_HEADERS})
set_target_properties(datachannel PROPERTIES
VERSION ${PROJECT_VERSION}
@ -140,20 +217,34 @@ target_include_directories(datachannel PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/includ
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_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp)
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_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp)
if(WIN32)
target_link_libraries(datachannel PRIVATE wsock32 ws2_32) # winsock2
target_link_libraries(datachannel-static PRIVATE wsock32 ws2_32) # winsock2
target_link_libraries(datachannel PUBLIC ws2_32) # winsock2
target_link_libraries(datachannel-static PUBLIC ws2_32) # winsock2
endif()
if(USE_SRTP)
if (NO_WEBSOCKET)
target_compile_definitions(datachannel PUBLIC RTC_ENABLE_WEBSOCKET=0)
target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_WEBSOCKET=0)
else()
target_compile_definitions(datachannel PUBLIC RTC_ENABLE_WEBSOCKET=1)
target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_WEBSOCKET=1)
endif()
if(NO_MEDIA)
target_compile_definitions(datachannel PUBLIC RTC_ENABLE_MEDIA=0)
target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_MEDIA=0)
else()
target_compile_definitions(datachannel PUBLIC RTC_ENABLE_MEDIA=1)
target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_MEDIA=1)
if(USE_SYSTEM_SRTP)
find_package(SRTP REQUIRED)
if(NOT TARGET SRTP::SRTP)
add_library(SRTP::SRTP UNKNOWN IMPORTED)
@ -162,13 +253,17 @@ if(USE_SRTP)
IMPORTED_LINK_INTERFACE_LANGUAGES C
IMPORTED_LOCATION ${SRTP_LIBRARIES})
endif()
target_compile_definitions(datachannel PUBLIC RTC_ENABLE_MEDIA=1)
target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_MEDIA=1)
target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_SRTP=1)
target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_SRTP=1)
target_link_libraries(datachannel PRIVATE SRTP::SRTP)
target_link_libraries(datachannel-static PRIVATE SRTP::SRTP)
else()
target_compile_definitions(datachannel PUBLIC RTC_ENABLE_MEDIA=0)
target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_MEDIA=0)
else()
add_subdirectory(deps/libsrtp EXCLUDE_FROM_ALL)
target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_SRTP=0)
target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_SRTP=0)
target_link_libraries(datachannel PRIVATE srtp2)
target_link_libraries(datachannel-static PRIVATE srtp2)
endif()
endif()
if (USE_GNUTLS)
@ -193,7 +288,7 @@ else()
target_link_libraries(datachannel-static PRIVATE OpenSSL::SSL)
endif()
if (USE_NICE OR NOT USE_JUICE)
if (USE_NICE)
find_package(LibNice REQUIRED)
target_compile_definitions(datachannel PRIVATE USE_NICE=1)
target_compile_definitions(datachannel-static PRIVATE USE_NICE=1)
@ -207,36 +302,60 @@ else()
target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuiceStatic)
endif()
if(CAPI_STDCALL)
target_compile_definitions(datachannel PUBLIC CAPI_STDCALL)
target_compile_definitions(datachannel-static PUBLIC CAPI_STDCALL)
endif()
add_library(LibDataChannel::LibDataChannel ALIAS datachannel)
add_library(LibDataChannel::LibDataChannelStatic ALIAS datachannel-static)
install(TARGETS datachannel LIBRARY DESTINATION lib)
install(FILES ${LIBDATACHANNEL_HEADERS} DESTINATION include/rtc)
# 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)
if(NOT MSVC)
target_compile_options(datachannel PRIVATE -Wall -Wextra)
target_compile_options(datachannel-static PRIVATE -Wall -Wextra)
endif()
# Benchmark
add_executable(datachannel-benchmark test/benchmark.cpp)
set_target_properties(datachannel-benchmark PROPERTIES
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()
# Tests
if(NOT NO_TESTS)
if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
# Add resource files needed for UWP apps.
add_executable(datachannel-tests ${TESTS_SOURCES} ${TESTS_UWP_RESOURCES})
else()
add_executable(datachannel-tests ${TESTS_SOURCES})
endif()
set_target_properties(datachannel-tests 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()
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)
# Benchmark
if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
# Add resource files needed for UWP apps.
add_executable(datachannel-benchmark test/benchmark.cpp ${BENCHMARK_UWP_RESOURCES})
else()
add_executable(datachannel-benchmark test/benchmark.cpp)
endif()
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)
target_link_libraries(datachannel-benchmark datachannel)
endif()
@ -245,6 +364,12 @@ if(NOT NO_EXAMPLES)
set(JSON_BuildTests OFF CACHE INTERNAL "")
add_subdirectory(deps/json)
add_subdirectory(examples/client)
add_subdirectory(examples/client-benchmark)
if(NOT NO_MEDIA)
add_subdirectory(examples/media)
add_subdirectory(examples/sfu-media)
add_subdirectory(examples/streamer)
endif()
add_subdirectory(examples/copy-paste)
add_subdirectory(examples/copy-paste-capi)
endif()

648
DOC.md Normal file
View File

@ -0,0 +1,648 @@
# libdatachannel - C API Documentation
The following details the C API of libdatachannel. The C API is available by including the `rtc/rtc.h` header.
### General considerations
Unless stated otherwise, functions return `RTC_ERR_SUCCESS`, defined as `0`, on success.
All functions can return the following negative error codes:
- `RTC_ERR_INVALID`: an invalid argument was provided
- `RTC_ERR_FAILURE`: a runtime error happened
- `RTC_ERR_NOT_AVAIL`: an element is not available at the moment
- `RTC_ERR_TOO_SMALL`: a user-provided buffer is too small
All functions taking pointers as arguments (excepted the opaque user pointer) need the memory to be accessible until the call returns, but it can be safely discarded afterwards.
### Common
#### rtcInitLogger
```
void rtcInitLogger(rtcLogLevel level, rtcLogCallbackFunc cb)
```
Arguments:
- `level`: the log level. It must be one of the following: `RTC_LOG_NONE`, `RTC_LOG_FATAL`, `RTC_LOG_ERROR`, `RTC_LOG_WARNING`, `RTC_LOG_INFO`, `RTC_LOG_DEBUG`, `RTC_LOG_VERBOSE`.
- `cb` (optional): the callback to pass the log lines to. If the callback is already set, it is replaced. If NULL after a callback is set, the callback is unset. If NULL on first call, the library will log to stdout instead.
`cb` must have the following signature:
`void myLogCallback(rtcLogLevel level, const char *message)`
Arguments:
- `level`: the log level for the current message. It will be one of the following: `RTC_LOG_FATAL`, `RTC_LOG_ERROR`, `RTC_LOG_WARNING`, `RTC_LOG_INFO`, `RTC_LOG_DEBUG`, `RTC_LOG_VERBOSE`.
- `message`: a null-terminated string containing the log message
#### rtcPreload
```
void rtcPreload(void)
```
An optional call to `rtcPreload` preloads the global resources used by the library. If it is not called, resources are lazy-loaded when they are required for the first time by a PeerConnection, which for instance prevents from properly timing connection establishment (as the first one will take way more time). The call blocks until preloading is finished. If resources are already loaded, the call has no effect.
#### rtcCleanup
```
void rtcCleanup(void)
```
An optional call to `rtcCleanup` requests unloading of the global resources used by the library. If all created PeerConnections are deleted, unloading will happen immediately and the call will block until unloading is done, otherwise unloading will happen as soon as the last PeerConnection is deleted. If resources are already unloaded, the call has no effect.
#### rtcSetUserPointer
```
void rtcSetUserPointer(int id, void *user_ptr)
```
Sets a opaque user pointer for a Peer Connection, Data Channel, Track, or WebSocket. The user pointer will be passed as last argument in each corresponding callback. It will never be accessed in any way. The initial user pointer of a Peer Connection or WebSocket is `NULL`, and the initial one of a Data Channel or Track is the one of the Peer Connection at the time of creation.
Arguments:
- `id`: the identifier of Peer Connection, Data Channel, Track, or WebSocket
- `user_ptr`: an opaque pointer whose meaning is up to the user
### PeerConnection
#### rtcCreatePeerConnection
```
int rtcCreatePeerConnection(const rtcConfiguration *config)
typedef struct {
const char **iceServers;
int iceServersCount;
rtcCertificateType certificateType;
bool enableIceTcp;
bool disableAutoNegotiation;
uint16_t portRangeBegin;
uint16_t portRangeEnd;
int mtu;
} rtcConfiguration;
```
Creates a Peer Connection.
Arguments:
- `config`: the configuration structure, containing:
- `iceServers` (optional): an array of pointers on null-terminated ice server URIs (NULL if unused)
- `iceServersCount` (optional): number of URLs in the array pointed by `iceServers` (0 if unused)
- `certificateType` (optional): certificate type, either `RTC_CERTIFICATE_ECDSA` or `RTC_CERTIFICATE_RSA` (0 or `RTC_CERTIFICATE_DEFAULT` if default)
- `enableIceTcp`: if true, generate TCP candidates for ICE (ignored with libjuice as ICE backend)
- `disableAutoNegotiation`: if true, the user is responsible for calling `rtcSetLocalDescription` after creating a Data Channel and after setting the remote description
- `portRangeBegin` (optional): first port (included) of the allowed local port range (0 if unused)
- `portRangeEnd` (optional): last port (included) of the allowed local port (0 if unused)
- `mtu` (optional): manually set the Maximum Transfer Unit (MTU) for the connection (0 if automatic)
- `maxMessageSize` (optional): manually set the local maximum message size for Data Channels (0 if default)
Return value: the identifier of the new Peer Connection or a negative error code.
The Peer Connection must be deleted with `rtcDeletePeerConnection`.
The format of each entry in `iceServers` must match the format `[("stun"|"turn"|"turns") ":"][login ":" password "@"]hostname[":" port]["?transport=" ("udp"|"tcp"|"tls")]`. The default scheme is STUN, the default port is 3478 (5349 over TLS), and the default transport is UDP. For instance, a STUN server URI could be `mystunserver.org`, and a TURN server URI could be `turn:myuser:12345678@turnserver.org`. Note transports TCP and TLS are only available for a TURN server with libnice as ICE backend and govern only the TURN control connection, meaning relaying is always performed over UDP.
#### rtcDeletePeerConnection
```
int rtcDeletePeerConnection(int pc)
```
Deletes the specified Peer Connection.
Arguments:
- `pc`: the Peer Connection identifier
Return value: `RTC_ERR_SUCCESS` or a negative error code
After this function has been called, `pc` must not be used in a function call anymore. This function will block until all scheduled callbacks of `pc` return (except the one this function might be called in) and no other callback will be called for `pc` after it returns.
#### rtcSetXCallback
These functions set, change, or unset (if `cb` is `NULL`) the different callbacks of a Peer Connection.
```
int rtcSetLocalDescriptionCallback(int pc, rtcDescriptionCallbackFunc cb)*
```
`cb` must have the following signature: `void myDescriptionCallback(int pc, const char *sdp, const char *type, void *user_ptr)`
```
int rtcSetLocalCandidateCallback(int pc, rtcCandidateCallbackFunc cb)
```
`cb` must have the following signature: `void myCandidateCallback(int pc, const char *cand, const char *mid, void *user_ptr)`
```
int rtcSetStateChangeCallback(int pc, rtcStateChangeCallbackFunc cb)
```
`cb` must have the following signature: `void myStateChangeCallback(int pc, rtcState state, void *user_ptr)`
`state` will be one of the following: `RTC_CONNECTING`, `RTC_CONNECTED`, `RTC_DISCONNECTED`, `RTC_FAILED`, or `RTC_CLOSED`.
```
int rtcSetGatheringStateChangeCallback(int pc, rtcGatheringStateCallbackFunc cb)
```
`void myGatheringStateCallback(int pc, rtcGatheringState state, void *user_ptr)`
`state` will be `RTC_GATHERING_INPROGRESS` or `RTC_GATHERING_COMPLETE`.
```
int rtcSetDataChannelCallback(int pc, rtcDataChannelCallbackFunc cb)
```
`cb` must have the following signature: `void myDataChannelCallback(int pc, int dc, void *user_ptr)`
```
int rtcSetTrackCallback(int pc, rtcTrackCallbackFunc cb)
```
`cb` must have the following signature: `void myTrackCallback(int pc, int tr, void *user_ptr)`
#### rtcSetLocalDescription
```
int rtcSetLocalDescription(int pc, const char *type)
```
Initiates the handshake process. Following this call, the local description callback will be called with the local description, which must be sent to the remote peer by the user's method of choice. Note this call is implicit after `rtcSetRemoteDescription` and `rtcCreateDataChannel` if `disableAutoNegotiation` was not set on Peer Connection creation.
Arguments:
- `pc`: the Peer Connection identifier
- `type` (optional): type of the description ("offer", "answer", "pranswer", or "rollback") or NULL for autodetection.
#### rtcSetRemoteDescription
```
int rtcSetRemoteDescription(int pc, const char *sdp, const char *type)
```
Sets the remote description received from the remote peer by the user's method of choice. The remote description may have candidates or not.
Arguments:
- `pc`: the Peer Connection identifier
- `type` (optional): type of the description ("offer", "answer", "pranswer", or "rollback") or NULL for autodetection.
If the remote description is an offer and `disableAutoNegotiation` was not set in `rtcConfiguration`, the library will automatically answer by calling `rtcSetLocalDescription` internally. Otherwise, the user must call it to answer the remote description.
#### rtcAddRemoteCandidate
```
int rtcAddRemoteCandidate(int pc, const char *cand, const char *mid)
```
Adds a trickled remote candidate received from the remote peer by the user's method of choice.
Arguments:
- `pc`: the Peer Connection identifier
- `cand`: a null-terminated SDP string representing the candidate (with or without the `"a="` prefix)
- `mid` (optional): a null-terminated string representing the mid of the candidate in the remote SDP description or NULL for autodetection
The Peer Connection must have a remote description set.
Return value: `RTC_ERR_SUCCESS` or a negative error code
#### rtcGetLocalDescription
```
int rtcGetLocalDescription(int pc, char *buffer, int size)
```
Retrieves the current local description in SDP format.
Arguments:
- `pc`: the Peer Connection identifier
- `buffer`: a user-supplied buffer to store the description
- `size`: the size of `buffer`
Return value: the length of the string copied in buffer (including the terminating null character) or a negative error code
If `buffer` is `NULL`, the description is not copied but the size is still returned.
#### rtcGetRemoteDescription
```
int rtcGetRemoteDescription(int pc, char *buffer, int size)
```
Retrieves the current remote description in SDP format.
Arguments:
- `pc`: the Peer Connection identifier
- `buffer`: a user-supplied buffer to store the description
- `size`: the size of `buffer`
Return value: the length of the string copied in buffer (including the terminating null character) or a negative error code
If `buffer` is `NULL`, the description is not copied but the size is still returned.
#### rtcGetLocalDescriptionType
```
int rtcGetLocalDescriptionType(int pc, char *buffer, int size)
```
Retrieves the current local description type as string.
Arguments:
- `pc`: the Peer Connection identifier
- `buffer`: a user-supplied buffer to store the type
- `size`: the size of `buffer`
Return value: the length of the string copied in buffer (including the terminating null character) or a negative error code
If `buffer` is `NULL`, the description is not copied but the size is still returned.
#### rtcGetRemoteDescription
```
int rtcGetRemoteDescriptionType(int pc, char *buffer, int size)
```
Retrieves the current remote description type as string.
Arguments:
- `pc`: the Peer Connection identifier
- `buffer`: a user-supplied buffer to store the type
- `size`: the size of `buffer`
Return value: the length of the string copied in buffer (including the terminating null character) or a negative error code
If `buffer` is `NULL`, the description is not copied but the size is still returned.
#### rtcGetLocalAddress
```
int rtcGetLocalAddress(int pc, char *buffer, int size)
```
Retrieves the current local address, i.e. the network address of the currently selected local candidate. The address will have the format `"IP_ADDRESS:PORT"`, where `IP_ADDRESS` may be either IPv4 or IPv6. The call might fail if the PeerConnection is not in state `RTC_CONNECTED`, and the address might change if the state is not `RTC_COMPLETED`.
Arguments:
- `pc`: the Peer Connection identifier
- `buffer`: a user-supplied buffer to store the address
- `size`: the size of `buffer`
Return value: the length of the string copied in buffer (including the terminating null character) or a negative error code
If `buffer` is `NULL`, the address is not copied but the size is still returned.
#### rtcGetRemoteAddress
```
int rtcGetRemoteAddress(int pc, char *buffer, int size)
```
Retrieves the current remote address, i.e. the network address of the currently selected remote candidate. The address will have the format `"IP_ADDRESS:PORT"`, where `IP_ADDRESS` may be either IPv4 or IPv6. The call may fail if the state is not `RTC_CONNECTED`, and the address might change if the state is not `RTC_COMPLETED`.
Arguments:
- `pc`: the Peer Connection identifier
- `buffer`: a user-supplied buffer to store the address
- `size`: the size of `buffer`
Return value: the length of the string copied in buffer (including the terminating null character) or a negative error code
If `buffer` is `NULL`, the address is not copied but the size is still returned.
#### rtcGetSelectedCandidatePair
```
int rtcGetSelectedCandidatePair(int pc, char *local, int localSize, char *remote, int remoteSize)
```
Retrieve the currently selected candidate pair. The call may fail if the state is not `RTC_CONNECTED`, and the selected candidate pair might change if the state is not `RTC_COMPLETED`.
Arguments:
- `pc`: the Peer Connection identifier
- `local`: a user-supplied buffer to store the local candidate
- `localSize`: the size of `local`
- `remote`: a user-supplied buffer to store the remote candidate
- `remoteSize`: the size of `remote`
Return value: the maximun length of strings copied in buffers (including the terminating null character) or a negative error code
If `local`, `remote`, or both, are `NULL`, the corresponding candidate is not copied, but the maximum length is still returned.
### Data Channel
#### rtcCreateDataChannel
```
int rtcCreateDataChannel(int pc, const char *label)
int rtcCreateDataChannelEx(int pc, const char *label, const rtcDataChannelInit *init)
typedef struct {
bool unordered;
bool unreliable;
unsigned int maxPacketLifeTime;
unsigned int maxRetransmits;
} rtcReliability;
typedef struct {
rtcReliability reliability;
const char *protocol;
bool negotiated;
bool manualStream;
uint16_t stream;
} rtcDataChannelInit;
```
Adds a Data Channel on a Peer Connection. The Peer Connection does not need to be connected, however, the Data Channel will be open only when the Peer Connection is connected.
Arguments:
- `pc`: identifier of the PeerConnection on which to add a Data Channel
- `label`: a user-defined UTF-8 string representing the Data Channel name
- `init`: a structure of initialization settings containing:
- `reliability`: a structure of reliability settings containing:
- `bool unordered`: if `true`, the Data Channel will not enforce message ordering, else it will be ordered
- `bool unreliable`: if `true`, the Data Channel will not enforce strict reliability, else it will be reliable
- `unsigned int maxPacketLifeTime`: if unreliable, maximum packet life time in milliseconds
- `unsigned int maxRetransmits`: if unreliable and maxPacketLifeTime is 0, maximum number of retransmissions (0 means no retransmission)
- `protocol` (optional): a user-defined UTF-8 string representing the Data Channel protocol, empty if NULL
- `negotiated`: if `true`, the Data Channel is assumed to be negotiated by the user and won't be negotiated by the WebRTC layer
- `manualStream`: if `true`, the Data Channel will use `stream` as stream ID, else an available id is automatically selected
- `stream` (0-65534): if `manualStream` is `true`, the Data Channel will use it as stream ID, else it is ignored
`rtcDataChannel()` is equivalent to `rtcDataChannelEx()` with settings set to ordered, reliable, non-negotiated, with automatic stream ID selection (all flags set to `false`), and `protocol` set to an empty string.
Return value: the identifier of the new Data Channel or a negative error code.
The Data Channel must be deleted with `rtcDeleteDataChannel`.
If `disableAutoNegotiation` was not set in `rtcConfiguration`, the library will automatically initiate the negotiation by calling `rtcSetLocalDescription` internally. Otherwise, the user must call `rtcSetLocalDescription` to initiate the negotiation after creating the first Data Channel.
#### rtcDeleteDataChannel
```
int rtcDeleteDataChannel(int dc)
```
Deletes a Data Channel.
Arguments:
- `dc`: the Data Channel identifier
After this function has been called, `dc` must not be used in a function call anymore. This function will block until all scheduled callbacks of `dc` return (except the one this function might be called in) and no other callback will be called for `dc` after it returns.
#### rtcGetDataChannelStream
```
int rtcGetDataChannelStream(int dc)
```
Retrieves the stream ID of the Data Channel.
Arguments:
- `dc`: the Data Channel identifier
Return value: the stream ID (0-65534) or a negative error code
#### rtcGetDataChannelLabel
```
int rtcGetDataChannelLabel(int dc, char *buffer, int size)
```
Retrieves the label of a Data Channel.
Arguments:
- `dc`: the Data Channel identifier
- `buffer`: a user-supplied buffer to store the label
- `size`: the size of `buffer`
Return value: the length of the string copied in buffer (including the terminating null character) or a negative error code
If `buffer` is `NULL`, the label is not copied but the size is still returned.
#### rtcGetDataChannelProtocol
```
int rtcGetDataChannelProtocol(int dc, char *buffer, int size)
```
Retrieves the protocol of a Data Channel.
Arguments:
- `dc`: the Data Channel identifier
- `buffer`: a user-supplied buffer to store the protocol
- `size`: the size of `buffer`
Return value: the length of the string copied in buffer (including the terminating null character) or a negative error code
If `buffer` is `NULL`, the protocol is not copied but the size is still returned.
#### rtcGetDataChannelReliability
```
int rtcGetDataChannelReliability(int dc, rtcReliability *reliability)
```
Retrieves the reliability settings of a Data Channel. The function may be called irrelevant of how the Data Channel was created.
Arguments:
- `dc`: the Data Channel identifier
- `reliability` a user-supplied structure to fill
Return value: `RTC_ERR_SUCCESS` or a negative error code
### Track
#### rtcAddTrack
```
int rtcAddTrack(int pc, const char *mediaDescriptionSdp)
```
Adds a new Track on a Peer Connection. The Peer Connection does not need to be connected, however, the Track will be open only when the Peer Connection is connected.
Arguments:
- `pc`: the Peer Connection identifier
- `mediaDescriptionSdp`: a null-terminated string specifying the corresponding media SDP. It must start with a m-line and include a mid parameter.
Return value: the identifier of the new Track or a negative error code
The new track must be deleted with `rtcDeleteTrack`.
The user must call `rtcSetLocalDescription` to negotiate the track.
#### rtcDeleteTrack
```
int rtcDeleteTrack(int tr)
```
Deletes a Track.
Arguments:
- `tr`: the Track identifier
After this function has been called, `tr` must not be used in a function call anymore. This function will block until all scheduled callbacks of `tr` return (except the one this function might be called in) and no other callback will be called for `tr` after it returns.
#### rtcGetTrackDescription
```
int rtcGetTrackDescription(int tr, char *buffer, int size)
```
Retrieves the SDP media description of a Track.
Arguments:
- `dc`: the Track identifier
- `buffer`: a user-supplied buffer to store the description
- `size`: the size of `buffer`
Return value: the length of the string copied in buffer (including the terminating null character) or a negative error code
If `buffer` is `NULL`, the description is not copied but the size is still returned.
### WebSocket
#### rtcCreateWebSocket
```
int rtcCreateWebSocket(const char *url)
int rtcCreateWebSocketEx(const char *url, const rtcWsConfiguration *config)
```
Creates a new client WebSocket.
Arguments:
- `url`: a null-terminated string representing the fully-qualified URL to open.
- `config`: a structure with the following parameters:
- `bool disableTlsVerification`: if true, don't verify the TLS certificate, else try to verify it if possible
Return value: the identifier of the new WebSocket or a negative error code
The new WebSocket must be deleted with `rtcDeleteWebSocket`. The scheme of the URL must be either `ws` or `wss`.
#### rtcDeleteWebSocket
```
int rtcDeleteWebSocket(int ws)
```
Arguments:
- `ws`: the identifier of the WebSocket to delete
Return value: the identifier of the new WebSocket or a negative error code
After this function has been called, `ws` must not be used in a function call anymore. This function will block until all scheduled callbacks of `ws` return (except the one this function might be called in) and no other callback will be called for `ws` after it returns.
### Channel (Data Channel, Track, and WebSocket)
The following common functions might be called with a generic channel identifier. It may be the identifier of either a Data Channel, a Track, or a WebSocket.
#### rtcSetXCallback
These functions set, change, or unset (if `cb` is `NULL`) the different callbacks of a channel.
```
int rtcSetOpenCallback(int id, rtcOpenCallbackFunc cb)
```
`cb` must have the following signature: `void myOpenCallback(int id, void *user_ptr)`
```
int rtcSetClosedCallback(int id, rtcClosedCallbackFunc cb)
```
`cb` must have the following signature: `void myClosedCallback(int id, void *user_ptr)`
```
int rtcSetErrorCallback(int id, rtcErrorCallbackFunc cb)
```
`cb` must have the following signature: `void myErrorCallback(int id, const char *error, void *user_ptr)`
```
int rtcSetMessageCallback(int id, rtcMessageCallbackFunc cb)
```
`cb` must have the following signature: `void myMessageCallback(int id, const char *message, int size, void *user_ptr)`
```
int rtcSetBufferedAmountLowCallback(int id, rtcBufferedAmountLowCallbackFunc cb)
```
`cb` must have the following signature: `void myBufferedAmountLowCallback(int id, void *user_ptr)`
```
int rtcSetAvailableCallback(int id, rtcAvailableCallbackFunc cb)
```
`cb` must have the following signature: `void myAvailableCallback(int id, void *user_ptr)`
#### rtcSendMessage
```
int rtcSendMessage(int id, const char *data, int size)
```
Arguments:
- `id`: the channel identifier
- `data`: the message data
- `size`: if size >= 0, `data` is interpreted as a binary message of length `size`, otherwise it is interpreted as a null-terminated UTF-8 string.
Return value: `RTC_ERR_SUCCESS` or a negative error code
Sends a message immediately if possible.
Data Channel and WebSocket: If the message may not be sent immediately due to flow control or congestion control, it is buffered until it can actually be sent. You can retrieve the current buffered data size with `rtcGetBufferedAmount`.
Tracks are an exception: There is no flow or congestion control, messages are never buffered and `rtcGetBufferedAmount` always returns 0.
#### rtcGetBufferedAmount
```
int rtcGetBufferedAmount(int id)
```
Retrieves the current buffered amount, i.e. the total size of currently buffered messages waiting to be actually sent in the channel. This does not account for the data buffered at the transport level.
Return value: the buffered amount or a negative error code
#### rtcGetBufferedAmountLowThreshold
```
int rtcSetBufferedAmountLowThreshold(int id, int amount)
```
Changes the buffered amount threshold under which `BufferedAmountLowCallback` is called. The callback is called when the buffered amount was strictly superior and gets equal to or lower than the threshold when a message is sent. The initial threshold is 0, meaning the the callback is called each time the buffered amount goes back to zero after being non-zero.
Arguments:
- `id`: the channel identifier
- `amount`: the new buffer level threshold
Return value: the identifier of the new WebSocket or a negative error code
#### rtcReceiveMessage
```
int rtcReceiveMessage(int id, char *buffer, int *size)
```
Receives a pending message if possible. The function may only be called if `MessageCallback` is not set.
Arguments:
- `id`: the channel identifier
- `buffer`: a user-supplied buffer where to write the message data
- `size`: a pointer to a user-supplied int which must be initialized to the size of `buffer`. On success, the function will write the size of the message to it before returning.
Return value: `RTC_ERR_SUCCESS` or a negative error code (In particular, `RTC_ERR_NOT_AVAIL` is returned when there are no pending messages)
If `buffer` is `NULL`, the message is not copied and kept pending but the size is still written to `size`.
#### rtcGetAvailableAmount
```
int rtcGetAvailableAmount(int id)
```
Retrieves the available amount, i.e. the total size of messages pending reception with `rtcReceiveMessage`. The function may only be called if `MessageCallback` is not set.
Arguments:
- `id`: the channel identifier
Return value: the available amount or a negative error code

17
Jamfile
View File

@ -12,12 +12,15 @@ feature.compose <gnutls>on
lib libdatachannel
: # sources
[ glob ./src/*.cpp ]
[ glob ./src/impl/*.cpp ]
: # requirements
<cxxstd>17
<include>./include
<include>./include/rtc
<define>USE_NICE=0
<include>./src
<define>RTC_ENABLE_MEDIA=0
<define>RTC_ENABLE_WEBSOCKET=0
<define>USE_NICE=0
<toolset>msvc:<define>WIN32_LEAN_AND_MEAN
<toolset>msvc:<define>NOMINMAX
<toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
@ -32,6 +35,8 @@ lib libdatachannel
<link>static
: # usage requirements
<include>./include
<define>RTC_ENABLE_MEDIA=0
<define>RTC_ENABLE_WEBSOCKET=0
<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"
@ -94,7 +99,7 @@ rule make_libusrsctp ( targets * : sources * : properties * )
}
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)
(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" -Dsctp_build_shared_lib=0 -Dsctp_build_programs=0 .. && make -j2 usrsctp)
cp $(CWD)/deps/usrsctp/$(BUILD_DIR)/usrsctplib/libusrsctp.a $(<)
}
rule make_libusrsctp_msvc ( targets * : sources * : properties * )
@ -109,7 +114,7 @@ actions make_libusrsctp_msvc
cd $(CWD)/deps/usrsctp
mkdir $(BUILD_DIR)
cd $(BUILD_DIR)
cmake -G "Visual Studio 16 2019" ..
cmake -G "Visual Studio 16 2019" -Dsctp_build_shared_lib=0 -Dsctp_build_programs=0 ..
msbuild usrsctplib.sln /property:Configuration=$(VARIANT)
cd %OLDD%
cp $(CWD)/deps/usrsctp/$(BUILD_DIR)/usrsctplib/Release/usrsctp.lib $(<)
@ -141,7 +146,7 @@ rule make_libjuice_openssl ( targets * : sources * : properties * )
{
# on macOS, default to pick up openssl from the homebrew installation
# brew install openssl
OPENSSL_INCLUDE = /usr/local/opt/openssl/include ;
OPENSSL_INCLUDE = /opt/homebrew/opt/openssl /usr/local/opt/openssl/include ;
}
if $(OPENSSL_INCLUDE) != ""
@ -189,7 +194,7 @@ rule openssl-lib-path ( properties * )
{
# on macOS, default to pick up openssl from the homebrew installation
# brew install openssl
OPENSSL_LIB = /usr/local/opt/openssl/lib ;
OPENSSL_LIB = /opt/homebrew/opt/openssl/lib /usr/local/opt/openssl/lib ;
}
else if <target-os>windows in $(properties) && $(OPENSSL_LIB) = ""
{
@ -215,7 +220,7 @@ rule openssl-include-path ( properties * )
{
# on macOS, default to pick up openssl from the homebrew installation
# brew install openssl
OPENSSL_INCLUDE = /usr/local/opt/openssl/include ;
OPENSSL_INCLUDE = /opt/homebrew/opt/openssl/include /usr/local/opt/openssl/include ;
}
else if <target-os>windows in $(properties) && $(OPENSSL_INCLUDE) = ""
{

View File

@ -10,10 +10,11 @@ LDFLAGS=-pthread
LIBS=
LOCALLIBS=libusrsctp.a
USRSCTP_DIR=deps/usrsctp
SRTP_DIR=deps/libsrtp
JUICE_DIR=deps/libjuice
PLOG_DIR=deps/plog
INCLUDES=-Iinclude/rtc -I$(PLOG_DIR)/include -I$(USRSCTP_DIR)/usrsctplib
INCLUDES=-Isrc -Iinclude/rtc -Iinclude -I$(PLOG_DIR)/include -I$(USRSCTP_DIR)/usrsctplib
LDLIBS=
USE_GNUTLS ?= 0
@ -38,15 +39,22 @@ ifneq ($(USE_GNUTLS), 0)
endif
endif
USE_SRTP ?= 0
ifneq ($(USE_SRTP), 0)
NO_MEDIA ?= 0
USE_SYSTEM_SRTP ?= 0
ifeq ($(NO_MEDIA), 0)
CPPFLAGS+=-DRTC_ENABLE_MEDIA=1
ifneq ($(USE_SYSTEM_SRTP), 0)
CPPFLAGS+=-DRTC_SYSTEM_SRTP=1
LIBS+=srtp
else
CPPFLAGS+=-DRTC_SYSTEM_SRTP=0
INCLUDES+=-I$(SRTP_DIR)/include
LOCALLIBS+=libsrtp2.a
endif
else
CPPFLAGS+=-DRTC_ENABLE_MEDIA=0
endif
NO_WEBSOCKET ?= 0
ifeq ($(NO_WEBSOCKET), 0)
CPPFLAGS+=-DRTC_ENABLE_WEBSOCKET=1
@ -54,10 +62,10 @@ else
CPPFLAGS+=-DRTC_ENABLE_WEBSOCKET=0
endif
INCLUDES+=$(shell pkg-config --cflags $(LIBS))
LDLIBS+=$(LOCALLIBS) $(shell pkg-config --libs $(LIBS))
INCLUDES+=$(if $(LIBS),$(shell pkg-config --cflags $(LIBS)),)
LDLIBS+=$(LOCALLIBS) $(if $(LIBS),$(shell pkg-config --libs $(LIBS)),)
SRCS=$(shell printf "%s " src/*.cpp)
SRCS=$(shell printf "%s " src/*.cpp src/impl/*.cpp)
OBJS=$(subst .cpp,.o,$(SRCS))
TEST_SRCS=$(shell printf "%s " test/*.cpp)
@ -73,7 +81,7 @@ test/%.o: test/%.cpp
-include $(subst .cpp,.d,$(SRCS))
$(NAME).a: $(OBJS)
$(NAME).a: $(LOCALLIBS) $(OBJS)
$(AR) crf $@ $(OBJS)
$(NAME).so: $(LOCALLIBS) $(OBJS)
@ -97,15 +105,22 @@ dist-clean: clean
-$(RM) src/*~
-$(RM) test/*~
-cd $(USRSCTP_DIR) && make clean
-cd $(SRTP_DIR) && make clean
-cd $(JUICE_DIR) && make clean
libusrsctp.a:
cd $(USRSCTP_DIR) && \
./bootstrap && \
./configure --enable-static --disable-debug CFLAGS="$(CPPFLAGS) -Wno-error=format-truncation" && \
./configure --enable-static --disable-debug CFLAGS="-fPIC" && \
make
cp $(USRSCTP_DIR)/usrsctplib/.libs/libusrsctp.a .
libsrtp2.a:
cd $(SRTP_DIR) && \
./configure && \
make
cp $(SRTP_DIR)/libsrtp2.a .
libjuice.a:
ifneq ($(USE_GNUTLS), 0)
cd $(JUICE_DIR) && make USE_NETTLE=1

302
README.md
View File

@ -1,34 +1,148 @@
# libdatachannel - C/C++ WebRTC Data Channels
libdatachannel is a standalone implementation of WebRTC Data Channels and WebSockets in C++17 with C bindings for POSIX platforms (including Linux 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.
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.
The library aims at being both straightforward and lightweight with minimal external dependencies, to enable direct connectivity between native applications and web browsers without the pain of importing Google's bloated [reference library](https://webrtc.googlesource.com/src/). The interface consists of somewhat 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).
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 WebRTC stack is fully compatible with Firefox and Chromium, see [Compatibility](#Compatibility) below.
Licensed under LGPLv2, see [LICENSE](https://github.com/paullouisageneau/libdatachannel/blob/master/LICENSE).
## Dependencies
Only [GnuTLS](https://www.gnutls.org/) or [OpenSSL](https://www.openssl.org/) are necessary. Optionally, [libnice](https://nice.freedesktop.org/) can be selected as an alternative ICE backend instead of libjuice.
Submodules:
- libjuice: https://github.com/paullouisageneau/libjuice
- usrsctp: https://github.com/sctplab/usrsctp
- libsrtp: https://github.com/cisco/libsrtp (if compiled with media support)
## Building
See [BUILDING.md](https://github.com/paullouisageneau/libdatachannel/blob/master/BUILDING.md) for building instructions.
## Examples
See [examples](https://github.com/paullouisageneau/libdatachannel/blob/master/examples/) for complete usage examples with signaling server (under GPLv2).
Additionnaly, you might want to have a look at the [C API documentation](https://github.com/paullouisageneau/libdatachannel/blob/master/DOC.md).
### Signal a PeerConnection
```cpp
#include "rtc/rtc.hpp"
```
```cpp
rtc::Configuration config;
config.iceServers.emplace_back("mystunserver.org:3478");
rtc::PeerConection pc(config);
pc.onLocalDescription([](rtc::Description sdp) {
// Send the SDP to the remote peer
MY_SEND_DESCRIPTION_TO_REMOTE(string(sdp));
});
pc.onLocalCandidate([](rtc::Candidate candidate) {
// Send the candidate to the remote peer
MY_SEND_CANDIDATE_TO_REMOTE(candidate.candidate(), candidate.mid());
});
MY_ON_RECV_DESCRIPTION_FROM_REMOTE([&pc](string sdp) {
pc.setRemoteDescription(rtc::Description(sdp));
});
MY_ON_RECV_CANDIDATE_FROM_REMOTE([&pc](string candidate, string mid) {
pc.addRemoteCandidate(rtc::Candidate(candidate, mid));
});
```
### Observe the PeerConnection state
```cpp
pc.onStateChange([](rtc::PeerConnection::State state) {
std::cout << "State: " << state << std::endl;
});
pc.onGatheringStateChange([](rtc::PeerConnection::GatheringState state) {
std::cout << "Gathering state: " << state << std::endl;
});
```
### Create a DataChannel
```cpp
auto dc = pc.createDataChannel("test");
dc->onOpen([]() {
std::cout << "Open" << std::endl;
});
dc->onMessage([](std::variant<binary, string> message) {
if (std::holds_alternative<string>(message)) {
std::cout << "Received: " << get<string>(message) << std::endl;
}
});
```
### Receive a DataChannel
```cpp
std::shared_ptr<rtc::DataChannel> dc;
pc.onDataChannel([&dc](std::shared_ptr<rtc::DataChannel> incoming) {
dc = incoming;
dc->send("Hello world!");
});
```
### Open a WebSocket
```cpp
rtc::WebSocket ws;
ws.onOpen([]() {
std::cout << "WebSocket open" << std::endl;
});
ws.onMessage([](std::variant<binary, string> message) {
if (std::holds_alternative<string>(message)) {
std::cout << "WebSocket received: " << std::get<string>(message) << endl;
}
});
ws.open("wss://my.websocket/service");
```
## Compatibility
The library aims at implementing the following communication protocols:
The library implements the following communication protocols:
### WebRTC Data Channel
### WebRTC Data Channels and Media Transport
The WebRTC stack has been tested to be compatible with Firefox and Chromium.
The library implements WebRTC Peer Connections with both Data Channels and Media Transport. Media transport is optional and can be disabled at compile time.
Protocol stack:
- SCTP-based Data Channels ([draft-ietf-rtcweb-data-channel-13](https://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-13))
- SCTP-based Data Channels ([RFC8831](https://tools.ietf.org/html/rfc8831))
- SRTP-based Media Transport ([RFC8834](https://tools.ietf.org/html/rfc8834))
- 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))
- ICE ([RFC8445](https://tools.ietf.org/html/rfc8445)) with STUN ([RFC8489](https://tools.ietf.org/html/rfc8489)) and its extension TURN ([RFC8656](https://tools.ietf.org/html/rfc8656))
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))
- Full IPv6 support (as mandated by [RFC8835](https://tools.ietf.org/html/rfc8835))
- Trickle ICE ([RFC8838](https://tools.ietf.org/html/rfc8838))
- JSEP-compatible session establishment with SDP ([RFC8829](https://tools.ietf.org/html/rfc8829))
- SCTP over DTLS with SDP offer/answer ([RFC8841](https://tools.ietf.org/html/rfc8841))
- DTLS with ECDSA or RSA keys ([RFC8824](https://tools.ietf.org/html/rfc8827))
- 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
- SRTP media transport ([RFC3711](https://tools.ietf.org/html/rfc3711)) with [libSRTP](https://github.com/cisco/libsrtp)
- Differentiated Services QoS ([draft-ietf-tsvwg-rtcweb-qos-18](https://tools.ietf.org/html/draft-ietf-tsvwg-rtcweb-qos-18))
Note only SDP BUNDLE mode is supported for media multiplexing ([RFC8843](https://tools.ietf.org/html/rfc8843)). 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 ([RFC8261](https://tools.ietf.org/html/rfc8261)).
### WebSocket
@ -42,161 +156,13 @@ Features:
- IPv6 and IPv4/IPv6 dual-stack support
- Keepalive with ping/pong
## 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 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)
## Building
### Clone repository and submodules
```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
$ cd build
$ make -j2
```
#### 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.
```bash
$ make USE_GNUTLS=1 USE_NICE=0
```
## Examples
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/dev/include/rtc/rtc.h).
### Signal a PeerConnection
```cpp
#include "rtc/rtc.hpp"
```
```cpp
rtc::Configuration config;
config.iceServers.emplace_back("mystunserver.org:3478");
auto pc = make_shared<rtc::PeerConnection>(config);
pc->onLocalDescription([](const rtc::Description &sdp) {
// Send the SDP to the remote peer
MY_SEND_DESCRIPTION_TO_REMOTE(string(sdp));
});
pc->onLocalCandidate([](const rtc::Candidate &candidate) {
// Send the candidate to the remote peer
MY_SEND_CANDIDATE_TO_REMOTE(candidate.candidate(), candidate.mid());
});
MY_ON_RECV_DESCRIPTION_FROM_REMOTE([pc](string sdp) {
pc->setRemoteDescription(rtc::Description(sdp));
});
MY_ON_RECV_CANDIDATE_FROM_REMOTE([pc](string candidate, string mid) {
pc->addRemoteCandidate(rtc::Candidate(candidate, mid));
});
```
### Observe the PeerConnection state
```cpp
pc->onStateChange([](PeerConnection::State state) {
cout << "State: " << state << endl;
});
pc->onGatheringStateChange([](PeerConnection::GatheringState state) {
cout << "Gathering state: " << state << endl;
});
```
### Create a DataChannel
```cpp
auto dc = pc->createDataChannel("test");
dc->onOpen([]() {
cout << "Open" << endl;
});
dc->onMessage([](const variant<binary, string> &message) {
if (holds_alternative<string>(message)) {
cout << "Received: " << get<string>(message) << endl;
}
});
```
### Receive a DataChannel
```cpp
shared_ptr<rtc::DataChannel> dc;
pc->onDataChannel([&dc](shared_ptr<rtc::DataChannel> incoming) {
dc = incoming;
dc->send("Hello world!");
});
```
### Open a WebSocket
```cpp
auto ws = make_shared<rtc::WebSocket>();
ws->onOpen([]() {
cout << "WebSocket open" << endl;
});
ws->onMessage([](const 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 wrappers for libdatachannel: [datachannel-rs](https://github.com/lerouxrgd/datachannel-rs)
- WebAssembly wrappers compatible with libdatachannel: [datachannel-wasm](https://github.com/paullouisageneau/datachannel-wasm)
- 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)
- Unity wrapper for Windows 10 and Hololens: [datachannel-unity](https://github.com/hanseuljun/datachannel-unity)
- WebAssembly wrapper compatible with libdatachannel: [datachannel-wasm](https://github.com/paullouisageneau/datachannel-wasm)
## Thanks
Thanks to [Streamr](https://streamr.network/) for sponsoring this work!

2
deps/libjuice vendored

1
deps/libsrtp vendored Submodule

Submodule deps/libsrtp added at f379f48412

2
deps/plog vendored

Submodule deps/plog updated: afb6f6f0e8...d8461e9d47

2
deps/usrsctp vendored

View File

@ -1,12 +1,17 @@
# Examples for libdatachannel
# libdatachannel - Examples
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
- [client](client) contains a native client to open Data Channels with WebSocket signaling using libdatachannel
- [client-benchmark](client-benchmark) contains a native client to open Data Channels with WebSocket signaling using libdatachannel and benchmark functionalities. See [client-benchmark/README.md](client-benchmark/README.md) for usage examples.
- [web](web) contains a equivalent JavaScript client for web browsers
- [signaling-server-nodejs](signaling-server-nodejs) contains a signaling server in node.js
- [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.
- [streamer](streamer) streams h264 and opus samples to web browsers (signaling-server-python is required).
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

View File

@ -0,0 +1,24 @@
cmake_minimum_required(VERSION 3.7)
if(POLICY CMP0079)
cmake_policy(SET CMP0079 NEW)
endif()
if(WIN32)
add_executable(datachannel-client-benchmark main.cpp parse_cl.cpp parse_cl.h getopt.cpp getopt.h)
target_compile_definitions(datachannel-client-benchmark PUBLIC STATIC_GETOPT)
else()
add_executable(datachannel-client-benchmark main.cpp parse_cl.cpp parse_cl.h)
endif()
set_target_properties(datachannel-client-benchmark PROPERTIES
CXX_STANDARD 17
OUTPUT_NAME client-benchmark)
target_link_libraries(datachannel-client-benchmark datachannel nlohmann_json)
if(WIN32)
add_custom_command(TARGET datachannel-client-benchmark POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"$<TARGET_FILE_DIR:datachannel>/datachannel.dll"
$<TARGET_FILE_DIR:datachannel-client-benchmark>
)
endif()

View File

@ -0,0 +1,339 @@
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.

View File

@ -0,0 +1,219 @@
# libdatachannel - client-benchmark
This directory contains a native client to open Data Channels with WebSocket signaling using libdatachannel and benchmark functionalities. It offers two functionalities;
- Benchmark: Bi-directional data transfer benchmark (Also supports One-Way testing)
- Constant Throughput Set: Send desired amount of data per second
## Start Signaling Server
- Start one of the signaling server from the examples folder. For example start `signaling-server-nodejs` like;
- `cd examples/signaling-server-nodejs/`
- `npm i`
- `npm run start `
## Start `client-benchmark` Applications
Start 2 applications by using example calls below. Than copy one of the client's ID and paste to the other peer's screen to start offering process.
## Usage Examples
### Benchmark for 300 seconds
> `./client-benchmark -d 300`
Example Output (Offering Peer's Output);
```bash
Stun server is stun:stun.l.google.com:19302
The local ID is: EQmF
Url is ws://localhost:8000/EQmF
Waiting for signaling to be connected...
2021-03-25 14:21:58.045 INFO [21386] [rtc::impl::TcpTransport::connect@159] Connected to localhost:8000
2021-03-25 14:21:58.045 INFO [21386] [rtc::impl::TcpTransport::runLoop@327] TCP connected
2021-03-25 14:21:58.046 INFO [21386] [rtc::impl::WsTransport::incoming@118] WebSocket open
WebSocket connected, signaling ready
Enter a remote ID to send an offer:
0tDf
Offering to 0tDf
Creating DataChannel with label "benchmark"
2021-03-25 14:22:07.972 INFO [21379] [rtc::impl::IceTransport::IceTransport@106] Using STUN server "stun.l.google.com:19302"
2021-03-25 14:22:07.973 INFO [21379] [rtc::impl::PeerConnection::changeSignalingState@992] Changed signaling state to new
2021-03-25 14:22:07.973 INFO [21379] [rtc::impl::PeerConnection::changeGatheringState@981] Changed gathering state to in-progress
Gathering State: in-progress
2021-03-25 14:22:07.974 INFO [21379] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:787: Changing state to gathering
2021-03-25 14:22:07.974 WARN [21379] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:239: Local description already has the maximum number of host candidates
Benchmark will run for 300 seconds
2021-03-25 14:22:07.976 INFO [21396] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:787: Changing state to connecting
2021-03-25 14:22:07.976 INFO [21396] [rtc::impl::PeerConnection::changeState@964] Changed state to connecting
State: connecting
2021-03-25 14:22:08.055 INFO [21396] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:610: Using STUN server stun.l.google.com:19302
2021-03-25 14:22:08.055 INFO [21386] [rtc::impl::PeerConnection::changeSignalingState@992] Changed signaling state to connecting
2021-03-25 14:22:08.105 WARN [21396] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:426: Send failed, errno=101
2021-03-25 14:22:08.105 WARN [21396] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:1483: STUN message send failed, errno=101
2021-03-25 14:22:08.105 INFO [21396] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:843: STUN binding failed
2021-03-25 14:22:08.107 INFO [21396] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:1302: STUN server binding successful
2021-03-25 14:22:08.107 INFO [21396] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:2148: Candidate gathering done
2021-03-25 14:22:08.107 INFO [21396] [rtc::impl::PeerConnection::changeGatheringState@981] Changed gathering state to complete
Gathering State: complete
2021-03-25 14:22:08.155 INFO [21396] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:787: Changing state to connected
2021-03-25 14:22:08.206 INFO [21396] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:787: Changing state to completed
#1 Received: 0 KB/s Sent: 0 KB/s BufferSize: 0
2021-03-25 14:22:09.059 INFO [21399] [rtc::impl::DtlsTransport::runRecvLoop@503] DTLS handshake finished
2021-03-25 14:22:09.069 INFO [21382] [rtc::impl::SctpTransport::processNotification@708] SCTP connected
2021-03-25 14:22:09.069 INFO [21382] [rtc::impl::PeerConnection::changeState@964] Changed state to connected
State: connected
DataChannel from 0tDf open
#2 Received: 41488 KB/s Sent: 42465 KB/s BufferSize: 65535
#3 Received: 43925 KB/s Sent: 43729 KB/s BufferSize: 65535
#4 Received: 42491 KB/s Sent: 42361 KB/s BufferSize: 65535
#5 Received: 45878 KB/s Sent: 45682 KB/s BufferSize: 65535
Stats# Received Total: 174 MB Sent Total: 175 MB RTT: 17 ms
#6 Received: 43665 KB/s Sent: 43599 KB/s BufferSize: 65535
#7 Received: 45749 KB/s Sent: 45488 KB/s BufferSize: 65535
#8 Received: 44055 KB/s Sent: 44055 KB/s BufferSize: 65535
#9 Received: 21572 KB/s Sent: 58199 KB/s BufferSize: 65535
#10 Received: 22940 KB/s Sent: 55005 KB/s BufferSize: 65535
Stats# Received Total: 353 MB Sent Total: 422 MB RTT: 15 ms
#11 Received: 27501 KB/s Sent: 53112 KB/s BufferSize: 65535
#12 Received: 29914 KB/s Sent: 48162 KB/s BufferSize: 65535
#13 Received: 31869 KB/s Sent: 45946 KB/s BufferSize: 65535
#14 Received: 22484 KB/s Sent: 53636 KB/s BufferSize: 65535
#15 Received: 16294 KB/s Sent: 56833 KB/s BufferSize: 65535
Stats# Received Total: 482 MB Sent Total: 682 MB RTT: 13 ms
```
### Benchmark for 300 seconds (Only Send, One Way)
Start first peer as;
> `./client-benchmark -d 300 -o`
Start second peer as;
> `./client-benchmark -d 300`
Example Output (Offering Peer's Output);
```bash
Stun server is stun:stun.l.google.com:19302
The local ID is: XLLn
Url is ws://localhost:8000/XLLn
Waiting for signaling to be connected...
2021-03-25 14:34:24.479 INFO [22332] [rtc::impl::TcpTransport::connect@159] Connected to localhost:8000
2021-03-25 14:34:24.479 INFO [22332] [rtc::impl::TcpTransport::runLoop@327] TCP connected
2021-03-25 14:34:24.479 INFO [22332] [rtc::impl::WsTransport::incoming@118] WebSocket open
WebSocket connected, signaling ready
Enter a remote ID to send an offer:
Okt4
Offering to Okt4
Creating DataChannel with label "benchmark"
2021-03-25 14:34:37.948 INFO [22325] [rtc::impl::IceTransport::IceTransport@106] Using STUN server "stun.l.google.com:19302"
2021-03-25 14:34:37.949 INFO [22325] [rtc::impl::PeerConnection::changeSignalingState@992] Changed signaling state to new
2021-03-25 14:34:37.949 INFO [22325] [rtc::impl::PeerConnection::changeGatheringState@981] Changed gathering state to in-progress
Gathering State: in-progress
2021-03-25 14:34:37.950 INFO [22325] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:787: Changing state to gathering
2021-03-25 14:34:37.951 WARN [22325] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:239: Local description already has the maximum number of host candidates
Benchmark will run for 300 seconds
2021-03-25 14:34:37.952 INFO [22334] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:787: Changing state to connecting
2021-03-25 14:34:37.952 INFO [22334] [rtc::impl::PeerConnection::changeState@964] Changed state to connecting
State: connecting
2021-03-25 14:34:37.969 INFO [22334] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:610: Using STUN server stun.l.google.com:19302
2021-03-25 14:34:37.969 INFO [22332] [rtc::impl::PeerConnection::changeSignalingState@992] Changed signaling state to connecting
2021-03-25 14:34:37.970 INFO [22334] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:787: Changing state to connected
2021-03-25 14:34:37.971 INFO [22337] [rtc::impl::DtlsTransport::runRecvLoop@503] DTLS handshake finished
2021-03-25 14:34:37.977 INFO [22327] [rtc::impl::SctpTransport::processNotification@708] SCTP connected
2021-03-25 14:34:37.977 INFO [22327] [rtc::impl::PeerConnection::changeState@964] Changed state to connected
State: connected
DataChannel from Okt4 open
2021-03-25 14:34:38.019 WARN [22334] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:426: Send failed, errno=101
2021-03-25 14:34:38.019 WARN [22334] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:1483: STUN message send failed, errno=101
2021-03-25 14:34:38.019 INFO [22334] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:843: STUN binding failed
2021-03-25 14:34:38.022 INFO [22334] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:1302: STUN server binding successful
2021-03-25 14:34:38.022 INFO [22334] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:2148: Candidate gathering done
2021-03-25 14:34:38.022 INFO [22334] [rtc::impl::PeerConnection::changeGatheringState@981] Changed gathering state to complete
Gathering State: complete
2021-03-25 14:34:38.069 INFO [22334] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:787: Changing state to completed
#1 Received: 0 KB/s Sent: 92223 KB/s BufferSize: 65535
#2 Received: 0 KB/s Sent: 89291 KB/s BufferSize: 65535
#3 Received: 0 KB/s Sent: 95087 KB/s BufferSize: 65535
#4 Received: 0 KB/s Sent: 101050 KB/s BufferSize: 65535
#5 Received: 0 KB/s Sent: 99778 KB/s BufferSize: 0
Stats# Received Total: 0 MB Sent Total: 480 MB RTT: 8 ms
#6 Received: 0 KB/s Sent: 100366 KB/s BufferSize: 65535
#7 Received: 0 KB/s Sent: 101201 KB/s BufferSize: 65535
#8 Received: 0 KB/s Sent: 100892 KB/s BufferSize: 65535
#9 Received: 0 KB/s Sent: 101288 KB/s BufferSize: 65535
#10 Received: 0 KB/s Sent: 95676 KB/s BufferSize: 65535
Stats# Received Total: 0 MB Sent Total: 982 MB RTT: 8 ms
#11 Received: 0 KB/s Sent: 96254 KB/s BufferSize: 65535
#12 Received: 0 KB/s Sent: 105473 KB/s BufferSize: 65535
#13 Received: 0 KB/s Sent: 95549 KB/s BufferSize: 65535
#14 Received: 0 KB/s Sent: 100366 KB/s BufferSize: 65535
#15 Received: 0 KB/s Sent: 101336 KB/s BufferSize: 65535
Stats# Received Total: 0 MB Sent Total: 1484 MB RTT: 8 ms
```
### Constant Throughput Set 8000 byte, for 300 seconds, send buffer 10000 byte
> `./client-benchmark -p -d 300 -r 8000 -b 10000`
Example Output (Offering Peer's Output);
```bash
Stun server is stun:stun.l.google.com:19302
The local ID is: 1w9O
Url is ws://localhost:8000/1w9O
Waiting for signaling to be connected...
2021-03-25 14:29:38.697 INFO [21844] [rtc::impl::TcpTransport::connect@159] Connected to localhost:8000
2021-03-25 14:29:38.697 INFO [21844] [rtc::impl::TcpTransport::runLoop@327] TCP connected
2021-03-25 14:29:38.698 INFO [21844] [rtc::impl::WsTransport::incoming@118] WebSocket open
WebSocket connected, signaling ready
Enter a remote ID to send an offer:
zi4B
Offering to zi4B
Creating DataChannel with label "benchmark"
2021-03-25 14:29:48.729 INFO [21837] [rtc::impl::IceTransport::IceTransport@106] Using STUN server "stun.l.google.com:19302"
2021-03-25 14:29:48.729 INFO [21837] [rtc::impl::PeerConnection::changeSignalingState@992] Changed signaling state to new
2021-03-25 14:29:48.729 INFO [21837] [rtc::impl::PeerConnection::changeGatheringState@981] Changed gathering state to in-progress
Gathering State: in-progress
2021-03-25 14:29:48.729 INFO [21837] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:787: Changing state to gathering
2021-03-25 14:29:48.730 WARN [21837] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:239: Local description already has the maximum number of host candidates
Benchmark will run for 300 seconds
2021-03-25 14:29:48.730 INFO [21866] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:787: Changing state to connecting
2021-03-25 14:29:48.731 INFO [21866] [rtc::impl::PeerConnection::changeState@964] Changed state to connecting
State: connecting
2021-03-25 14:29:48.732 INFO [21866] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:610: Using STUN server stun.l.google.com:19302
2021-03-25 14:29:48.732 INFO [21844] [rtc::impl::PeerConnection::changeSignalingState@992] Changed signaling state to connecting
2021-03-25 14:29:48.782 WARN [21866] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:426: Send failed, errno=101
2021-03-25 14:29:48.782 WARN [21866] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:1483: STUN message send failed, errno=101
2021-03-25 14:29:48.782 INFO [21866] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:843: STUN binding failed
2021-03-25 14:29:48.787 INFO [21866] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:1302: STUN server binding successful
2021-03-25 14:29:48.787 INFO [21866] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:2148: Candidate gathering done
2021-03-25 14:29:48.787 INFO [21866] [rtc::impl::PeerConnection::changeGatheringState@981] Changed gathering state to complete
Gathering State: complete
2021-03-25 14:29:48.832 INFO [21866] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:787: Changing state to connected
2021-03-25 14:29:48.882 INFO [21866] [rtc::impl::IceTransport::LogCallback@339] juice: agent.c:787: Changing state to completed
2021-03-25 14:29:49.735 INFO [21869] [rtc::impl::DtlsTransport::runRecvLoop@503] DTLS handshake finished
2021-03-25 14:29:49.742 INFO [21841] [rtc::impl::SctpTransport::processNotification@708] SCTP connected
2021-03-25 14:29:49.742 INFO [21841] [rtc::impl::PeerConnection::changeState@964] Changed state to connected
State: connected
DataChannel from zi4B open
#1 Received: 0 KB/s Sent: 78 KB/s BufferSize: 0
#2 Received: 8002 KB/s Sent: 7999 KB/s BufferSize: 0
#3 Received: 8002 KB/s Sent: 7998 KB/s BufferSize: 0
#4 Received: 7995 KB/s Sent: 8000 KB/s BufferSize: 0
#5 Received: 8000 KB/s Sent: 8001 KB/s BufferSize: 0
Stats# Received Total: 33 MB Sent Total: 33 MB RTT: 0 ms
#6 Received: 8001 KB/s Sent: 7999 KB/s BufferSize: 0
#7 Received: 7997 KB/s Sent: 7998 KB/s BufferSize: 0
#8 Received: 8001 KB/s Sent: 7999 KB/s BufferSize: 0
#9 Received: 7998 KB/s Sent: 8001 KB/s BufferSize: 0
#10 Received: 8003 KB/s Sent: 7998 KB/s BufferSize: 0
Stats# Received Total: 74 MB Sent Total: 74 MB RTT: 0 ms
#11 Received: 7990 KB/s Sent: 7998 KB/s BufferSize: 0
#12 Received: 7999 KB/s Sent: 8000 KB/s BufferSize: 0
#13 Received: 8001 KB/s Sent: 8002 KB/s BufferSize: 0
#14 Received: 7998 KB/s Sent: 7999 KB/s BufferSize: 0
#15 Received: 8000 KB/s Sent: 7998 KB/s BufferSize: 0
Stats# Received Total: 115 MB Sent Total: 115 MB RTT: 0 ms
```

View File

@ -0,0 +1,513 @@
/* 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
24/10/2020 - Paul-Louis Ageneau - Removed Unicode version
**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 _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS
#endif
#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 };
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);
}

View File

@ -0,0 +1,115 @@
/* 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
24/10/2020 - Paul-Louis Ageneau - Removed Unicode version
**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>
_BEGIN_EXTERN_C
extern _GETOPT_API int optind;
extern _GETOPT_API int opterr;
extern _GETOPT_API int optopt;
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;
_END_EXTERN_C
#undef _BEGIN_EXTERN_C
#undef _END_EXTERN_C
#undef _GETOPT_THROW
#undef _GETOPT_API
#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 // __GETOPT_H_

View File

@ -0,0 +1,457 @@
/*
* libdatachannel client-benchmark example
* Copyright (c) 2019-2020 Paul-Louis Ageneau
* Copyright (c) 2019-2021 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 "parse_cl.h"
#include <nlohmann/json.hpp>
#include <algorithm>
#include <atomic>
#include <chrono>
#include <future>
#include <iostream>
#include <memory>
#include <random>
#include <stdexcept>
#include <thread>
#include <unordered_map>
using namespace rtc;
using namespace std;
using namespace std::chrono_literals;
using chrono::milliseconds;
using chrono::steady_clock;
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;
shared_ptr<PeerConnection> createPeerConnection(const Configuration &config,
weak_ptr<WebSocket> wws, string id);
string randomId(size_t length);
// Benchmark
const size_t messageSize = 65535;
binary messageData(messageSize);
atomic<size_t> receivedSize = 0, sentSize = 0;
bool noSend = false;
// Benchmark - enableThroughputSet params
bool enableThroughputSet;
int throughtputSetAsKB;
int bufferSize;
const float STEP_COUNT_FOR_1_SEC = 100.0;
const int stepDurationInMs = 1000 / STEP_COUNT_FOR_1_SEC;
int main(int argc, char **argv) try {
Cmdline params(argc, argv);
rtc::InitLogger(LogLevel::Info);
// Benchmark - construct message to send
fill(messageData.begin(), messageData.end(), std::byte(0xFF));
// Benchmark - enableThroughputSet params
enableThroughputSet = params.enableThroughputSet();
throughtputSetAsKB = params.throughtputSetAsKB();
bufferSize = params.bufferSize();
// No Send option
noSend = params.noSend();
if (noSend)
cout << "Not Sending data. (One way benchmark)." << endl;
Configuration config;
string stunServer = "";
if (params.noStun()) {
cout << "No STUN server is configured. Only local hosts and public IP addresses supported."
<< endl;
} else {
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;
auto ws = make_shared<WebSocket>();
std::promise<void> wsPromise;
auto wsFuture = wsPromise.get_future();
ws->onOpen([&wsPromise]() {
cout << "WebSocket connected, signaling ready" << endl;
wsPromise.set_value();
});
ws->onError([&wsPromise](string s) {
cout << "WebSocket error" << endl;
wsPromise.set_exception(std::make_exception_ptr(std::runtime_error(s)));
});
ws->onClosed([]() { cout << "WebSocket closed" << 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;
wsFuture.get();
string id;
cout << "Enter a remote ID to send an offer:" << endl;
cin >> id;
cin.ignore();
if (id.empty()) {
// Nothing to do
return 0;
}
if (id == localId) {
cout << "Invalid remote ID (This is my local ID). Exiting..." << endl;
return 0;
}
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 = "benchmark";
cout << "Creating DataChannel with label \"" << label << "\"" << endl;
auto dc = pc->createDataChannel(label);
// Set Buffer Size
dc->setBufferedAmountLowThreshold(bufferSize);
dc->onOpen([id, wdc = make_weak_ptr(dc)]() {
cout << "DataChannel from " << id << " open" << endl;
if (noSend)
return;
if (enableThroughputSet)
return;
if (auto dcLocked = wdc.lock()) {
try {
while (dcLocked->bufferedAmount() <= bufferSize) {
dcLocked->send(messageData);
sentSize += messageData.size();
}
} catch (const std::exception &e) {
std::cout << "Send failed: " << e.what() << std::endl;
}
}
});
dc->onBufferedAmountLow([wdc = make_weak_ptr(dc)]() {
if (noSend)
return;
if (enableThroughputSet)
return;
auto dcLocked = wdc.lock();
if (!dcLocked)
return;
// Continue sending
try {
while (dcLocked->isOpen() && dcLocked->bufferedAmount() <= bufferSize) {
dcLocked->send(messageData);
sentSize += messageData.size();
}
} catch (const std::exception &e) {
std::cout << "Send failed: " << e.what() << std::endl;
}
});
dc->onClosed([id]() { cout << "DataChannel from " << id << " closed" << endl; });
dc->onMessage([id, wdc = make_weak_ptr(dc)](variant<binary, string> data) {
if (holds_alternative<binary>(data))
receivedSize += get<binary>(data).size();
});
dataChannelMap.emplace(id, dc);
const int duration = params.durationInSec() > 0 ? params.durationInSec() : INT32_MAX;
cout << "Benchmark will run for " << duration << " seconds" << endl;
int printCounter = 0;
int printStatCounter = 0;
steady_clock::time_point printTime = steady_clock::now();
steady_clock::time_point stepTime = steady_clock::now();
// Byte count to send for every loop
int byteToSendOnEveryLoop = throughtputSetAsKB * stepDurationInMs;
for (int i = 1; i <= duration * STEP_COUNT_FOR_1_SEC; ++i) {
this_thread::sleep_for(milliseconds(stepDurationInMs));
printCounter++;
if (enableThroughputSet) {
const double elapsedTimeInSecs =
std::chrono::duration<double>(steady_clock::now() - stepTime).count();
stepTime = steady_clock::now();
int byteToSendThisLoop = static_cast<int>(
byteToSendOnEveryLoop * ((elapsedTimeInSecs * 1000.0) / stepDurationInMs));
binary tempMessageData(byteToSendThisLoop);
fill(tempMessageData.begin(), tempMessageData.end(), std::byte(0xFF));
if (dc->isOpen() && dc->bufferedAmount() <= bufferSize * byteToSendOnEveryLoop) {
dc->send(tempMessageData);
sentSize += tempMessageData.size();
}
}
if (printCounter >= STEP_COUNT_FOR_1_SEC) {
unsigned long _receivedSize = receivedSize.exchange(0);
unsigned long _sentSize = sentSize.exchange(0);
const double elapsedTimeInSecs =
std::chrono::duration<double>(steady_clock::now() - printTime).count();
printTime = steady_clock::now();
cout << "#" << i / STEP_COUNT_FOR_1_SEC
<< " Received: " << static_cast<int>(_receivedSize / (elapsedTimeInSecs * 1000))
<< " KB/s"
<< " Sent: " << static_cast<int>(_sentSize / (elapsedTimeInSecs * 1000))
<< " KB/s"
<< " BufferSize: " << dc->bufferedAmount() << endl;
printStatCounter++;
printCounter = 0;
}
if (printStatCounter >= 5) {
cout << "Stats# "
<< "Received Total: " << pc->bytesReceived() / (1000 * 1000) << " MB"
<< " Sent Total: " << pc->bytesSent() / (1000 * 1000) << " MB"
<< " RTT: " << pc->rtt().value_or(0ms).count() << " ms" << endl;
cout << endl;
printStatCounter = 0;
}
}
cout << "Cleaning up..." << endl;
dataChannelMap.clear();
peerConnectionMap.clear();
return 0;
} catch (const std::exception &e) {
std::cout << "Error: " << e.what() << std::endl;
dataChannelMap.clear();
peerConnectionMap.clear();
return -1;
}
// 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;
cout << "###########################################" << endl;
cout << "### Check other peer's screen for stats ###" << endl;
cout << "###########################################" << endl;
// Set Buffer Size
dc->setBufferedAmountLowThreshold(bufferSize);
if (!noSend && !enableThroughputSet) {
try {
while (dc->bufferedAmount() <= bufferSize) {
dc->send(messageData);
sentSize += messageData.size();
}
} catch (const std::exception &e) {
std::cout << "Send failed: " << e.what() << std::endl;
}
}
if (!noSend && enableThroughputSet) {
// Create Send Data Thread
// Thread will join when data channel destroyed or closed
std::thread([wdc = make_weak_ptr(dc)]() {
steady_clock::time_point stepTime = steady_clock::now();
// Byte count to send for every loop
int byteToSendOnEveryLoop = throughtputSetAsKB * stepDurationInMs;
while (true) {
this_thread::sleep_for(milliseconds(stepDurationInMs));
auto dcLocked = wdc.lock();
if (!dcLocked)
break;
if (!dcLocked->isOpen())
break;
try {
const double elapsedTimeInSecs =
std::chrono::duration<double>(steady_clock::now() - stepTime).count();
stepTime = steady_clock::now();
int byteToSendThisLoop =
static_cast<int>(byteToSendOnEveryLoop *
((elapsedTimeInSecs * 1000.0) / stepDurationInMs));
binary tempMessageData(byteToSendThisLoop);
fill(tempMessageData.begin(), tempMessageData.end(), std::byte(0xFF));
if (dcLocked->bufferedAmount() <= bufferSize) {
dcLocked->send(tempMessageData);
sentSize += tempMessageData.size();
}
} catch (const std::exception &e) {
std::cout << "Send failed: " << e.what() << std::endl;
}
}
cout << "Send Data Thread exiting..." << endl;
}).detach();
}
dc->onBufferedAmountLow([wdc = make_weak_ptr(dc)]() {
if (noSend)
return;
if (enableThroughputSet)
return;
auto dcLocked = wdc.lock();
if (!dcLocked)
return;
// Continue sending
try {
while (dcLocked->isOpen() && dcLocked->bufferedAmount() <= bufferSize) {
dcLocked->send(messageData);
sentSize += messageData.size();
}
} catch (const std::exception &e) {
std::cout << "Send failed: " << e.what() << std::endl;
}
});
dc->onClosed([id]() { cout << "DataChannel from " << id << " closed" << endl; });
dc->onMessage([id, wdc = make_weak_ptr(dc)](variant<binary, string> data) {
if (holds_alternative<binary>(data))
receivedSize += get<binary>(data).size();
});
dataChannelMap.emplace(id, dc);
});
peerConnectionMap.emplace(id, pc);
return pc;
};
// 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;
}

View File

@ -0,0 +1,203 @@
/******************************************************************************
**
** 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[] = {{"noStun", no_argument, NULL, 'n'},
{"stunServer", required_argument, NULL, 's'},
{"stunPort", required_argument, NULL, 't'},
{"webSocketServer", required_argument, NULL, 'w'},
{"webSocketPort", required_argument, NULL, 'x'},
{"durationInSec", required_argument, NULL, 'd'},
{"noSend", no_argument, NULL, 'o'},
{"enableThroughputSet", no_argument, NULL, 'p'},
{"throughtputSetAsKB", required_argument, NULL, 'r'},
{"bufferSize", required_argument, NULL, 'b'},
{"help", no_argument, NULL, 'h'},
{NULL, 0, NULL, 0}};
_program_name += argv[0];
/* default values */
_n = false;
_s = "stun.l.google.com";
_t = 19302;
_w = "localhost";
_x = 8000;
_h = false;
_d = 300;
_o = false;
_p = false;
_r = 300;
_b = 0;
optind = 0;
while ((c = getopt_long(argc, argv, "s:t:w:x:d:r:b:enhvop", long_options, &optind)) != -1) {
switch (c) {
case 'n':
_n = true;
break;
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 'd':
_d = atoi(optarg);
if (_d < 0) {
std::string err;
err += "parameter range error: d must be >= 0";
throw(std::range_error(err));
}
break;
case 'o':
_o = true;
break;
case 'b':
_b = atoi(optarg);
if (_b < 0) {
std::string err;
err += "parameter range error: b must be >= 0";
throw(std::range_error(err));
}
break;
case 'p':
_p = true;
break;
case 'r':
_r = atoi(optarg);
if (_r <= 0) {
std::string err;
err += "parameter range error: r must be > 0";
throw(std::range_error(err));
}
break;
case 'h':
_h = true;
this->usage(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
<< " [ -enstwxdobprhv ] \n\
libdatachannel client implementing WebRTC Data Channels with WebSocket signaling\n\
[ -n ] [ --noStun ] (type=FLAG)\n\
Do NOT use a stun server (overrides -s and -t).\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\
[ -d ] [ --durationInSec ] (type=INTEGER, range>=0...INT32_MAX, 0:infinite(INT32_MAX), Valid only for offering client, default=300)\n\
Benchmark duration in seconds.\n\
[ -o ] [ --noSend ] (type=FLAG)\n\
Do NOT send message (Only Receive, for one-way testing purposes).\n\
[ -b ] [ --bufferSize ] (type=INTEGER, range>0...INT_MAX, default=0)\n\
Set internal buffer size .\n\
[ -p ] [ --enableThroughputSet ] (type=FLAG)\n\
Send a constant data per second (KB). See throughtputSetAsKB params.\n\
[ -r ] [ --throughtputSetAsKB ] (type=INTEGER, range>0...INT_MAX, default=300)\n\
Send constant data per second (KB).\n\
[ -h ] [ --help ] (type=FLAG)\n\
Display this help and exit.\n";
}
exit(status);
}

View File

@ -0,0 +1,77 @@
/******************************************************************************
**
** 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 */
bool _n;
std::string _s;
int _t;
std::string _w;
int _x;
bool _h;
int _d;
bool _o;
bool _p;
int _r;
int _b;
/* 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);
/* return next (non-option) parameter */
int next_param () { return _optind; }
bool noStun () const { return _n; }
std::string stunServer () const { return _s; }
int stunPort () const { return _t; }
std::string webSocketServer () const { return _w; }
int webSocketPort () const { return _x; }
bool h () const { return _h; }
int durationInSec () const { return _d; }
bool noSend () const { return _o; }
int bufferSize() const { return _b;}
bool enableThroughputSet () const { return _p; }
int throughtputSetAsKB() const { return _r;}
};
#endif

View File

@ -3,15 +3,36 @@ if(POLICY CMP0079)
cmake_policy(SET CMP0079 NEW)
endif()
add_executable(datachannel-client main.cpp)
set(CLIENT_UWP_RESOURCES
uwp/Logo.png
uwp/package.appxManifest
uwp/SmallLogo.png
uwp/SmallLogo44x44.png
uwp/SplashScreen.png
uwp/StoreLogo.png
uwp/Windows_TemporaryKey.pfx
)
if(WIN32)
if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
add_executable(datachannel-client main.cpp parse_cl.cpp parse_cl.h getopt.cpp getopt.h ${CLIENT_UWP_RESOURCES})
else()
add_executable(datachannel-client main.cpp parse_cl.cpp parse_cl.h getopt.cpp getopt.h)
endif()
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)
if(WIN32)
add_custom_command(TARGET datachannel-client POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"$<TARGET_FILE_DIR:datachannel>/datachannel.dll"
$<TARGET_FILE_DIR:datachannel-client>
)
endif()

513
examples/client/getopt.cpp Normal file
View File

@ -0,0 +1,513 @@
/* 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
24/10/2020 - Paul-Louis Ageneau - Removed Unicode version
**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 _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS
#endif
#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 };
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);
}

115
examples/client/getopt.h Normal file
View File

@ -0,0 +1,115 @@
/* 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
24/10/2020 - Paul-Louis Ageneau - Removed Unicode version
**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>
_BEGIN_EXTERN_C
extern _GETOPT_API int optind;
extern _GETOPT_API int opterr;
extern _GETOPT_API int optopt;
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;
_END_EXTERN_C
#undef _BEGIN_EXTERN_C
#undef _END_EXTERN_C
#undef _GETOPT_THROW
#undef _GETOPT_API
#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 // __GETOPT_H_

View File

@ -5,6 +5,7 @@
* 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
@ -22,12 +23,16 @@
#include "rtc/rtc.hpp"
#include "parse_cl.h"
#include <nlohmann/json.hpp>
#include <algorithm>
#include <future>
#include <iostream>
#include <memory>
#include <random>
#include <stdexcept>
#include <thread>
#include <unordered_map>
@ -48,24 +53,46 @@ shared_ptr<PeerConnection> createPeerConnection(const Configuration &config,
weak_ptr<WebSocket> wws, string id);
string randomId(size_t length);
int main(int argc, char **argv) {
rtc::InitLogger(LogLevel::Debug);
int main(int argc, char **argv) try {
Cmdline params(argc, argv);
rtc::InitLogger(LogLevel::Info);
Configuration config;
config.iceServers.emplace_back("stun:stun.l.google.com:19302"); // change to your STUN server
string stunServer = "";
if (params.noStun()) {
cout << "No STUN server is configured. Only local hosts and public IP addresses supported."
<< endl;
} else {
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;
auto ws = make_shared<WebSocket>();
ws->onOpen([]() { cout << "WebSocket connected, signaling ready" << endl; });
std::promise<void> wsPromise;
auto wsFuture = wsPromise.get_future();
ws->onOpen([&wsPromise]() {
cout << "WebSocket connected, signaling ready" << endl;
wsPromise.set_value();
});
ws->onError([&wsPromise](string s) {
cout << "WebSocket error" << endl;
wsPromise.set_exception(std::make_exception_ptr(std::runtime_error(s)));
});
ws->onClosed([]() { cout << "WebSocket closed" << endl; });
ws->onError([](const string &error) { cout << "WebSocket failed: " << error << endl; });
ws->onMessage([&](const variant<binary, string> &data) {
ws->onMessage([&](variant<binary, string> data) {
if (!holds_alternative<string>(data))
return;
@ -101,15 +128,17 @@ int main(int argc, char **argv) {
}
});
const string url = "ws://localhost:8000/" + localId;
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);
}
wsFuture.get();
while (true) {
string id;
@ -137,16 +166,15 @@ int main(int argc, char **argv) {
dc->onClosed([id]() { cout << "DataChannel from " << id << " closed" << endl; });
dc->onMessage([id](const variant<binary, string> &message) {
if (!holds_alternative<string>(message))
return;
cout << "Message from " << id << " received: " << get<string>(message) << endl;
dc->onMessage([id, wdc = make_weak_ptr(dc)](variant<binary, string> data) {
if (holds_alternative<string>(data))
cout << "Message from " << id << " received: " << get<string>(data) << endl;
else
cout << "Binary message from " << id
<< " received, size=" << get<binary>(data).size() << endl;
});
dataChannelMap.emplace(id, dc);
this_thread::sleep_for(1s);
}
cout << "Cleaning up..." << endl;
@ -154,6 +182,12 @@ int main(int argc, char **argv) {
dataChannelMap.clear();
peerConnectionMap.clear();
return 0;
} catch (const std::exception &e) {
std::cout << "Error: " << e.what() << std::endl;
dataChannelMap.clear();
peerConnectionMap.clear();
return -1;
}
// Create and setup a PeerConnection
@ -166,7 +200,7 @@ shared_ptr<PeerConnection> createPeerConnection(const Configuration &config,
pc->onGatheringStateChange(
[](PeerConnection::GatheringState state) { cout << "Gathering State: " << state << endl; });
pc->onLocalDescription([wws, id](const Description &description) {
pc->onLocalDescription([wws, id](Description description) {
json message = {
{"id", id}, {"type", description.typeString()}, {"description", string(description)}};
@ -174,7 +208,7 @@ shared_ptr<PeerConnection> createPeerConnection(const Configuration &config,
ws->send(message.dump());
});
pc->onLocalCandidate([wws, id](const Candidate &candidate) {
pc->onLocalCandidate([wws, id](Candidate candidate) {
json message = {{"id", id},
{"type", "candidate"},
{"candidate", string(candidate)},
@ -190,11 +224,12 @@ shared_ptr<PeerConnection> createPeerConnection(const Configuration &config,
dc->onClosed([id]() { cout << "DataChannel from " << id << " closed" << endl; });
dc->onMessage([id](const variant<binary, string> &message) {
if (!holds_alternative<string>(message))
return;
cout << "Message from " << id << " received: " << get<string>(message) << endl;
dc->onMessage([id, wdc = make_weak_ptr(dc)](variant<binary, string> data) {
if (holds_alternative<string>(data))
cout << "Message from " << id << " received: " << get<string>(data) << endl;
else
cout << "Binary message from " << id
<< " received, size=" << get<binary>(data).size() << endl;
});
dc->send("Hello from " + localId);
@ -216,3 +251,4 @@ string randomId(size_t length) {
generate(id.begin(), id.end(), [&]() { return characters.at(dist(rng)); });
return id;
}

View File

@ -0,0 +1,160 @@
/******************************************************************************
**
** 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[] =
{
{"noStun", no_argument, NULL, 'n'},
{"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'},
{NULL, 0, NULL, 0}
};
_program_name += argv[0];
/* default values */
_n = false;
_s = "stun.l.google.com";
_t = 19302;
_w = "localhost";
_x = 8000;
_h = false;
optind = 0;
while ((c = getopt_long (argc, argv, "s:t:w:x:enhv", long_options, &optind)) != - 1)
{
switch (c)
{
case 'n':
_n = true;
break;
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 'h':
_h = true;
this->usage (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 << " [ -enstwxhv ] \n\
libdatachannel client implementing WebRTC Data Channels with WebSocket signaling\n\
[ -n ] [ --noStun ] (type=FLAG)\n\
Do NOT use a stun server (overrides -s and -t).\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";
}
exit (status);
}

View File

@ -0,0 +1,67 @@
/******************************************************************************
**
** 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 */
bool _n;
std::string _s;
int _t;
std::string _w;
int _x;
bool _h;
/* 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);
/* return next (non-option) parameter */
int next_param () { return _optind; }
bool noStun () const { return _n; }
std::string stunServer () const { return _s; }
int stunPort () const { return _t; }
std::string webSocketServer () const { return _w; }
int webSocketPort () const { return _x; }
bool h () const { return _h; }
};
#endif

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 909 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

Binary file not shown.

View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
xmlns:iot2="http://schemas.microsoft.com/appx/manifest/iot/windows10/2"
IgnorableNamespaces="uap mp">
<Identity Name="274EF42C-A3FB-3D6C-B127-E39C508A4F0E" Publisher="CN=CMake" Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="274EF42C-A3FB-3D6C-B127-E39C508A4F0E" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Properties>
<DisplayName>datachannel-client</DisplayName>
<PublisherDisplayName>CMake</PublisherDisplayName>
<Logo>StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
</Dependencies>
<Resources>
<Resource Language="x-generate" />
</Resources>
<Applications>
<Application
Id="App"
Executable="client.exe"
EntryPoint="datachannel-client.App"
desktop4:Subsystem="console"
desktop4:SupportsMultipleInstances="true"
iot2:Subsystem="console"
iot2:SupportsMultipleInstances="true">
<uap:VisualElements
DisplayName="datachannel-client"
Description="datachannel-client"
BackgroundColor="#336699"
Square150x150Logo="Logo.png"
Square44x44Logo="SmallLogo44x44.png">
<uap:SplashScreen Image="SplashScreen.png" />
</uap:VisualElements>
</Application>
</Applications>
</Package>

View File

@ -3,13 +3,53 @@ project(offerer C)
set(CMAKE_C_STANDARD 11)
add_executable(datachannel-copy-paste-capi-offerer offerer.c)
set(OFFERER_UWP_RESOURCES
uwp/offerer/Logo.png
uwp/offerer/package.appxManifest
uwp/offerer/SmallLogo.png
uwp/offerer/SmallLogo44x44.png
uwp/offerer/SplashScreen.png
uwp/offerer/StoreLogo.png
uwp/offerer/Windows_TemporaryKey.pfx
)
set(ANSWERER_UWP_RESOURCES
uwp/answerer/Logo.png
uwp/answerer/package.appxManifest
uwp/answerer/SmallLogo.png
uwp/answerer/SmallLogo44x44.png
uwp/answerer/SplashScreen.png
uwp/answerer/StoreLogo.png
uwp/answerer/Windows_TemporaryKey.pfx
)
if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
add_executable(datachannel-copy-paste-capi-offerer offerer.c ${OFFERER_UWP_RESOURCES})
else()
add_executable(datachannel-copy-paste-capi-offerer offerer.c)
endif()
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)
if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
add_executable(datachannel-copy-paste-capi-answerer answerer.c ${ANSWERER_UWP_RESOURCES})
else()
add_executable(datachannel-copy-paste-capi-answerer answerer.c)
endif()
set_target_properties(datachannel-copy-paste-capi-answerer PROPERTIES
OUTPUT_NAME answerer)
target_link_libraries(datachannel-copy-paste-capi-answerer datachannel)
if(WIN32)
add_custom_command(TARGET datachannel-copy-paste-capi-offerer POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"$<TARGET_FILE_DIR:datachannel>/datachannel.dll"
$<TARGET_FILE_DIR:datachannel-copy-paste-capi-offerer>
)
add_custom_command(TARGET datachannel-copy-paste-capi-answerer POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"$<TARGET_FILE_DIR:datachannel>/datachannel.dll"
$<TARGET_FILE_DIR:datachannel-copy-paste-capi-answerer>
)
endif()

View File

@ -41,16 +41,16 @@ typedef struct {
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 RTC_API dataChannelCallback(int pc, int dc, void *ptr);
static void RTC_API descriptionCallback(int pc, const char *sdp, const char *type, void *ptr);
static void RTC_API candidateCallback(int pc, const char *cand, const char *mid, void *ptr);
static void RTC_API stateChangeCallback(int pc, rtcState state, void *ptr);
static void RTC_API gatheringStateCallback(int pc, rtcGatheringState state, void *ptr);
static void RTC_API closedCallback(int id, void *ptr);
static void RTC_API messageCallback(int id, const char *message, int size, void *ptr);
static void deletePeer(Peer *peer);
char* state_print(rtcState state);
char *state_print(rtcState state);
char *rtcGatheringState_print(rtcGatheringState state);
int all_space(const char *str);
@ -88,7 +88,8 @@ int main(int argc, char **argv) {
bool exit = false;
while (!exit) {
printf("\n");
printf("***************************************************************************************\n");
printf("***********************************************************************************"
"****\n");
printf("* 0: Exit /"
" 1: Enter remote description /"
" 2: Enter remote candidate /"
@ -118,27 +119,25 @@ int main(int argc, char **argv) {
char *line = NULL;
size_t len = 0;
size_t read = 0;
char *sdp = (char*) malloc(sizeof(char));
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);
sdp = (char *)realloc(sdp, (strlen(sdp) + 1) + strlen(line) + 1);
strcat(sdp, line);
}
printf("%s\n",sdp);
printf("%s\n", sdp);
rtcSetRemoteDescription(peer->pc, sdp, "offer");
free(sdp);
free(line);
break;
}
case 2: {
// Parse Candidate
printf("[Candidate]: ");
char* candidate = NULL;
char *candidate = NULL;
size_t candidate_size = 0;
if(getline(&candidate, &candidate_size, stdin)) {
rtcAddRemoteCandidate(peer->pc, candidate, "0");
if (getline(&candidate, &candidate_size, stdin)) {
rtcAddRemoteCandidate(peer->pc, candidate, NULL);
free(candidate);
} else {
@ -150,15 +149,15 @@ int main(int argc, char **argv) {
}
case 3: {
// Send Message
if(!peer->connected) {
if (!peer->connected) {
printf("** Channel is not Open **");
break;
}
printf("[Message]: ");
char* message = NULL;
char *message = NULL;
size_t message_size = 0;
if(getline(&message, &message_size, stdin)) {
if (getline(&message, &message_size, stdin)) {
rtcSendMessage(peer->dc, message, -1);
free(message);
} else {
@ -169,7 +168,7 @@ int main(int argc, char **argv) {
}
case 4: {
// Connection Info
if(!peer->connected) {
if (!peer->connected) {
printf("** Channel is not Open **");
break;
}
@ -194,35 +193,32 @@ int main(int argc, char **argv) {
return 0;
}
static void descriptionCallback(const char *sdp, const char *type, void *ptr) {
// Peer *peer = (Peer *)ptr;
static void RTC_API descriptionCallback(int pc, const char *sdp, const char *type, void *ptr) {
printf("Description %s:\n%s\n", "answerer", sdp);
}
static void candidateCallback(const char *cand, const char *mid, void *ptr) {
// Peer *peer = (Peer *)ptr;
static void RTC_API candidateCallback(int pc, const char *cand, const char *mid, void *ptr) {
printf("Candidate %s: %s\n", "answerer", cand);
}
static void stateChangeCallback(rtcState state, void *ptr) {
static void RTC_API stateChangeCallback(int pc, 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) {
static void RTC_API gatheringStateCallback(int pc, 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) {
static void RTC_API closedCallback(int id, void *ptr) {
Peer *peer = (Peer *)ptr;
peer->connected = false;
}
static void messageCallback(const char *message, int size, void *ptr) {
static void RTC_API messageCallback(int id, 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 {
@ -230,6 +226,17 @@ static void messageCallback(const char *message, int size, void *ptr) {
}
}
static void RTC_API dataChannelCallback(int pc, 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);
}
static void deletePeer(Peer *peer) {
if (peer) {
if (peer->dc)
@ -240,17 +247,6 @@ static void deletePeer(Peer *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) {

View File

@ -41,13 +41,13 @@ typedef struct {
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 RTC_API descriptionCallback(int pc, const char *sdp, const char *type, void *ptr);
static void RTC_API candidateCallback(int pc, const char *cand, const char *mid, void *ptr);
static void RTC_API stateChangeCallback(int pc, rtcState state, void *ptr);
static void RTC_API gatheringStateCallback(int pc, rtcGatheringState state, void *ptr);
static void RTC_API openCallback(int id, void *ptr);
static void RTC_API closedCallback(int id, void *ptr);
static void RTC_API messageCallback(int id, const char *message, int size, void *ptr);
static void deletePeer(Peer *peer);
char *state_print(rtcState state);
@ -55,7 +55,7 @@ char *rtcGatheringState_print(rtcGatheringState state);
int all_space(const char *str);
int main(int argc, char **argv){
int main(int argc, char **argv) {
rtcInitLogger(RTC_LOG_DEBUG, NULL);
// Create peer
@ -79,7 +79,7 @@ int main(int argc, char **argv){
rtcSetStateChangeCallback(peer->pc, stateChangeCallback);
rtcSetGatheringStateChangeCallback(peer->pc, gatheringStateCallback);
// Since this is the offere, we will create a datachannel
// Since we are the offerer, we will create a datachannel
peer->dc = rtcCreateDataChannel(peer->pc, "test");
rtcSetOpenCallback(peer->dc, openCallback);
rtcSetClosedCallback(peer->dc, closedCallback);
@ -91,7 +91,8 @@ int main(int argc, char **argv){
while (!exit) {
printf("\n");
printf("***************************************************************************************\n");
printf("***********************************************************************************"
"****\n");
printf("* 0: Exit /"
" 1: Enter remote description /"
" 2: Enter remote candidate /"
@ -119,53 +120,49 @@ int main(int argc, char **argv){
// Parse Description
printf("[Description]: ");
char *line = NULL;
size_t len = 0;
size_t read = 0;
char *sdp = (char*) malloc(sizeof(char));
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);
sdp = (char *)realloc(sdp, (strlen(sdp) + 1) + strlen(line) + 1);
strcat(sdp, line);
}
printf("%s\n",sdp);
printf("%s\n", sdp);
rtcSetRemoteDescription(peer->pc, sdp, "answer");
free(sdp);
free(line);
break;
}
case 2: {
// Parse Candidate
printf("[Candidate]: ");
char* candidate = NULL;
char *candidate = NULL;
size_t candidate_size = 0;
if(getline(&candidate, &candidate_size, stdin)) {
rtcAddRemoteCandidate(peer->pc, candidate, "0");
if (getline(&candidate, &candidate_size, stdin)) {
rtcAddRemoteCandidate(peer->pc, candidate, NULL);
free(candidate);
}else {
} else {
printf("Error reading line\n");
break;
}
break;
}
case 3: {
// Send Message
if(!peer->connected) {
if (!peer->connected) {
printf("** Channel is not Open **");
break;
}
printf("[Message]: ");
char* message = NULL;
char *message = NULL;
size_t message_size = 0;
if(getline(&message, &message_size, stdin)) {
if (getline(&message, &message_size, stdin)) {
rtcSendMessage(peer->dc, message, -1);
free(message);
}else {
} else {
printf("Error reading line\n");
break;
}
@ -174,7 +171,7 @@ int main(int argc, char **argv){
}
case 4: {
// Connection Info
if(!peer->connected) {
if (!peer->connected) {
printf("** Channel is not Open **");
break;
}
@ -199,44 +196,40 @@ int main(int argc, char **argv){
return 0;
}
static void descriptionCallback(const char *sdp, const char *type, void *ptr) {
// Peer *peer = (Peer *)ptr;
static void RTC_API descriptionCallback(int pc, const char *sdp, const char *type, void *ptr) {
printf("Description %s:\n%s\n", "offerer", sdp);
}
static void candidateCallback(const char *cand, const char *mid, void *ptr) {
// Peer *peer = (Peer *)ptr;
static void RTC_API candidateCallback(int pc, const char *cand, const char *mid, void *ptr) {
printf("Candidate %s: %s\n", "offerer", cand);
}
static void stateChangeCallback(rtcState state, void *ptr) {
static void RTC_API stateChangeCallback(int pc, 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) {
static void RTC_API gatheringStateCallback(int pc, 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) {
static void RTC_API openCallback(int id, 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);
printf("DataChannel %s: Received with label \"%s\"\n", "offerer", buffer);
}
static void closedCallback(void *ptr) {
static void RTC_API closedCallback(int id, void *ptr) {
Peer *peer = (Peer *)ptr;
peer->connected = false;
}
static void messageCallback(const char *message, int size, void *ptr) {
// Peer *peer = (Peer *)ptr;
static void RTC_API messageCallback(int id, const char *message, int size, void *ptr) {
if (size < 0) { // negative size indicates a null-terminated string
printf("Message %s: %s\n", "offerer", message);
} else {

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 909 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
xmlns:iot2="http://schemas.microsoft.com/appx/manifest/iot/windows10/2"
IgnorableNamespaces="uap mp">
<Identity Name="9751ACA6-5428-3AF2-AED6-2DDA8D2FD777" Publisher="CN=CMake" Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="9751ACA6-5428-3AF2-AED6-2DDA8D2FD777" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Properties>
<DisplayName>datachannel-copy-paste-capi-answerer</DisplayName>
<PublisherDisplayName>CMake</PublisherDisplayName>
<Logo>StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
</Dependencies>
<Resources>
<Resource Language="x-generate" />
</Resources>
<Applications>
<Application
Id="App"
Executable="answerer.exe"
EntryPoint="datachannel-copy-paste-capi-answerer.App"
desktop4:Subsystem="console"
desktop4:SupportsMultipleInstances="true"
iot2:Subsystem="console"
iot2:SupportsMultipleInstances="true">
<uap:VisualElements
DisplayName="datachannel-copy-paste-capi-answerer"
Description="datachannel-copy-paste-capi-answerer"
BackgroundColor="#336699"
Square150x150Logo="Logo.png"
Square44x44Logo="SmallLogo44x44.png">
<uap:SplashScreen Image="SplashScreen.png" />
</uap:VisualElements>
</Application>
</Applications>
</Package>

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 909 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
xmlns:iot2="http://schemas.microsoft.com/appx/manifest/iot/windows10/2"
IgnorableNamespaces="uap mp">
<Identity Name="D63472B9-2085-3CA0-96B2-895D164F4155" Publisher="CN=CMake" Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="D63472B9-2085-3CA0-96B2-895D164F4155" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Properties>
<DisplayName>datachannel-copy-paste-capi-offerer</DisplayName>
<PublisherDisplayName>CMake</PublisherDisplayName>
<Logo>StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
</Dependencies>
<Resources>
<Resource Language="x-generate" />
</Resources>
<Applications>
<Application
Id="App"
Executable="offerer.exe"
EntryPoint="datachannel-copy-paste-capi-offerer.App"
desktop4:Subsystem="console"
desktop4:SupportsMultipleInstances="true"
iot2:Subsystem="console"
iot2:SupportsMultipleInstances="true">
<uap:VisualElements
DisplayName="datachannel-copy-paste-capi-offerer"
Description="datachannel-copy-paste-capi-offerer"
BackgroundColor="#336699"
Square150x150Logo="Logo.png"
Square44x44Logo="SmallLogo44x44.png">
<uap:SplashScreen Image="SplashScreen.png" />
</uap:VisualElements>
</Application>
</Applications>
</Package>

View File

@ -1,22 +1,54 @@
cmake_minimum_required(VERSION 3.7)
add_executable(datachannel-copy-paste-offerer offerer.cpp)
set(OFFERER_UWP_RESOURCES
uwp/offerer/Logo.png
uwp/offerer/package.appxManifest
uwp/offerer/SmallLogo.png
uwp/offerer/SmallLogo44x44.png
uwp/offerer/SplashScreen.png
uwp/offerer/StoreLogo.png
uwp/offerer/Windows_TemporaryKey.pfx
)
set(ANSWERER_UWP_RESOURCES
uwp/answerer/Logo.png
uwp/answerer/package.appxManifest
uwp/answerer/SmallLogo.png
uwp/answerer/SmallLogo44x44.png
uwp/answerer/SplashScreen.png
uwp/answerer/StoreLogo.png
uwp/answerer/Windows_TemporaryKey.pfx
)
if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
add_executable(datachannel-copy-paste-offerer offerer.cpp ${OFFERER_UWP_RESOURCES})
else()
add_executable(datachannel-copy-paste-offerer offerer.cpp)
endif()
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()
target_link_libraries(datachannel-copy-paste-offerer datachannel)
add_executable(datachannel-copy-paste-answerer answerer.cpp)
if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
add_executable(datachannel-copy-paste-answerer answerer.cpp ${ANSWERER_UWP_RESOURCES})
else()
add_executable(datachannel-copy-paste-answerer answerer.cpp)
endif()
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()
target_link_libraries(datachannel-copy-paste-answerer datachannel)
if(WIN32)
add_custom_command(TARGET datachannel-copy-paste-offerer POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"$<TARGET_FILE_DIR:datachannel>/datachannel.dll"
$<TARGET_FILE_DIR:datachannel-copy-paste-offerer>
)
add_custom_command(TARGET datachannel-copy-paste-answerer POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"$<TARGET_FILE_DIR:datachannel>/datachannel.dll"
$<TARGET_FILE_DIR:datachannel-copy-paste-answerer>
)
endif()

View File

@ -36,12 +36,12 @@ int main(int argc, char **argv) {
auto pc = std::make_shared<PeerConnection>(config);
pc->onLocalDescription([](const Description &description) {
pc->onLocalDescription([](Description description) {
cout << "Local Description (Paste this to the other peer):" << endl;
cout << string(description) << endl;
});
pc->onLocalCandidate([](const Candidate &candidate) {
pc->onLocalCandidate([](Candidate candidate) {
cout << "Local Candidate (Paste this to the other peer after the local description):"
<< endl;
cout << string(candidate) << endl << endl;
@ -60,7 +60,7 @@ int main(int argc, char **argv) {
dc->onClosed([&]() { cout << "[DataChannel closed: " << dc->label() << "]" << endl; });
dc->onMessage([](const variant<binary, string> &message) {
dc->onMessage([](variant<binary, string> message) {
if (holds_alternative<string>(message)) {
cout << "[Received message: " << get<string>(message) << "]" << endl;
}
@ -127,13 +127,11 @@ int main(int argc, char **argv) {
cout << "** Channel is not Open ** ";
break;
}
CandidateInfo local, remote;
Candidate local, remote;
std::optional<std::chrono::milliseconds> rtt = pc->rtt();
if (pc->getSelectedCandidatePair(&local, &remote)) {
cout << "Local: " << local.address << ":" << local.port << " " << local.type << " "
<< local.transportType << endl;
cout << "Remote: " << remote.address << ":" << remote.port << " " << remote.type
<< " " << remote.transportType << endl;
cout << "Local: " << local << endl;
cout << "Remote: " << remote << endl;
cout << "Bytes Sent:" << pc->bytesSent()
<< " / Bytes Received:" << pc->bytesReceived() << " / Round-Trip Time:";
if (rtt.has_value())

View File

@ -36,12 +36,12 @@ int main(int argc, char **argv) {
auto pc = std::make_shared<PeerConnection>(config);
pc->onLocalDescription([](const Description &description) {
pc->onLocalDescription([](Description description) {
cout << "Local Description (Paste this to the other peer):" << endl;
cout << string(description) << endl;
});
pc->onLocalCandidate([](const Candidate &candidate) {
pc->onLocalCandidate([](Candidate candidate) {
cout << "Local Candidate (Paste this to the other peer after the local description):"
<< endl;
cout << string(candidate) << endl << endl;
@ -60,7 +60,7 @@ int main(int argc, char **argv) {
dc->onClosed([&]() { cout << "[DataChannel closed: " << dc->label() << "]" << endl; });
dc->onMessage([](const variant<binary, string> &message) {
dc->onMessage([](variant<binary, string> message) {
if (holds_alternative<string>(message)) {
cout << "[Received: " << get<string>(message) << "]" << endl;
}
@ -127,13 +127,11 @@ int main(int argc, char **argv) {
cout << "** Channel is not Open ** ";
break;
}
CandidateInfo local, remote;
Candidate local, remote;
std::optional<std::chrono::milliseconds> rtt = pc->rtt();
if (pc->getSelectedCandidatePair(&local, &remote)) {
cout << "Local: " << local.address << ":" << local.port << " " << local.type << " "
<< local.transportType << endl;
cout << "Remote: " << remote.address << ":" << remote.port << " " << remote.type
<< " " << remote.transportType << endl;
cout << "Local: " << local << endl;
cout << "Remote: " << remote << endl;
cout << "Bytes Sent:" << pc->bytesSent()
<< " / Bytes Received:" << pc->bytesReceived() << " / Round-Trip Time:";
if (rtt.has_value())

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 909 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
xmlns:iot2="http://schemas.microsoft.com/appx/manifest/iot/windows10/2"
IgnorableNamespaces="uap mp">
<Identity Name="86FAC2A3-40CD-393F-9F55-52A30E0D3B8F" Publisher="CN=CMake" Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="86FAC2A3-40CD-393F-9F55-52A30E0D3B8F" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Properties>
<DisplayName>datachannel-copy-paste-answerer</DisplayName>
<PublisherDisplayName>CMake</PublisherDisplayName>
<Logo>StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
</Dependencies>
<Resources>
<Resource Language="x-generate" />
</Resources>
<Applications>
<Application
Id="App"
Executable="answerer.exe"
EntryPoint="datachannel-copy-paste-answerer.App"
desktop4:Subsystem="console"
desktop4:SupportsMultipleInstances="true"
iot2:Subsystem="console"
iot2:SupportsMultipleInstances="true">
<uap:VisualElements
DisplayName="datachannel-copy-paste-answerer"
Description="datachannel-copy-paste-answerer"
BackgroundColor="#336699"
Square150x150Logo="Logo.png"
Square44x44Logo="SmallLogo44x44.png">
<uap:SplashScreen Image="SplashScreen.png" />
</uap:VisualElements>
</Application>
</Applications>
</Package>

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 909 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
xmlns:iot2="http://schemas.microsoft.com/appx/manifest/iot/windows10/2"
IgnorableNamespaces="uap mp">
<Identity Name="68160929-CE5F-3FC1-A120-BCB1C223FC2F" Publisher="CN=CMake" Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="68160929-CE5F-3FC1-A120-BCB1C223FC2F" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Properties>
<DisplayName>datachannel-copy-paste-offerer</DisplayName>
<PublisherDisplayName>CMake</PublisherDisplayName>
<Logo>StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
</Dependencies>
<Resources>
<Resource Language="x-generate" />
</Resources>
<Applications>
<Application
Id="App"
Executable="offerer.exe"
EntryPoint="datachannel-copy-paste-offerer.App"
desktop4:Subsystem="console"
desktop4:SupportsMultipleInstances="true"
iot2:Subsystem="console"
iot2:SupportsMultipleInstances="true">
<uap:VisualElements
DisplayName="datachannel-copy-paste-offerer"
Description="datachannel-copy-paste-offerer"
BackgroundColor="#336699"
Square150x150Logo="Logo.png"
Square44x44Logo="SmallLogo44x44.png">
<uap:SplashScreen Image="SplashScreen.png" />
</uap:VisualElements>
</Application>
</Applications>
</Package>

View File

@ -0,0 +1,29 @@
cmake_minimum_required(VERSION 3.7)
set(MEDIA_UWP_RESOURCES
uwp/Logo.png
uwp/package.appxManifest
uwp/SmallLogo.png
uwp/SmallLogo44x44.png
uwp/SplashScreen.png
uwp/StoreLogo.png
uwp/Windows_TemporaryKey.pfx
)
if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
add_executable(datachannel-media main.cpp ${MEDIA_UWP_RESOURCES})
else()
add_executable(datachannel-media main.cpp)
endif()
set_target_properties(datachannel-media PROPERTIES
CXX_STANDARD 17
OUTPUT_NAME media)
target_link_libraries(datachannel-media datachannel nlohmann_json)
if(WIN32)
add_custom_command(TARGET datachannel-media POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"$<TARGET_FILE_DIR:datachannel>/datachannel.dll"
$<TARGET_FILE_DIR:datachannel-media>
)
endif()

19
examples/media/README.md Normal file
View File

@ -0,0 +1,19 @@
# 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
```

97
examples/media/main.cpp Normal file
View File

@ -0,0 +1,97 @@
/*
* libdatachannel client example
* Copyright (c) 2020 Staz Modrzynski
* 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::RtcpReceivingSession>();
track->setMediaHandler(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;
}
}

45
examples/media/main.html Normal file
View File

@ -0,0 +1,45 @@
<!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>

BIN
examples/media/uwp/Logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 909 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

Binary file not shown.

View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
xmlns:iot2="http://schemas.microsoft.com/appx/manifest/iot/windows10/2"
IgnorableNamespaces="uap mp">
<Identity Name="6597869B-290B-3EC7-AC50-87D2B9B408A2" Publisher="CN=CMake" Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="6597869B-290B-3EC7-AC50-87D2B9B408A2" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Properties>
<DisplayName>datachannel-media</DisplayName>
<PublisherDisplayName>CMake</PublisherDisplayName>
<Logo>StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
</Dependencies>
<Resources>
<Resource Language="x-generate" />
</Resources>
<Applications>
<Application
Id="App"
Executable="media.exe"
EntryPoint="datachannel-media.App"
desktop4:Subsystem="console"
desktop4:SupportsMultipleInstances="true"
iot2:Subsystem="console"
iot2:SupportsMultipleInstances="true">
<uap:VisualElements
DisplayName="datachannel-media"
Description="datachannel-media"
BackgroundColor="#336699"
Square150x150Logo="Logo.png"
Square44x44Logo="SmallLogo44x44.png">
<uap:SplashScreen Image="SplashScreen.png" />
</uap:VisualElements>
</Application>
</Applications>
</Package>

View File

@ -0,0 +1,29 @@
cmake_minimum_required(VERSION 3.7)
set(SFU_MEDIA_UWP_RESOURCES
uwp/Logo.png
uwp/package.appxManifest
uwp/SmallLogo.png
uwp/SmallLogo44x44.png
uwp/SplashScreen.png
uwp/StoreLogo.png
uwp/Windows_TemporaryKey.pfx
)
if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
add_executable(datachannel-sfu-media main.cpp ${SFU_MEDIA_UWP_RESOURCES})
else()
add_executable(datachannel-sfu-media main.cpp)
endif()
set_target_properties(datachannel-sfu-media PROPERTIES
CXX_STANDARD 17
OUTPUT_NAME sfu-media)
target_link_libraries(datachannel-sfu-media datachannel nlohmann_json)
if(WIN32)
add_custom_command(TARGET datachannel-sfu-media POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"$<TARGET_FILE_DIR:datachannel>/datachannel.dll"
$<TARGET_FILE_DIR:datachannel-sfu-media>
)
endif()

134
examples/sfu-media/main.cpp Normal file
View File

@ -0,0 +1,134 @@
/*
* libdatachannel client example
* Copyright (c) 2020 Staz Modrzynski
* 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 <nlohmann/json.hpp>
using nlohmann::json;
struct Receiver {
std::shared_ptr<rtc::PeerConnection> conn;
std::shared_ptr<rtc::Track> track;
};
int main() {
std::vector<std::shared_ptr<Receiver>> receivers;
try {
rtc::InitLogger(rtc::LogLevel::Info);
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 << "Please copy/paste this offer to the SENDER: " << message << std::endl;
}
});
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);
pc->setLocalDescription();
auto session = std::make_shared<rtc::RtcpReceivingSession>();
track->setMediaHandler(session);
const rtc::SSRC targetSSRC = 4;
track->onMessage(
[&receivers, targetSSRC](rtc::binary message) {
// This is an RTP packet
auto rtp = (rtc::RTP *)message.data();
rtp->setSsrc(targetSSRC);
for (auto pc : receivers) {
if (pc->track != nullptr && pc->track->isOpen()) {
pc->track->send(message);
}
}
},
nullptr);
// Set the SENDERS Answer
{
std::cout << "Please copy/paste the answer provided by the SENDER: " << 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);
}
// For each receiver
while (true) {
auto pc = std::make_shared<Receiver>();
pc->conn = std::make_shared<rtc::PeerConnection>();
pc->conn->onStateChange([](rtc::PeerConnection::State state) {
std::cout << "State: " << state << std::endl;
});
pc->conn->onGatheringStateChange([pc](rtc::PeerConnection::GatheringState state) {
std::cout << "Gathering State: " << state << std::endl;
if (state == rtc::PeerConnection::GatheringState::Complete) {
auto description = pc->conn->localDescription();
json message = {{"type", description->typeString()},
{"sdp", std::string(description.value())}};
std::cout << "Please copy/paste this offer to the RECEIVER: " << message
<< std::endl;
}
});
rtc::Description::Video media("video", rtc::Description::Direction::SendOnly);
media.addH264Codec(96);
media.setBitrate(
3000); // Request 3Mbps (Browsers do not encode more than 2.5MBps from a webcam)
media.addSSRC(targetSSRC, "video-send");
pc->track = pc->conn->addTrack(media);
pc->conn->setLocalDescription();
pc->track->onMessage([](rtc::binary var) {}, nullptr);
std::cout << "Please copy/paste the answer provided by the RECEIVER: " << 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->conn->setRemoteDescription(answer);
receivers.push_back(pc);
}
} catch (const std::exception &e) {
std::cerr << "Error: " << e.what() << std::endl;
}
}

View File

@ -0,0 +1,87 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>libdatachannel media example</title>
</head>
<body>
<div style="display:inline-block; width:40%;">
<h1>SENDER</h1>
<p id="send-help">Please enter the offer provided to you by the application: </p>
<textarea style="width:100%;" id=send-text rows="50"></textarea>
<button id=send-btn>Submit</button>
</div>
<div style="display:inline-block; width:40%;">
<h1>RECEIVER</h1>
<p id="recv-help">Please enter the offer provided to you by the application: </p>
<textarea id=recv-text style="width:100%;" rows="50"></textarea>
<button id=recv-btn>Submit</button>
</div>
<div id="videos">
</div>
<script>
document.querySelector('#send-btn').addEventListener('click', async () => {
let offer = JSON.parse(document.querySelector('#send-text').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('#send-text').value = JSON.stringify({"type": answer.type, sdp: answer.sdp});
document.querySelector('#send-help').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);
});
document.querySelector('#recv-btn').addEventListener('click', async () => {
let offer = JSON.parse(document.querySelector('#recv-text').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('#recv-text').value = JSON.stringify({"type": answer.type, sdp: answer.sdp});
document.querySelector('#recv-help').value = 'Please paste the answer in the application.';
alert('Please paste the answer in the application.');
}
}
let trackCount = 0;
rtc.ontrack = (ev) => {
let thisID = trackCount++;
document.querySelector("#videos").innerHTML += "<video width=100% height=100% id='video-" + thisID + "'></video>";
let tracks = [];
rtc.getReceivers().forEach(recv => tracks.push(recv.track));
document.querySelector("#video-" + thisID).srcObject = new MediaStream(tracks);
document.querySelector("#video-" + thisID).play();
};
await rtc.setRemoteDescription(offer);
let answer = await rtc.createAnswer();
await rtc.setLocalDescription(answer);
});
</script>
</body>
</html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 909 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

Binary file not shown.

View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
xmlns:iot2="http://schemas.microsoft.com/appx/manifest/iot/windows10/2"
IgnorableNamespaces="uap mp">
<Identity Name="A2137F64-F4DB-39E1-8A6E-19BF1A64645A" Publisher="CN=CMake" Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="A2137F64-F4DB-39E1-8A6E-19BF1A64645A" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Properties>
<DisplayName>datachannel-sfu-media</DisplayName>
<PublisherDisplayName>CMake</PublisherDisplayName>
<Logo>StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
</Dependencies>
<Resources>
<Resource Language="x-generate" />
</Resources>
<Applications>
<Application
Id="App"
Executable="sfu-media.exe"
EntryPoint="datachannel-sfu-media.App"
desktop4:Subsystem="console"
desktop4:SupportsMultipleInstances="true"
iot2:Subsystem="console"
iot2:SupportsMultipleInstances="true">
<uap:VisualElements
DisplayName="datachannel-sfu-media"
Description="datachannel-sfu-media"
BackgroundColor="#336699"
Square150x150Logo="Logo.png"
Square44x44Logo="SmallLogo44x44.png">
<uap:SplashScreen Image="SplashScreen.png" />
</uap:VisualElements>
</Application>
</Applications>
</Package>

View File

@ -0,0 +1,339 @@
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.

View File

@ -0,0 +1,285 @@
{
"name": "libdatachannel-signaling-server",
"version": "0.1.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "libdatachannel-signaling-server",
"version": "0.1.0",
"license": "GPL-2.0",
"dependencies": {
"websocket": "^1.0.33"
}
},
"node_modules/bufferutil": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.2.tgz",
"integrity": "sha512-AtnG3W6M8B2n4xDQ5R+70EXvOpnXsFYg/AK2yTZd+HQ/oxAdz+GI+DvjmhBw3L0ole+LJ0ngqY4JMbDzkfNzhA==",
"hasInstallScript": true,
"dependencies": {
"node-gyp-build": "^4.2.0"
}
},
"node_modules/d": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
"integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
"dependencies": {
"es5-ext": "^0.10.50",
"type": "^1.0.1"
}
},
"node_modules/debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"dependencies": {
"ms": "2.0.0"
}
},
"node_modules/es5-ext": {
"version": "0.10.53",
"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
"integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
"dependencies": {
"es6-iterator": "~2.0.3",
"es6-symbol": "~3.1.3",
"next-tick": "~1.0.0"
}
},
"node_modules/es6-iterator": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
"dependencies": {
"d": "1",
"es5-ext": "^0.10.35",
"es6-symbol": "^3.1.1"
}
},
"node_modules/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==",
"dependencies": {
"d": "^1.0.1",
"ext": "^1.1.2"
}
},
"node_modules/ext": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
"integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
"dependencies": {
"type": "^2.0.0"
}
},
"node_modules/ext/node_modules/type": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
"integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA=="
},
"node_modules/is-typedarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
},
"node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"node_modules/next-tick": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
},
"node_modules/node-gyp-build": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz",
"integrity": "sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==",
"bin": {
"node-gyp-build": "bin.js",
"node-gyp-build-optional": "optional.js",
"node-gyp-build-test": "build-test.js"
}
},
"node_modules/type": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
"integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
},
"node_modules/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==",
"dependencies": {
"is-typedarray": "^1.0.0"
}
},
"node_modules/utf-8-validate": {
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.3.tgz",
"integrity": "sha512-jtJM6fpGv8C1SoH4PtG22pGto6x+Y8uPprW0tw3//gGFhDDTiuksgradgFN6yRayDP4SyZZa6ZMGHLIa17+M8A==",
"hasInstallScript": true,
"dependencies": {
"node-gyp-build": "^4.2.0"
}
},
"node_modules/websocket": {
"version": "1.0.33",
"resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.33.tgz",
"integrity": "sha512-XwNqM2rN5eh3G2CUQE3OHZj+0xfdH42+OFK6LdC2yqiC0YU8e5UK0nYre220T0IyyN031V/XOvtHvXozvJYFWA==",
"dependencies": {
"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"
},
"engines": {
"node": ">=4.0.0"
}
},
"node_modules/yaeti": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
"integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=",
"engines": {
"node": ">=0.10.32"
}
}
},
"dependencies": {
"bufferutil": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.2.tgz",
"integrity": "sha512-AtnG3W6M8B2n4xDQ5R+70EXvOpnXsFYg/AK2yTZd+HQ/oxAdz+GI+DvjmhBw3L0ole+LJ0ngqY4JMbDzkfNzhA==",
"requires": {
"node-gyp-build": "^4.2.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": "4.2.3",
"resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz",
"integrity": "sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="
},
"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.3",
"resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.3.tgz",
"integrity": "sha512-jtJM6fpGv8C1SoH4PtG22pGto6x+Y8uPprW0tw3//gGFhDDTiuksgradgFN6yRayDP4SyZZa6ZMGHLIa17+M8A==",
"requires": {
"node-gyp-build": "^4.2.0"
}
},
"websocket": {
"version": "1.0.33",
"resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.33.tgz",
"integrity": "sha512-XwNqM2rN5eh3G2CUQE3OHZj+0xfdH42+OFK6LdC2yqiC0YU8e5UK0nYre220T0IyyN031V/XOvtHvXozvJYFWA==",
"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="
}
}
}

View File

@ -1,10 +1,10 @@
{
"name": "libdatachannel-example-web",
"version": "0.0.1",
"description": "Example for libdatachannel",
"name": "libdatachannel-signaling-server",
"version": "0.1.0",
"description": "Signaling server example for libdatachannel",
"main": "server.js",
"scripts": {
"start": "node server.js",
"start": "node signaling-server.js",
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
@ -18,6 +18,6 @@
},
"homepage": "https://github.com/paullouisageneau/libdatachannel#readme",
"dependencies": {
"websocket": "^1.0.31"
"websocket": "^1.0.33"
}
}

View File

@ -21,12 +21,6 @@ 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) => {
@ -34,58 +28,38 @@ const httpServer = http.createServer((req, res) => {
const respond = (code, data, contentType = 'text/plain') => {
res.writeHead(code, {
'Content-Type': contentType,
'Access-Control-Allow-Origin': '*',
'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);
});
respond(404, 'Not Found');
});
const wsServer = new websocket.server({ httpServer });
const wsServer = new websocket.server({httpServer});
wsServer.on('request', (req) => {
console.log(`WS ${req.resource}`);
const { path } = req.resourceURL;
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') {
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) {
if (dest) {
message.id = id;
const data = JSON.stringify(message);
console.log(`Client ${destId} >> ${data}`);
dest.send(data);
}
else {
} else {
console.error(`Client ${destId} not found`);
}
}
@ -98,5 +72,10 @@ wsServer.on('request', (req) => {
clients[id] = conn;
});
httpServer.listen(8000);
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}`); });

View File

@ -63,16 +63,20 @@ async def handle_websocket(websocket, path):
print('Client {} disconnected'.format(client_id))
if __name__ == '__main__':
port = int(sys.argv[1]) if len(sys.argv) > 1 else 8000
# 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 port {}'.format(port))
start_server = websockets.serve(handle_websocket, '127.0.0.1', port, ssl=ssl_context)
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()

View File

@ -348,7 +348,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701"
[[package]]
name = "libdatachannel_signaling_example"
name = "libdatachannel_signaling_server_example"
version = "0.1.0"
dependencies = [
"futures-channel",

Some files were not shown because too many files have changed in this diff Show More