Compare commits

..

1169 Commits

Author SHA1 Message Date
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
e675ada081 Bumped version to 0.7.1 2020-07-23 22:32:18 +02:00
2f8d06db81 Fixed compilation on MSVC 2020-07-23 20:11:31 +02:00
e76d933de2 Safer callback reset strategy for PeerConnection 2020-07-23 19:52:07 +02:00
7090f2344b Merge pull request #132 from paullouisageneau/prevent-user-deadlock
Close data channels  asynchronously for safety
2020-07-23 10:23:30 +00:00
bd06ccbc83 Close data channels on processor to prevent deadlock on user re-calling close() 2020-07-23 11:47:20 +02:00
e2a2040d94 Merge pull request #130 from paullouisageneau/prevent-copy-sctp
Prevent data copy in SCTP transport
2020-07-22 16:13:41 +00:00
b6ffa13b72 Prevent data copy in SCTP transport 2020-07-22 18:02:00 +02:00
726b4c4c33 Catch exceptions in transport callbacks for safety 2020-07-22 17:15:49 +02:00
9b4c96ee18 Updated libjuice 2020-07-22 16:08:45 +02:00
faa03ce100 Fixed typo breaking bytes received for deprecated PPID_BINARY_PARTIAL 2020-07-22 16:07:54 +02:00
fa931aba64 Cosmetic fix for external resources links 2020-07-20 14:15:34 +02:00
1fb0d8923b Added link to datachannel-wasm 2020-07-20 14:14:15 +02:00
cfca2f6526 Changed sctp_build_programs to an option 2020-07-19 11:36:18 +02:00
fe1cc8b040 Bumped version to 0.7.0 2020-07-18 19:33:05 +02:00
327cc9e011 Merge pull request #128 from paullouisageneau/signaling-rust
Rewrite Rust signaling server example
2020-07-18 19:31:43 +02:00
bbc6307457 Added links to lerouxrgd/datachannel-rs 2020-07-18 19:10:09 +02:00
0ebebdc1fd Added Rust signaling server to examples 2020-07-18 19:03:50 +02:00
791916e5c6 Entirely rewrite Rust signaling server example to be compatible 2020-07-18 19:03:50 +02:00
516a8ef848 Properly fixed deadlock on WebSocket server ping 2020-07-18 19:02:55 +02:00
f2bf599acb Fixed deadlock on WebSocket server ping 2020-07-18 17:14:17 +02:00
bdc30fbb56 Merge pull request #127 from paullouisageneau/websocket-disable-verify
Allow disabling TLS certificate verification
2020-07-17 19:31:25 +02:00
a2d1b7eff0 Added comment for disableTlsVerification 2020-07-17 19:20:13 +02:00
69b48f50dd Added disableTlsVerification flag to C API 2020-07-17 18:53:27 +02:00
beb3352bf9 Added some logging 2020-07-17 18:53:27 +02:00
bc6710c4a1 Added example line in test 2020-07-17 18:53:27 +02:00
907e8273c8 Introduced VerifiedTlsTransport 2020-07-17 18:53:27 +02:00
fdbc038d51 Merge pull request #125 from paullouisageneau/change-juice-flag
Replace USE_JUICE flag with USE_NICE
2020-07-16 19:15:43 +02:00
1724c572a5 Bumped version to 0.6.6 2020-07-16 19:00:22 +02:00
54dbb360b7 Replaced compilation flag USE_JUICE with USE_NICE 2020-07-16 17:08:12 +02:00
803a2076ae Cosmetic fixes 2020-07-16 17:00:33 +02:00
ad54321c7a Introduced USE_NICE flag 2020-07-16 16:48:14 +02:00
503a5d8a51 Merge pull request #124 from paullouisageneau/fix-threadpool-destruction
Fix ThreadPool static destruction issues
2020-07-15 21:38:42 +02:00
610cd85f9d Fixed ThreadPool lifecycle to prevent static destruction issues 2020-07-15 21:28:52 +02:00
6a5a5b7db2 Merge pull request #123 from paullouisageneau/fix-jamfile
Jamfile: Split libjuice builds between GnuTLS and OpenSSL
2020-07-15 16:24:34 +02:00
4d7bf99144 Fixed libraries for libjuice 2020-07-15 15:54:15 +02:00
190dc954fd Set -p option for mkdir 2020-07-14 22:29:50 +02:00
46efdbe904 Splitted libjuice target for gnutls and openssl 2020-07-13 20:00:25 +02:00
a1fb21eeb6 Removed openssl/gnutls from usrstp build directory 2020-07-13 19:11:09 +02:00
cffe3df7ed Merge pull request #121 from aldenml/fix-error
add gcc flag -Wno-format-truncation to usrsctp when using b2
2020-07-13 18:47:13 +02:00
8aebe2a8a4 add gcc flag -Wno-format-truncation to usrsctp when using b2 2020-07-12 17:49:45 -04:00
86f7bd6dba Fixed usrsctp build dir on Windows 2020-07-11 20:05:22 +02:00
cc4346a6e8 Added FUNDING.yml 2020-07-11 11:36:41 +00:00
0625508348 Fixed compilation warning 2020-07-11 10:59:09 +02:00
cc01baee7f Fixed typo 2020-07-11 10:57:25 +02:00
6f7e59b973 Set sctp_build_programs to 0 2020-07-11 00:25:07 +02:00
c93f44f132 Bumped version to 0.6.5 2020-07-10 19:42:54 +02:00
517b69043f Merge pull request #120 from paullouisageneau/workaround-usrsctp-send-after-close
Better workaround for usrsctp send after closing/unregistering
2020-07-10 18:24:31 +02:00
b04db3a744 Better workaround for usrsctp send after closing/unregistering 2020-07-10 18:15:19 +02:00
36090a24e4 Updated usrsctp 2020-07-10 17:30:16 +02:00
6b75b3e227 Re-added usrsctp_deregister_address call mistakenly removed in #116 2020-07-10 17:05:41 +02:00
afed83f5f0 Merge pull request #116 from paullouisageneau/workaround-usrsctp-send-after-close
Workaround for usrsctp send after close
2020-07-10 14:33:16 +02:00
75c42592bf Unregister usrsctp send callback before closing 2020-07-10 14:13:39 +02:00
b35bfbeb0a Merge pull request #119 from paullouisageneau/fix-jamfile
Jamfile: Use different build directories for different builds
2020-07-10 14:10:03 +02:00
e481e896cb Added NO_EXAMPLES cmake flag 2020-07-08 18:38:25 +02:00
202467928a Changed build directory name to build-[crypto]-[variant] 2020-07-08 18:25:32 +02:00
71650ce163 Use different build directories for different builds 2020-07-08 17:58:26 +02:00
706a8b7160 Merge pull request #118 from paullouisageneau/threadpool
Enhance thread management
2020-07-08 17:57:50 +02:00
6f419a32ea Increased test timings for destruction 2020-07-08 17:42:23 +02:00
f5ff042d62 Check for re-init in destructor 2020-07-08 17:37:57 +02:00
822b2e6558 Simplified Init with a recursive mutex 2020-07-08 17:34:32 +02:00
5b251af1d7 Added initialized flag 2020-07-08 17:08:54 +02:00
5b56291b67 Fixed init lock on destruction 2020-07-08 15:58:20 +02:00
777f5a8dfe Revised deinitialization 2020-07-08 15:30:50 +02:00
971e6e8b91 Fixed init tokens handling 2020-07-08 11:39:53 +02:00
a3fb52c173 Fixed TCP transport thread interruption 2020-07-08 03:24:38 +02:00
db00253c18 Made Processor keep an init token to prevent early threadpool join 2020-07-08 02:46:19 +02:00
dd2967b0e1 Fixed Init critical section 2020-07-08 02:36:00 +02:00
cc4e215067 Install OpenSSL in Windows workflow 2020-07-08 01:52:34 +02:00
bbeed01eb0 Added comments 2020-07-08 01:52:26 +02:00
aecc2b8fda Added Processor and finished ThreadPool integration 2020-07-08 01:33:54 +02:00
d60e18d963 Made ThreadPool a singleton 2020-07-07 20:18:09 +02:00
e41019a1f0 Added ThreadPool 2020-07-07 19:59:18 +02:00
5825e44fc8 Fixed compilation warning 2020-07-06 12:25:03 +02:00
dc9a8114bc Merge pull request #114 from aldenml/fix-no-deprecated
fixed compilation when using openssl compiled with no-deprecated
2020-07-05 23:17:01 +02:00
3e827f9798 fixed compilation when using openssl compiled with no-deprecated 2020-07-04 18:57:50 -04:00
0a6b263bc3 Merge pull request #113 from paullouisageneau/fix-capi-userptr
Fix potential callback call with null user pointer in C API
2020-07-02 20:32:24 +02:00
e02c30027b Pass actual size of string in message callback 2020-07-02 20:09:03 +02:00
c4380ebcc4 Fixed potential null user pointer in callbacks 2020-07-02 20:08:54 +02:00
add0649335 Merge pull request #110 from paullouisageneau/keep-mline-order
Keep m-line order in description
2020-07-01 11:35:38 +02:00
cd28340de3 Keep m-line order in description 2020-07-01 11:24:03 +02:00
c675aedb83 Merge pull request #109 from paullouisageneau/fix-mid-handling
Fix mid handling in description
2020-07-01 00:17:41 +02:00
e32d139056 Moved data after non-data media in description 2020-07-01 00:13:12 +02:00
a790161168 Properly set remote data mid 2020-07-01 00:01:01 +02:00
2697ef0d76 Bumped version to 0.6.4 2020-06-29 21:09:02 +02:00
5044aedbec Updated libjuice to v0.4.4 2020-06-29 21:08:39 +02:00
44c90c1cb4 Set gnutls linking to shared in Jamfile 2020-06-29 21:05:34 +02:00
be79c68540 Merge pull request #108 from paullouisageneau/fix-srtp-transport
Fix optional SRTP transport
2020-06-29 21:03:44 +02:00
226a927df1 Implemented RTP and RTCP demultiplexing 2020-06-29 20:39:31 +02:00
4e1b9bb3c2 Fixed SRTP/DTLS demultiplexing 2020-06-29 09:48:42 +02:00
8bc016cc08 Added some logging 2020-06-29 09:48:42 +02:00
5afbe10d01 Changed to two SRTP sessions and introduced srtp_add_stream() 2020-06-29 09:48:42 +02:00
8df07ca68d Fixed serverSalt 2020-06-29 09:48:42 +02:00
884bd2316e Fixed error checking for OpenSSL 2020-06-29 09:48:42 +02:00
dadecce709 Fixed compilation for OpenSSL 2020-06-29 09:48:42 +02:00
103935bdd5 Introduced postCreation method to DTLS-SRTP 2020-06-29 09:48:42 +02:00
62e6954949 Use dedicated method to send media 2020-06-29 09:48:42 +02:00
3ac2d155cc Set DtlsSrtpTransport to bypass before handshake 2020-06-29 09:48:42 +02:00
6d8788c2a1 Updated libjuice 2020-06-29 09:47:53 +02:00
603dd01b87 Merge pull request #107 from Kyrio/fix-termux-include
Add the right header for IPPROTO_* on platforms such as Termux
2020-06-29 09:43:34 +02:00
8091508428 Add the right header for IPPROTO_* on some platforms 2020-06-29 01:08:34 +02:00
b38f63f077 Renamed PeerConnection::send() to sendMedia() 2020-06-26 18:02:07 +02:00
d87539937e Merge pull request #105 from paullouisageneau/fix-after-free-sctp-incoming
Fix use-after-free in SctpTransport::incoming()
2020-06-26 11:10:33 +02:00
eb09cadded Reordered SctpTransport::shutdown() and mLower->onRecv(nullptr) 2020-06-25 22:26:15 +02:00
79e0c62321 Merge pull request #103 from paullouisageneau/srtp-flag
Add USE_SRTP flag
2020-06-25 11:03:41 +02:00
ef38777129 Added USE_SRTP flag and renamed NO_WEBSOCKET flag 2020-06-25 10:59:12 +02:00
313f081061 Merge pull request #102 from paullouisageneau/fix-getaddrinfo-leak
Fix getaddrinfo() leak in Candidate::resolve()
2020-06-25 09:26:18 +02:00
6108b05e0d Fixed missing freeaddrinfo() on early exit 2020-06-25 09:20:05 +02:00
f68601b45f Updated libjuice 2020-06-24 15:30:15 +02:00
b94f2ab339 Bumped version to 0.6.3 2020-06-24 14:27:36 +02:00
9c79c8516b Updated libjuice to v0.4.3 2020-06-24 14:27:19 +02:00
ad03549f8c Updated libjuice 2020-06-24 13:38:56 +02:00
5cc8eb1ce6 Moved CleanupCertificateCache() to rtc::Cleanup() 2020-06-24 09:09:50 +02:00
d19ff754b2 Merge pull request #100 from paullouisageneau/fix-plog
Change plog to fork
2020-06-23 23:07:36 +02:00
fb0f903e2e Added includes after plog update 2020-06-23 23:03:09 +02:00
6628297580 Changed plog to fork https://github.com/paullouisageneau/plog 2020-06-23 22:51:43 +02:00
ccc05b9999 Added libjuice dependency on nettle if using gnutls 2020-06-23 19:18:35 +02:00
fb2f480f92 Change dir to build before cmake rather than using option -B 2020-06-23 15:03:28 +02:00
cca0ac859a Explicit . source directory for cmake 2020-06-23 12:21:24 +02:00
9fbc7c6ea8 Updated libjuice 2020-06-23 12:13:59 +02:00
83d65c805a Hint OpenSSL for libjuice cmake build 2020-06-23 09:28:27 +02:00
0a5cef331d Fixed target name usrsctp-static 2020-06-22 19:36:15 +02:00
7c1714f83c Changed MSVC build mode to Release and removed OpenSSL < 1.1 2020-06-22 18:55:19 +02:00
f3024d0552 Fixed compilation on MSVC 2020-06-22 14:59:34 +02:00
bcd1972270 Updated Readme 2020-06-22 12:14:29 +02:00
57501b1739 Updated Readme 2020-06-22 12:08:11 +02:00
cfe8a0e9c6 Fixed defines for MSVC 2020-06-21 20:21:00 +02:00
10061b3d4b Replaced dtls-id by tls-id according to draft-ietf-mmusic-dtls-sdp-32 2020-06-21 18:21:29 +02:00
52959ee700 Refactored media map access to prevent unused variables 2020-06-21 18:20:51 +02:00
0e86d6e3f1 Fixed cmake calls in Jamfile 2020-06-21 17:56:03 +02:00
62675e4c21 Merge pull request #97 from paullouisageneau/usrsctp-fix-notifications
Fix SCTP interleaved notifications
2020-06-21 17:51:12 +02:00
eafe86e4c0 Merge branch 'master' into usrsctp-fix-notifications 2020-06-21 17:35:08 +02:00
a2b2126930 Added comment about SCTP_FRAGMENT_INTERLEAVE 2020-06-21 17:32:55 +02:00
b9a663de75 Fixed compilation warning for MSVC 2020-06-20 23:35:58 +02:00
f5faeba7b0 Fixed compilation warning for MSVC 2020-06-20 23:29:47 +02:00
98f02c5195 Fixed Jamfile 2020-06-20 21:09:33 +02:00
d8ab5b4820 Added MSVC support to Jamfile 2020-06-20 15:54:26 +02:00
b569e78c02 Changed Jamfile to use cmake 2020-06-20 15:36:11 +02:00
4eac16e053 Updated usrsctp 2020-06-20 15:12:28 +02:00
bb13b4bd37 Renamed mPartialData to mPartialMessage 2020-06-20 12:46:03 +02:00
aabb435fc7 Separate SCTP partial notification and partial data 2020-06-20 12:40:21 +02:00
3d7764c1e9 Merge pull request #95 from paullouisageneau/msvc
Add workflow for MSVC
2020-06-20 11:21:44 +02:00
37687c3cd6 Removed finished flag 2020-06-20 11:16:49 +02:00
63f10303e0 Disable server verification on Windows 2020-06-20 11:05:22 +02:00
d656d739f3 Disable server verification if system CA certificates not found 2020-06-20 10:55:49 +02:00
dbc706b69d Fixed socket error code EINPROGRESS 2020-06-20 10:36:04 +02:00
1985088f4f Renamed socket errno constants 2020-06-20 10:10:22 +02:00
ccbaa8beda Updated libjuice 2020-06-20 10:09:30 +02:00
642d304af9 Second fix for EWOULDBLOCK on Windows 2020-06-19 19:12:22 +02:00
df2102497d Fixed compilation 2020-06-19 18:51:01 +02:00
ad676815bd Fixed EWOULDBLOCK errno on Windows 2020-06-19 18:48:19 +02:00
4bd40799fd Fixed compilation for MSVC 2020-06-19 18:33:55 +02:00
4d1d1fa6fe Renamed workflows 2020-06-19 18:20:07 +02:00
50f61b19aa Moved C++ tests and examples to static lib on Windows 2020-06-19 18:17:53 +02:00
b7dbe7cdd9 Added RTC_EXPORT directive on C API 2020-06-19 18:07:12 +02:00
7bfd731ed3 Fixed compilation with MSVC 2020-06-19 16:19:49 +02:00
4da8b8c9a3 Renamed build-ubuntu to build-linux 2020-06-19 15:31:13 +02:00
0382067d92 Fixed compilation with MSVC 2020-06-19 15:29:25 +02:00
325230404a Added build with MSVC on Windows 2020-06-19 14:03:54 +02:00
2a721015f8 Updated libjuice 2020-06-19 11:56:19 +02:00
5752b17a6f Merge pull request #94 from paullouisageneau/capi-log-callback
Optional log callback in C API
2020-06-17 23:54:12 +02:00
878d15b746 Added optional callback to C API rtcInitLogger() 2020-06-17 16:29:56 +02:00
26d240e3ba Prefixed callback types 2020-06-17 15:20:46 +02:00
ca7fc8b26f Merge pull request #93 from paullouisageneau/fix-setuserpointer
Fix setUserPointer() not replacing pointer
2020-06-15 21:25:46 +02:00
35cb9ea4be Fixed setUserPointer() not replacing pointer 2020-06-15 21:21:41 +02:00
ec42736a2f Merge pull request #92 from paullouisageneau/fix-clang-analyser
Prevent clang analyser inner pointer used after reallocation
2020-06-15 16:09:16 +02:00
b4f7c506da Added consistent checks on size parameter 2020-06-15 16:04:15 +02:00
a577bb9004 Fixed clang analyser inner pointer used after reallocation 2020-06-15 15:54:54 +02:00
bfd858ab13 Removed localhost candidates hack for macOS 2020-06-14 12:40:14 +02:00
18fe326090 Updated libjuice 2020-06-14 12:39:18 +02:00
384454b293 Bumped version to 0.6.2 2020-06-12 20:00:29 +02:00
34db6ae673 Made description mutexes non-recursive and fix deadlock 2020-06-12 19:59:44 +02:00
31c88b0783 Bumped version to v0.6.1 2020-06-12 18:13:49 +02:00
c502b1f207 Updated libjuice to v0.4.2 2020-06-12 18:12:27 +02:00
858e181be1 Merge branch 'dev' 2020-06-12 18:07:10 +02:00
d00c73e993 Changed error constants to defines 2020-06-12 17:49:29 +02:00
9403818a12 Fixed description 2020-06-12 17:46:04 +02:00
b233e655cc Updated libjuice 2020-06-12 17:43:33 +02:00
b625519c4a Merge pull request #90 from paullouisageneau/more-sctp-tuning
SCTP optimizations
2020-06-12 13:03:46 +00:00
82e604b869 Fixed benchmark 2020-06-12 14:42:48 +02:00
60169cc676 Prevent write lock contention in SCTP transport 2020-06-12 13:59:52 +02:00
ee0139402a Enable SCTP NR-SACKs and reduce SACK delay to 20ms 2020-06-12 13:59:43 +02:00
661d6827c6 Fixed typo 2020-06-11 22:02:26 +02:00
5a331f1087 Added JSEP 2020-06-11 21:26:57 +02:00
1aedbddc55 Merge pull request #88 from paullouisageneau/sctp-tuning
Tune SCTP
2020-06-11 15:10:56 +00:00
35d58bb4e5 Merge pull request #89 from paullouisageneau/fix-compilation-win32
Fix compilation for Windows
2020-06-11 13:08:34 +00:00
0da5985ef6 Fixed compilation for Windows 2020-06-11 14:57:08 +02:00
8440c085ca Fix set_target_properties wrong number of arguments error 2020-06-11 11:02:25 +02:00
b68ccb4d71 Lock remote description only when necessary 2020-06-11 10:44:47 +02:00
8e3ec73ca6 Lowered goodput test threshold 2020-06-11 09:46:52 +02:00
c29de9dd1e Optimized libjuice 2020-06-10 23:21:27 +02:00
2ca3b07938 Added GnuTLS explicit initialization 2020-06-10 19:24:21 +02:00
679263c9f7 Change SCTP congestion control to H-TCP 2020-06-10 18:55:18 +02:00
9d635feb30 Increase SCTP max chunks on queue 2020-06-10 18:29:19 +02:00
fc29073577 Increase the initial window size to 10 MTUs 2020-06-10 18:28:26 +02:00
83bb6878f7 Changed SCTP congestion control to HighSpeed TCP 2020-06-10 18:18:48 +02:00
672124aa29 Updated libjuice to increase UDP buffer size 2020-06-10 18:14:38 +02:00
1e734906d3 Merge pull request #87 from paullouisageneau/fix-capi
Properly catch exceptions in C API
2020-06-10 15:03:14 +00:00
d0695aa9cb Properly catch exceptions in C API 2020-06-10 16:54:32 +02:00
3a941367b8 Fixed dependabot.yml 2020-06-09 13:32:06 +02:00
52dcae6453 Create dependabot.yml 2020-06-09 13:30:48 +02:00
22a1c56863 Added optional preloading 2020-06-09 11:17:09 +02:00
74c5cbcf9f Some fixes for tests 2020-06-09 10:48:49 +02:00
5b2c0cbc08 Fixed compilation 2020-06-09 00:09:43 +02:00
d853bb59c3 Enhancements to tests 2020-06-09 00:04:23 +02:00
c30927b6fa Updated libjuice 2020-06-08 23:28:03 +02:00
3a72adf8c8 Removed cleanup 2020-06-08 16:03:28 +02:00
767d719563 Merge pull request #86 from paullouisageneau/benchmark
Added benchmark
2020-06-08 13:58:21 +00:00
af87e5a1b8 Fixed unsafe smart_ptr access from thread 2020-06-08 15:48:58 +02:00
c83196ee40 Lowered threshold for CI 2020-06-08 15:40:37 +02:00
dfcae8f4fd Added benchmark 2020-06-08 15:34:15 +02:00
64be7a62f4 Fixed potential deadlock when sending from buffer low callback 2020-06-08 15:29:47 +02:00
81e8fd38ba Bumped version to 0.6.0 2020-06-05 16:42:39 +02:00
f0d7d4e141 Updated libjuice to v0.4.1 2020-06-05 16:42:08 +02:00
383e963977 Updated libjuice 2020-06-05 16:35:12 +02:00
252242dd6b Added -Wno-unused-variable 2020-06-05 11:49:18 +02:00
b207bc85fc Revised CMakeLists 2020-06-04 19:30:06 +02:00
670386e192 Disabled some warnings 2020-06-04 15:13:32 +02:00
eb0a5bd5a5 Disable warnings before including plog 2020-06-04 14:43:17 +02:00
58f3a2b529 Merge branch 'dev' 2020-06-04 14:08:42 +02:00
6c8fe8ca51 Compilation fixes 2020-06-04 14:08:21 +02:00
e72651a635 Changed option "crypto" to "gnutls" 2020-06-04 10:41:57 +02:00
c823249a72 Disabled crypto option in Jamfile 2020-06-03 15:39:30 +02:00
516a529952 Merge pull request #84 from paullouisageneau/srtp
SRTP transport support
2020-06-01 20:54:12 +02:00
36aae90055 Updated Readme 2020-06-01 20:51:04 +02:00
1c9752b27d Made setLocalDescription() parameter optional 2020-06-01 20:43:38 +02:00
41220d3142 Fixed compilation with GnuTLS 2020-06-01 15:48:29 +02:00
10f5608d21 Merge branch 'master' into srtp 2020-06-01 15:40:29 +02:00
f10f48e8eb Cleaned up connectionInfo 2020-06-01 15:33:35 +02:00
85a20eead1 Merge branch 'master' into srtp 2020-06-01 15:28:07 +02:00
d0a1b2c7d4 Use plog as cmake library 2020-06-01 14:48:55 +02:00
177b3ea352 Cosmetic fixes 2020-06-01 12:39:49 +02:00
5368b1434e Merge pull request #82 from paullouisageneau/websocket-with-examples
WebSocket with examples
2020-06-01 11:24:54 +02:00
009e2e6767 Fixed TLS layer with OpenSSL 2020-06-01 11:13:36 +02:00
9425641f54 Fixed closed callback 2020-06-01 11:13:13 +02:00
17f99252cd clang-format does not support python 2020-06-01 09:28:22 +02:00
58ec90cccc Cleanup 2020-06-01 00:53:45 +02:00
9bb9725f4d Added WebSocket test 2020-06-01 00:44:12 +02:00
755b3e9dac Fixed TLS layer with GnuTLS 2020-06-01 00:43:41 +02:00
a47ddc5838 Fixed MSG_NOSIGNAL compatibility with MacOS 2020-05-31 23:18:05 +02:00
31be692f9d Reduced client random ID length to 4 2020-05-31 23:04:27 +02:00
a5a444cb11 Added some Readme info 2020-05-31 23:01:45 +02:00
284db56615 Bumped version to 0.5.1 2020-05-31 20:43:51 +02:00
d00fe79339 Added CMakeLists for copy-paste 2020-05-31 20:42:34 +02:00
4ad67cb8f9 Updated Readme 2020-05-31 20:36:57 +02:00
ea8cd06964 Converted web example to WebSocket signaling 2020-05-31 20:34:13 +02:00
46a3d58cb8 Fixed candidate lookup type corruption 2020-05-31 18:06:02 +02:00
534201b545 Moved web example 2020-05-31 18:02:28 +02:00
5ddafb3142 Example under GPLv2 2020-05-29 19:57:13 +02:00
8edad971ab Implemented example client with websocket 2020-05-29 19:41:24 +02:00
dd05e4b8ce Merge pull request #81 from paullouisageneau/workflow-macos
Add MacOS build to workflow
2020-05-28 16:07:57 +02:00
f57b860649 Changed to brew reinstall 2020-05-28 16:05:17 +02:00
24e7872695 Force OpenSSL version for brew 2020-05-28 15:46:54 +02:00
8348b70ee6 Fixed const qualifier issue with X509_NAME_add_entry_by_NID() 2020-05-28 15:42:44 +02:00
9a343d5301 Set OpenSSL env variables 2020-05-28 15:39:54 +02:00
c198ffd994 Added -j2 option to make 2020-05-28 15:35:58 +02:00
6eb92301fb Added macOS build to workflow 2020-05-28 15:33:55 +02:00
7a1e2f066e Merge branch 'master' into dev 2020-05-27 11:55:18 +02:00
22e71bd663 Bumped version to 0.5.0 2020-05-27 11:26:11 +02:00
9436757f73 Updated libjuice to v0.4.0 2020-05-27 11:25:21 +02:00
b3bba4286b Updated libjuice 2020-05-27 11:05:48 +02:00
f8df667a14 Created separate workflows for different backends 2020-05-27 11:04:34 +02:00
c18b1738b0 Merge pull request #79 from paullouisageneau/async-certificate
Asynchronous certificate generation
2020-05-27 10:38:32 +02:00
96501a8a68 Clear certificate cache on cleanup 2020-05-27 10:32:29 +02:00
3be2b0427f Replaced std::async call with custom thread invocation 2020-05-27 10:23:29 +02:00
5ae311c50a Made dependency on Threads public 2020-05-27 10:23:01 +02:00
7a2e0c267d Set flag CMAKE_THREAD_PREFER_PTHREAD 2020-05-27 10:23:01 +02:00
5e59186757 Made certificate generation async to reduce init delay 2020-05-26 15:33:19 +02:00
7f58fea963 Fixed client build 2020-05-25 23:49:30 +02:00
4adc13adec Cleaned up client 2020-05-25 23:46:34 +02:00
e5894af6f4 Merge branch 'dev' of github.com:paullouisageneau/libdatachannel into dev 2020-05-25 14:03:11 +02:00
46b0b36261 Moved examples 2020-05-25 12:59:54 +02:00
ac91789c04 Moved P2P C API example 2020-05-25 11:33:26 +02:00
9b9f1663b5 Re-added the copy-paste example 2020-05-25 11:32:07 +02:00
7c93c698da Merge pull request #64 from paullouisageneau/websocket
Add optional WebSocket with the same API
2020-05-25 11:27:08 +02:00
13b29ae6de Merge branch 'Focusrite-Novation-javascript' into dev 2020-05-25 11:23:31 +02:00
248400d804 Merge branch 'javascript' of https://github.com/Focusrite-Novation/libdatachannel-1 into Focusrite-Novation-javascript 2020-05-25 11:23:06 +02:00
72617b05c9 Fixed tabs 2020-05-25 11:13:44 +02:00
c5c9e24a01 Visual Studio std::min,max fix (#77)
Visual Studio std::min,max fix
2020-05-22 22:30:24 +02:00
2c953e77a9 Cleaned up leftover namespace std 2020-05-22 14:59:20 +02:00
ddb9f99ed6 Fixed call to usrsctp_finish() in Cleanup() 2020-05-22 14:55:01 +02:00
9c2b2c17f8 Fixed description parsing loop 2020-05-22 14:33:55 +02:00
36e6b46950 Keep init token in transport closing thread 2020-05-22 14:33:55 +02:00
5bdb1e1015 Ignore SCTP failure if media is present 2020-05-22 14:33:55 +02:00
fef0fb7140 Implemented SDP bundle negociation 2020-05-22 14:33:55 +02:00
36485110ef Only dealloc SRTP if created 2020-05-22 14:33:55 +02:00
6c3cecce41 Fixed missing RTC_MEDIA_SUPPORT guard 2020-05-22 14:33:55 +02:00
19f4801ebd Reordered includes 2020-05-22 14:33:55 +02:00
c74777b829 Moved libsrtp initialization to global init 2020-05-22 14:33:55 +02:00
c7829bc523 Changed SDP line log as verbose 2020-05-22 14:33:55 +02:00
b686502209 Removed warning when parsing SDP from libnice 2020-05-22 14:33:55 +02:00
091b7208b8 Prevent mid collision between media and data 2020-05-22 14:33:55 +02:00
4c917b2542 Fixed description parsing 2020-05-22 14:33:55 +02:00
532fec3d97 Added media methods and callback 2020-05-22 14:33:55 +02:00
0f29ccf1c6 Added hasMedia() and addMedia() 2020-05-22 14:33:55 +02:00
e52ec61cd2 Renamed mid() to dataMid() 2020-05-22 14:33:55 +02:00
e7cf4182ef Added FindSRTP.cmake 2020-05-22 14:33:55 +02:00
9204787677 Refactored SDP parsing and generation to handle media 2020-05-22 14:33:55 +02:00
d4c5ef8155 Fixed max message size getter 2020-05-22 14:33:55 +02:00
ffa9a15173 Implemented SRTP demultiplexing 2020-05-22 14:33:55 +02:00
8ffdf6a020 Added RTC_ENABLE_MEDIA guard 2020-05-22 14:33:55 +02:00
749ac31290 Mutualized gnutls and openssl helper functions 2020-05-22 14:33:55 +02:00
cbe3f655aa Fixed material length 2020-05-22 14:33:55 +02:00
2868a941e1 SRTP global init and cleanup 2020-05-22 14:33:55 +02:00
8aba3a1b52 Implemented DTLS-SRTP transport for OpenSSL (draft) 2020-05-22 14:33:55 +02:00
a7e23dd210 Implemented DTLS-SRTP transport for GnuTLS (draft) 2020-05-22 14:33:55 +02:00
edd04d896d Made messages mutable to prevent copy 2020-05-22 14:33:55 +02:00
5ca2c8355b Added SRTP transport outline 2020-05-22 14:33:55 +02:00
8a3fe4587f Added portable select interrupter 2020-05-22 14:33:17 +02:00
fe2d9ec4a0 Some refactoring 2020-05-22 14:33:17 +02:00
661137aa6e Made websocket use weak bind 2020-05-22 14:33:17 +02:00
a22ee2f52c Added install directive to CMakeLists 2020-05-22 14:33:17 +02:00
1a701c33b3 Renamed ENABLE_WEBSOCKET to RTC_ENABLE_WEBSOCKET 2020-05-22 14:33:17 +02:00
500e31befa Added ENABLE_WEBSOCKET=0 to Jamfile 2020-05-22 14:33:17 +02:00
4df1f50c1f Added ENABLE_WEBSOCKET to Makefile 2020-05-22 14:33:17 +02:00
ebd21a016b Added some logging 2020-05-22 14:33:17 +02:00
0d8aedfa01 Plumbing 2020-05-22 14:33:17 +02:00
03a48c1c09 Added WebSocket support to C API 2020-05-22 14:33:17 +02:00
adeaf5dedc Fixed TLS transport for OpenSSL 2020-05-22 14:33:17 +02:00
b74227ae9f Fixed ENABLE_WEBSOCKET guard 2020-05-22 14:33:17 +02:00
5d9ed26740 Implemented socket select interruption 2020-05-22 14:33:17 +02:00
a1b88be353 Added missing break after choosing a STUN server 2020-05-22 14:33:17 +02:00
c1f91b2fff Added WebSocket 2020-05-22 14:33:17 +02:00
b06b33234b Added WebSocket transport 2020-05-22 14:33:17 +02:00
2ce7138ab5 Added TLS transport for OpenSSL 2020-05-22 14:33:17 +02:00
bc9df9ba72 Added TLS transport for GnuTLS 2020-05-22 14:33:17 +02:00
d3a2a88301 Added TCP transport 2020-05-22 14:33:17 +02:00
2500a64db2 Cosmetic fixes 2020-05-22 14:33:17 +02:00
3a737e940c Enhanced handling of usrsctp shutdown 2020-05-22 14:32:53 +02:00
258135d070 Fixed uninitialized mGatheringState 2020-05-20 22:42:41 +02:00
6302d995f7 Moved gnutls_bye() in thread 2020-05-19 21:24:44 +02:00
6a7296d40d Updated Jamfile to allow GnuTLS 2020-05-17 23:13:30 +02:00
88c88bbaf5 Moved SCTP compile definition 2020-05-17 19:49:03 +02:00
c525c4b3f8 Updated libjuice 2020-05-17 16:22:35 +02:00
2c58fd7659 Loosened write lock to prevent usrsctp deadlock 2020-05-15 16:42:31 +02:00
d0f91d5cf4 Unregister transport recv callback on destruction instead of on stop 2020-05-15 16:04:34 +02:00
90ce154e15 Updated libjuice 2020-05-15 15:06:32 +02:00
b956e45f33 Fixed name on license headers 2020-05-15 09:59:41 +02:00
be1013fe7a Added missing license headers 2020-05-14 21:13:53 +02:00
d123041180 Merge branch 'dev' 2020-05-14 21:07:22 +02:00
b5511f71a5 Updated libjuice to fix #71 2020-05-14 21:02:31 +02:00
8e08ba1a29 Merge pull request #65 from stevedanOgochu/master
Adds a p2p version in c
2020-05-14 16:31:38 +02:00
3713b520db Fixed compilation warning 2020-05-14 15:39:49 +02:00
8c03c24e03 Build on pull request 2020-05-14 15:09:21 +02:00
86b9bace53 Merge pull request #70 from paullouisageneau/fix-incoming-race
Fix possible race condition on Transport::incoming()
2020-05-14 14:57:14 +02:00
049d339554 Changed IceTransport::incoming() to default transport method 2020-05-14 12:28:24 +02:00
e86ecc2c97 Unregister recv callback before stopping nice agent 2020-05-14 12:21:24 +02:00
de51b9adc7 Fixed cmake warning 2020-05-14 10:52:32 +02:00
0f0047729b Small fixes to synchronized_callback 2020-05-14 10:51:30 +02:00
2729b247fa Fixed possible race condition on Transport::incoming() 2020-05-14 10:46:06 +02:00
32800c1c1c Update offerer.c 2020-05-13 21:17:25 +02:00
f153e2c795 Update answerer.c
Fixing format
2020-05-13 20:56:33 +02:00
cb79ec0023 Update offerer.c
Fixing format
2020-05-13 20:55:50 +02:00
3b98c9d1ec Update offerer.c 2020-05-13 20:27:16 +02:00
e075e9a7ec Update answerer.c 2020-05-13 20:24:29 +02:00
c89163610b Update answerer.c 2020-05-13 19:36:12 +02:00
c0edf3bfde Update offerer.c 2020-05-13 18:26:58 +02:00
c0470d813f Update offerer.c 2020-05-13 18:16:22 +02:00
a61c173b8c Update answerer.c 2020-05-13 18:15:08 +02:00
980c456de8 Adds a p2p version in c 2020-05-13 17:49:20 +02:00
8530b20dbe Updated libjuice 2020-05-13 12:50:31 +02:00
3db8f0473b Updated libjuice 2020-05-12 14:04:42 +02:00
74dd9e3b74 Node version of server and some styling 2020-05-10 16:45:24 +01:00
9546834605 Merge pull request #61 from paullouisageneau/refactor-openssl
Manually handle OpenSSL handshake timeout
2020-05-06 15:31:42 +02:00
e97efaf38d Cleanup 2020-05-04 14:27:50 +02:00
61d0f6ef73 Changed GnuTLS timeouts in accordance 2020-05-04 14:01:34 +02:00
cea564ddb3 Handle handshake timeout manually for OpenSSL 2020-05-04 12:55:47 +02:00
738cbe78a0 More realiable tests 2020-05-04 12:18:04 +02:00
b9102a156a Refactored OpenSSL loop 2020-05-04 12:18:02 +02:00
306c1a3ab6 Updated libjuice 2020-05-04 09:52:25 +02:00
bbf7119c85 Merge pull request #59 from paullouisageneau/fix-openssl-handshake-timeout
Add error checking on DTLSv1_get_timeout()
2020-05-03 19:33:46 +02:00
d6de29f7e0 Added error checking on DTLSv1_get_timeout() 2020-05-03 16:40:23 +02:00
a40a89ced8 Updated libjuice 2020-05-03 16:32:35 +02:00
b81eb92f96 Merge pull request #57 from paullouisageneau/fix-openssl-write
Fix OpenSSL write failure under load
2020-05-02 23:01:20 +02:00
85dd5b067e Fixed write BIO failure on outgoing dropped 2020-05-02 22:50:29 +02:00
6e647e64b1 Merge pull request #55 from murat-dogan/master
define WIN32_LEAN_AND_MEAN in CMakeLists.txt
2020-05-01 15:05:35 +02:00
836c7c8504 define WIN32_LEAN_AND_MEAN in CMakeLists.txt 2020-05-01 14:26:42 +03:00
b2baabd76d Merge pull request #54 from murat-dogan/master
TurnTls as default relayType for turns
2020-04-28 18:21:27 +02:00
199db5f310 TurnTls as default relayType for turns 2020-04-28 18:40:28 +03:00
5dd8826bf9 Updated libjuice to v0.3.0 2020-04-28 15:46:06 +02:00
0f934aca8c Merge pull request #53 from murat-dogan/master
proxy support
2020-04-28 14:44:05 +02:00
3e7ee70b7e Add ProxyServer constructor 2020-04-28 15:14:55 +03:00
44361714a5 proxyServer param as optional 2020-04-28 14:36:37 +03:00
56bd8c98b3 proxy support 2020-04-27 19:06:43 +03:00
49d509f2d1 Updated libjuice 2020-04-27 11:02:35 +02:00
d446f49d5f Merge pull request #50 from murat-dogan/stats
Stats
2020-04-27 10:59:02 +02:00
070582d87a rtt as optional & delete const 2020-04-27 11:25:48 +03:00
9f4a265ef0 fix rtt & bytes received 2020-04-26 21:41:36 +03:00
2e33fef88d Merge branch 'master' of https://github.com/paullouisageneau/libdatachannel into stats 2020-04-26 21:13:25 +03:00
39392c52a7 Merge pull request #49 from murat-dogan/master
Do not free candidate memory
2020-04-26 19:00:30 +02:00
cd343cd9ea provide socket address 2020-04-26 19:34:52 +03:00
9f305a6b01 Do not free candidate memory 2020-04-26 17:17:34 +03:00
dee0074270 reviews 2020-04-26 17:16:12 +03:00
9e36b5f4d6 Merge branch 'master' of https://github.com/paullouisageneau/libdatachannel into stats 2020-04-26 16:46:17 +03:00
17ba9af2e1 Fixed compilation with libjuice 2020-04-26 15:07:15 +02:00
7c667cafee Merge pull request #47 from murat-dogan/master
Get Selected Candidate Pair Info
2020-04-26 15:00:06 +02:00
782efabaea pull upstream 2020-04-26 15:38:21 +03:00
011d1199a2 Merge branch 'master' of https://github.com/paullouisageneau/libdatachannel into stats 2020-04-26 15:37:24 +03:00
94561ec7e5 Stats initial commit 2020-04-26 15:33:30 +03:00
6173d18da4 Camel case fix 2020-04-26 14:42:06 +03:00
1226d99c72 Merge pull request #48 from paullouisageneau/port-range
Support for port range with libjuice
2020-04-26 12:23:12 +02:00
67218d8e23 Cleanup double iceServers example line 2020-04-26 12:16:33 +02:00
20d1a03380 Added support for port range with libjuice 2020-04-26 12:14:10 +02:00
dffca48e69 Change string types to enum 2020-04-26 12:44:12 +03:00
fc595fd1bb Get Selected Candidate Pair Info 2020-04-25 22:48:51 +03:00
076cf00b8f Updated libjuice 2020-04-22 10:43:13 +02:00
a78bc9cff3 Updated libjuice 2020-04-21 13:54:05 +02:00
9ed4386e0c Use weak pointers for state callbacks 2020-04-02 23:16:38 +02:00
89655ff749 Weak bind transport callbacks for safety 2020-03-31 17:55:23 +02:00
c767e82d64 Revised transports stop method 2020-03-31 16:57:10 +02:00
ed30fd9dfb Fixed data channels shared lock usage 2020-03-31 15:49:32 +02:00
c39a4ee6c5 More tolerant wait time for tests 2020-03-31 15:22:07 +02:00
e04113f3f1 Fixed state callback and revised synchronization and deletion 2020-03-31 14:59:50 +02:00
577d048844 Remove useless init mutex 2020-03-29 22:57:04 +02:00
70cb347f3b Fixed notifications handling by setting SCTP_FRAGMENT_INTERLEAVE to 0 2020-03-29 11:29:34 +02:00
89def5120b Updated libjuice 2020-03-26 17:05:22 +01:00
327085ac50 Updated libjuice to v0.2.9 2020-03-26 16:25:55 +01:00
a6502c95c5 Bumped version to 0.4.9 2020-03-26 16:13:02 +01:00
c717b65243 Made DataChannel only keep a weak reference on PeerConnection 2020-03-26 16:10:13 +01:00
80e2115a7b Cleaned up old WSAInit call for Win32 2020-03-26 15:26:32 +01:00
6881e85071 Moved all global initialization to Init singleton 2020-03-26 15:12:11 +01:00
e5539c02fe Do not remove closed data channel from peer connection 2020-03-26 12:20:09 +01:00
920189e2bb Fixed process notification switch and added verbose logging 2020-03-25 23:03:52 +01:00
1ea4fad7c8 Replaced flush() by safeFlush() in SCTP transport destructor 2020-03-25 18:54:36 +01:00
15e986ebfe Fixed buffered amount computation 2020-03-25 11:20:32 +01:00
ea8d1317ee Implemented DTLS retransmissions with OpenSSL 2020-03-24 17:21:22 +01:00
345e7ee9b0 Added -Wno-error=format-truncation to usrsctp compilation 2020-03-24 10:55:39 +01:00
79111c9b77 A bit of coloring in 2020-03-19 16:53:51 +00:00
3b15363db8 Added install directive to CMakeLists 2020-03-19 10:52:19 +01:00
f3954c8742 Clean up the web front end a little 2020-03-17 23:01:40 +00:00
398df813e4 Change connection info to a csv 2020-03-17 22:51:43 +00:00
de52f0101d Updated libjuice 2020-03-17 16:26:39 +01:00
a74f9419a0 Bumped version to 0.4.8 2020-03-16 15:06:32 +01:00
9d8394eddf Updated libjuice to v0.2.8 2020-03-16 15:05:37 +01:00
2594e8f5d7 it still works - 2s timeout 2020-03-12 15:57:03 +00:00
4e843b0267 it works 2020-03-12 15:52:56 +00:00
d7dd7c49df string instead of json 2020-03-12 15:45:26 +00:00
b8ef343de3 Remove string splitting 2020-03-12 15:43:09 +00:00
838e8aba7a Offerer listens to server 2020-03-12 15:39:53 +00:00
3a8ac794aa Establish handshake over rust server 2020-03-12 15:07:39 +00:00
d1602a2406 Add cors support to rust server 2020-03-12 15:07:39 +00:00
1325d77534 Send data over url instead of json text box 2020-03-12 15:07:39 +00:00
c8f622f709 Generate URL in observer 2020-03-12 14:46:23 +00:00
07206da92c Add webrtc_server 2020-03-12 14:16:02 +00:00
17e4def5ee Add basic js implementation 2020-03-12 13:28:28 +00:00
978d3e4d09 Added missing free 2020-03-10 13:59:14 +01:00
becdaaa25b Bumped version to 0.4.7 2020-03-10 12:28:25 +01:00
b6f2176be8 Merge pull request #41 from paullouisageneau/c-api
C API update and fixes
2020-03-10 11:09:22 +00:00
f7f83aa519 Added C API test link 2020-03-10 12:04:29 +01:00
64e8957c54 Removed -g 2020-03-10 12:01:31 +01:00
f3b3208367 Added shared mutex to protect data channels map 2020-03-10 12:00:27 +01:00
ed28460e80 Added local and remote address getters to C API 2020-03-10 12:00:27 +01:00
7b5b12617d Switched libjuice debug output as verbose 2020-03-10 12:00:27 +01:00
be04d8037e Added tests for C API 2020-03-10 12:00:27 +01:00
56198372fd Pass user pointer to data channel 2020-03-10 12:00:27 +01:00
29ffb34fe8 Added missing functions to C API 2020-03-10 12:00:27 +01:00
834ea9b041 Split and cleaned up tests 2020-03-10 12:00:27 +01:00
9441f78494 Added WSAStartup call in PeerConnection and cleaned up includes 2020-03-10 12:00:27 +01:00
3367eba4fe Moved log to its own header and prevented multiple log init 2020-03-10 12:00:27 +01:00
6507542a80 Updated libjuice to v0.2.7 2020-03-10 12:00:27 +01:00
fea3297a57 Merge pull request #40 from paullouisageneau/macos
MacOS support
2020-03-10 11:00:06 +00:00
f322ab00ec Fixed includes for MacOS 2020-03-05 16:17:20 +01:00
b6374b9d07 Updated libjuice to v0.2.6 2020-03-05 16:17:20 +01:00
70fd54804d Cleanup CMakeLists 2020-03-05 16:17:00 +01:00
ff268aee60 Renamed workflow 2020-03-04 16:28:44 +01:00
91a5c608d7 Fix build.yml 2020-03-04 16:15:29 +01:00
682be73eab Update build.yml 2020-03-04 16:13:36 +01:00
fd4a6fef7f Update build.yml 2020-03-04 16:10:48 +01:00
05a06f47b0 Update build.yml 2020-03-04 16:09:17 +01:00
8e3de8a07a Create build.yml 2020-03-04 16:07:53 +01:00
dc065add0b Bumped version to 0.4.5 2020-02-27 14:06:02 +01:00
e64d4049a6 Updated libjuice to v0.2.5 2020-02-27 14:05:33 +01:00
cb3bc85474 Fixed && instead of || when EWOULDBLOCK != EAGAIN #38 2020-02-26 14:45:39 +01:00
7af3da7872 Revised handling of path MTU discovery to exclude Mac OS 2020-02-26 09:15:42 +01:00
3c77d717d2 Explicitely added COMP-NULL to GnuTLS priorities 2020-02-25 00:17:06 +01:00
6f399945fe Updated libjuice 2020-02-25 00:02:05 +01:00
c8b14b1262 Change state to failed if a transport initialization fails 2020-02-24 23:53:10 +01:00
35d4455c4f Cleaned up tests and fixed SDP reading from console 2020-02-24 11:45:36 +01:00
7d21b4b42b Guess the description type from the context (useful for tests) 2020-02-24 11:39:11 +01:00
24e9e06c5a Bumped version to 0.4.4 2020-02-23 17:30:27 +01:00
443a19d8e7 Updated libjuice to v0.2.4 with better host candidates gathering 2020-02-23 17:24:47 +01:00
83de743924 Bumped version to 0.4.3 2020-02-21 12:39:27 +01:00
1dc1de4b86 Added platforms to Readme 2020-02-21 12:39:27 +01:00
8ca7722d48 Updated libjuice to v0.2.3 with Windows compilation support 2020-02-21 12:39:25 +01:00
3079072e63 For Win32, define _WIN32_WINNT to 0x0601 (Windows 7) if undefined 2020-02-21 00:04:57 +01:00
982d1c10e1 Merge pull request #35 from murat-dogan/master
Compile support on Windows with mingw-w64
2020-02-20 22:53:15 +00:00
50b22bbf3c delete win32 directive 2020-02-20 21:06:54 +03:00
93e153398f Compile support on Windows with mingw-w64 2020-02-20 14:55:21 +03:00
be6470d8bc Version 0.4.2 2020-02-06 11:42:03 +01:00
8a92c97058 Updated libjuice to v0.2.2 2020-02-06 11:36:01 +01:00
93da605230 Changed usrsctp submodule origin to sctplab/usrsctp 2020-01-29 11:24:11 +01:00
ff0f409d80 Added instructions to build with Makefile 2020-01-22 11:12:46 +01:00
a483e8135b Correct URL for libnice 2020-01-22 10:55:17 +01:00
36e4fdce1e Fixed and updated usrsctp then removed the usrsctp cmake hack 2020-01-22 10:54:21 +01:00
2590 changed files with 24699 additions and 2266 deletions

View File

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

View File

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

3
.github/FUNDING.yml vendored Normal file
View File

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

6
.github/dependabot.yml vendored Normal file
View File

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

37
.github/workflows/build-gnutls.yml vendored Normal file
View File

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

38
.github/workflows/build-nice.yml vendored Normal file
View File

@ -0,0 +1,38 @@
name: Build with libnice
on:
push:
branches:
- master
pull_request:
branches:
- master
jobs:
build-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 -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
run: ./build/tests

59
.github/workflows/build-openssl.yml vendored Normal file
View File

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

5
.gitignore vendored
View File

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

12
.gitmodules vendored
View File

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

View File

@ -1,20 +1,48 @@
cmake_minimum_required (VERSION 3.7)
project (libdatachannel
DESCRIPTION "WebRTC Data Channels Library"
VERSION 0.4.0
cmake_minimum_required(VERSION 3.7)
project(libdatachannel
VERSION 0.11.3
LANGUAGES CXX)
set(PROJECT_DESCRIPTION "WebRTC Data Channels Library")
# Options
option(USE_GNUTLS "Use GnuTLS instead of OpenSSL" OFF)
option(USE_JUICE "Use libjuice instead of libnice" OFF)
option(USE_NICE "Use libnice instead of libjuice" 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)
option(NO_TESTS "Disable tests build" OFF)
option(WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
option(RSA_KEY_BITS_2048 "Use 2048-bit RSA key instead of 3072-bit" OFF)
option(CAPI_STDCALL "Set calling convention of C API callbacks stdcall" OFF)
if(USE_NICE)
option(USE_JUICE "Use libjuice" OFF)
else()
option(USE_JUICE "Use libjuice" ON)
endif()
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)
add_definitions(-DNOMINMAX)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)
endif()
endif()
set(LIBDATACHANNEL_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/candidate.cpp
@ -23,84 +51,226 @@ set(LIBDATACHANNEL_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/configuration.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/datachannel.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/description.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/dtlssrtptransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/dtlstransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/icetransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/init.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/log.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/message.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/peerconnection.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/rtc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/logcounter.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/rtcpreceivingsession.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/sctptransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/threadpool.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/tls.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/track.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/processor.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/capi.cpp
${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
)
set(LIBDATACHANNEL_PRIVATE_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/src/certificate.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/dtlssrtptransport.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/dtlstransport.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/icetransport.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/logcounter.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/sctptransport.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/threadpool.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/tls.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/processor.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/transport.hpp
)
set(LIBDATACHANNEL_WEBSOCKET_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/base64.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/tcptransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/tlstransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/verifiedtlstransport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/websocket.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/wstransport.cpp
)
set(LIBDATACHANNEL_WEBSOCKET_PRIVATE_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/src/base64.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/tcptransport.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/tlstransport.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/verifiedtlstransport.hpp
${CMAKE_CURRENT_SOURCE_DIR}/src/wstransport.hpp
)
set(LIBDATACHANNEL_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/candidate.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/channel.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/configuration.hpp
${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/mediahandler.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/rtcpreceivingsession.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/include.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/init.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/log.hpp
${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
)
set(TESTS_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/test/main.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test/connectivity.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_OFFERER_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/test/p2p/offerer.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(TESTS_ANSWERER_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/test/p2p/answerer.cpp
)
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)
# Hack because usrsctp uses CMAKE_SOURCE_DIR instead of CMAKE_CURRENT_SOURCE_DIR
set(CMAKE_REQUIRED_FLAGS "-I${CMAKE_CURRENT_SOURCE_DIR}/deps/usrsctp/usrsctplib")
add_subdirectory(deps/usrsctp EXCLUDE_FROM_ALL)
# Set include directory and custom options to make usrsctp compile with recent g++
target_include_directories(usrsctp-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/usrsctp/usrsctplib)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# using regular Clang or AppleClang: Needed since they don't have -Wno-error=format-truncation
target_compile_options(usrsctp-static PRIVATE -Wno-error=address-of-packed-member)
else()
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.0")
# GCC version below 9.0 does not support option address-of-packed-member
target_compile_options(usrsctp-static PRIVATE -Wno-error=format-truncation)
else()
target_compile_options(usrsctp-static PRIVATE -Wno-error=address-of-packed-member -Wno-error=format-truncation)
endif()
else()
# all other compilers
target_compile_options(usrsctp-static PRIVATE -Wno-error=address-of-packed-member -Wno-error=format-truncation)
endif()
endif()
add_library(Usrsctp::Usrsctp ALIAS usrsctp)
add_library(Usrsctp::UsrsctpStatic ALIAS usrsctp-static)
set(THREADS_PREFER_PTHREAD_FLAG ON)
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads REQUIRED)
add_library(datachannel SHARED ${LIBDATACHANNEL_SOURCES})
set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
add_subdirectory(deps/plog)
option(sctp_build_programs 0)
option(sctp_build_shared_lib 0)
add_subdirectory(deps/usrsctp EXCLUDE_FROM_ALL)
if (MSYS OR MINGW)
target_compile_definitions(usrsctp PUBLIC -DSCTP_STDINT_INCLUDE=<stdint.h>)
endif()
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation)
endif()
add_library(Usrsctp::Usrsctp ALIAS usrsctp)
if (NO_WEBSOCKET)
add_library(datachannel SHARED
${LIBDATACHANNEL_SOURCES}
${LIBDATACHANNEL_PRIVATE_HEADERS}
${LIBDATACHANNEL_HEADERS})
add_library(datachannel-static STATIC EXCLUDE_FROM_ALL
${LIBDATACHANNEL_SOURCES}
${LIBDATACHANNEL_PRIVATE_HEADERS}
${LIBDATACHANNEL_HEADERS})
target_compile_definitions(datachannel PUBLIC RTC_ENABLE_WEBSOCKET=0)
target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_WEBSOCKET=0)
else()
add_library(datachannel SHARED
${LIBDATACHANNEL_SOURCES}
${LIBDATACHANNEL_PRIVATE_HEADERS}
${LIBDATACHANNEL_WEBSOCKET_SOURCES}
${LIBDATACHANNEL_WEBSOCKET_PRIVATE_HEADERS}
${LIBDATACHANNEL_HEADERS})
add_library(datachannel-static STATIC EXCLUDE_FROM_ALL
${LIBDATACHANNEL_SOURCES}
${LIBDATACHANNEL_PRIVATE_HEADERS}
${LIBDATACHANNEL_WEBSOCKET_SOURCES}
${LIBDATACHANNEL_WEBSOCKET_PRIVATE_HEADERS}
${LIBDATACHANNEL_HEADERS})
target_compile_definitions(datachannel PUBLIC RTC_ENABLE_WEBSOCKET=1)
target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_WEBSOCKET=1)
endif()
set_target_properties(datachannel PROPERTIES
VERSION ${PROJECT_VERSION}
CXX_STANDARD 17)
set_target_properties(datachannel-static PROPERTIES
VERSION ${PROJECT_VERSION}
CXX_STANDARD 17)
target_include_directories(datachannel PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
target_include_directories(datachannel PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/plog/include)
target_link_libraries(datachannel
Threads::Threads
Usrsctp::UsrsctpStatic
)
add_library(datachannel-static STATIC EXCLUDE_FROM_ALL ${LIBDATACHANNEL_SOURCES})
set_target_properties(datachannel-static PROPERTIES
VERSION ${PROJECT_VERSION}
CXX_STANDARD 17)
target_link_libraries(datachannel PUBLIC Threads::Threads plog::plog)
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_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/plog/include)
target_link_libraries(datachannel-static
Threads::Threads
Usrsctp::UsrsctpStatic
)
target_link_libraries(datachannel-static PUBLIC Threads::Threads plog::plog)
target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp)
if(WIN32)
target_link_libraries(datachannel PUBLIC ws2_32) # winsock2
target_link_libraries(datachannel-static PUBLIC ws2_32) # winsock2
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)
set_target_properties(SRTP::SRTP PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${SRTP_INCLUDE_DIRS}
IMPORTED_LINK_INTERFACE_LANGUAGES C
IMPORTED_LOCATION ${SRTP_LIBRARIES})
endif()
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()
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)
find_package(GnuTLS REQUIRED)
@ -109,60 +279,108 @@ if (USE_GNUTLS)
set_target_properties(GnuTLS::GnuTLS PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${GNUTLS_INCLUDE_DIRS}"
INTERFACE_COMPILE_DEFINITIONS "${GNUTLS_DEFINITIONS}"
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
IMPORTED_LINK_INTERFACE_LANGUAGES C
IMPORTED_LOCATION "${GNUTLS_LIBRARIES}")
endif()
target_compile_definitions(datachannel PRIVATE USE_GNUTLS=1)
target_link_libraries(datachannel GnuTLS::GnuTLS)
target_compile_definitions(datachannel-static PRIVATE USE_GNUTLS=1)
target_link_libraries(datachannel-static GnuTLS::GnuTLS)
target_link_libraries(datachannel PRIVATE GnuTLS::GnuTLS)
target_link_libraries(datachannel-static PRIVATE GnuTLS::GnuTLS)
else()
find_package(OpenSSL REQUIRED)
target_compile_definitions(datachannel PRIVATE USE_GNUTLS=0)
target_link_libraries(datachannel OpenSSL::SSL)
target_compile_definitions(datachannel-static PRIVATE USE_GNUTLS=0)
target_link_libraries(datachannel-static OpenSSL::SSL)
target_link_libraries(datachannel PRIVATE OpenSSL::SSL)
target_link_libraries(datachannel-static PRIVATE OpenSSL::SSL)
endif()
if (USE_JUICE)
add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL)
target_compile_definitions(datachannel PRIVATE USE_JUICE=1)
target_link_libraries(datachannel LibJuice::LibJuiceStatic)
target_compile_definitions(datachannel-static PRIVATE USE_JUICE=1)
target_link_libraries(datachannel-static LibJuice::LibJuiceStatic)
else()
if (USE_NICE OR NOT USE_JUICE)
find_package(LibNice REQUIRED)
target_compile_definitions(datachannel PRIVATE USE_JUICE=0)
target_link_libraries(datachannel LibNice::LibNice)
target_compile_definitions(datachannel-static PRIVATE USE_JUICE=0)
target_link_libraries(datachannel-static LibNice::LibNice)
target_compile_definitions(datachannel PRIVATE USE_NICE=1)
target_compile_definitions(datachannel-static PRIVATE USE_NICE=1)
target_link_libraries(datachannel PRIVATE LibNice::LibNice)
target_link_libraries(datachannel-static PRIVATE LibNice::LibNice)
else()
add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL)
target_compile_definitions(datachannel PRIVATE USE_NICE=0)
target_compile_definitions(datachannel-static PRIVATE USE_NICE=0)
target_link_libraries(datachannel PRIVATE LibJuice::LibJuiceStatic)
target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuiceStatic)
endif()
if(RSA_KEY_BITS_2048)
target_compile_definitions(datachannel PUBLIC RSA_KEY_BITS_2048)
target_compile_definitions(datachannel-static PUBLIC RSA_KEY_BITS_2048)
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)
# Main Test
add_executable(datachannel-tests ${TESTS_SOURCES})
set_target_properties(datachannel-tests PROPERTIES
VERSION ${PROJECT_VERSION}
CXX_STANDARD 17)
set_target_properties(datachannel-tests PROPERTIES OUTPUT_NAME tests)
target_include_directories(datachannel-tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
target_link_libraries(datachannel-tests datachannel)
install(TARGETS datachannel LIBRARY DESTINATION lib)
install(FILES ${LIBDATACHANNEL_HEADERS} DESTINATION include/rtc)
# P2P Test: offerer
add_executable(datachannel-offerer ${TESTS_OFFERER_SOURCES})
set_target_properties(datachannel-offerer PROPERTIES
VERSION ${PROJECT_VERSION}
CXX_STANDARD 17)
set_target_properties(datachannel-offerer PROPERTIES OUTPUT_NAME offerer)
target_link_libraries(datachannel-offerer datachannel)
if(NOT MSVC)
target_compile_options(datachannel PRIVATE -Wall -Wextra)
target_compile_options(datachannel-static PRIVATE -Wall -Wextra)
endif()
# P2P Test: answerer
add_executable(datachannel-answerer ${TESTS_ANSWERER_SOURCES})
set_target_properties(datachannel-answerer PROPERTIES
VERSION ${PROJECT_VERSION}
CXX_STANDARD 17)
set_target_properties(datachannel-answerer PROPERTIES OUTPUT_NAME datachannel)
target_link_libraries(datachannel-answerer datachannel)
if(WARNINGS_AS_ERRORS)
if(MSVC)
target_compile_options(datachannel PRIVATE /WX)
target_compile_options(datachannel-static PRIVATE /WX)
else()
target_compile_options(datachannel PRIVATE -Werror)
target_compile_options(datachannel-static PRIVATE -Werror)
endif()
endif()
# 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-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()
# Examples
if(NOT NO_EXAMPLES AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(JSON_BuildTests OFF CACHE INTERNAL "")
add_subdirectory(deps/json)
add_subdirectory(examples/client)
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()

229
Jamfile
View File

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

View File

@ -4,12 +4,13 @@ NAME=libdatachannel
CXX=$(CROSS)g++
AR=$(CROSS)ar
RM=rm -f
CPPFLAGS=-O2 -pthread -fPIC -Wall -Wno-address-of-packed-member
CXXFLAGS=-std=c++17
CPPFLAGS=-O2 -pthread -fPIC -Wall
LDFLAGS=-pthread
LIBS=
LOCALLIBS=libusrsctp.a
USRSCTP_DIR=deps/usrsctp
SRTP_DIR=deps/libsrtp
JUICE_DIR=deps/libjuice
PLOG_DIR=deps/plog
@ -25,25 +26,51 @@ else
LIBS+=openssl
endif
USE_JUICE ?= 0
ifneq ($(USE_JUICE), 0)
CPPFLAGS+=-DUSE_JUICE=1
USE_NICE ?= 0
ifneq ($(USE_NICE), 0)
CPPFLAGS+=-DUSE_NICE=1
LIBS+=glib-2.0 gobject-2.0 nice
else
CPPFLAGS+=-DUSE_NICE=0
INCLUDES+=-I$(JUICE_DIR)/include
LOCALLIBS+=libjuice.a
ifneq ($(USE_GNUTLS), 0)
LIBS+=nettle
endif
else
CPPFLAGS+=-DUSE_JUICE=0
LIBS+=glib-2.0 gobject-2.0 nice
endif
INCLUDES+=$(shell pkg-config --cflags $(LIBS))
LDLIBS+=$(LOCALLIBS) $(shell pkg-config --libs $(LIBS))
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
else
CPPFLAGS+=-DRTC_ENABLE_WEBSOCKET=0
endif
INCLUDES+=$(if $(LIBS),$(shell pkg-config --cflags $(LIBS)),)
LDLIBS+=$(LOCALLIBS) $(if $(LIBS),$(shell pkg-config --libs $(LIBS)),)
SRCS=$(shell printf "%s " src/*.cpp)
OBJS=$(subst .cpp,.o,$(SRCS))
TEST_SRCS=$(shell printf "%s " test/*.cpp)
TEST_OBJS=$(subst .cpp,.o,$(TEST_SRCS))
all: $(NAME).a $(NAME).so tests
src/%.o: src/%.cpp
@ -54,14 +81,14 @@ test/%.o: test/%.cpp
-include $(subst .cpp,.d,$(SRCS))
$(NAME).a: $(OBJS)
$(NAME).a: $(LOCALLIBS) $(OBJS)
$(AR) crf $@ $(OBJS)
$(NAME).so: $(LOCALLIBS) $(OBJS)
$(CXX) $(LDFLAGS) -shared -o $@ $(OBJS) $(LDLIBS)
tests: $(NAME).a test/main.o
$(CXX) $(LDFLAGS) -o $@ test/main.o $(NAME).a $(LDLIBS)
tests: $(NAME).a $(TEST_OBJS)
$(CXX) $(LDFLAGS) -o $@ $(TEST_OBJS) $(NAME).a $(LDLIBS)
clean:
-$(RM) include/rtc/*.d *.d
@ -78,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)" && \
./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

165
README.md
View File

@ -1,41 +1,139 @@
# libdatachannel - C/C++ WebRTC DataChannels
# libdatachannel - C/C++ WebRTC Data Channels
libdatachannel is a standalone implementation of WebRTC DataChannels in C++17 with C bindings. It enables direct connectivity between native applications and web browsers without the pain of importing the entire WebRTC stack. Its API is modelled as a simplified version of the JavaScript WebRTC API, in order to ease the design of cross-environment applications.
libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows. It enables direct connectivity between native applications and web browsers without the pain of importing the entire WebRTC stack. The interface consists of simplified versions of the JavaScript WebRTC and WebSocket APIs present in browsers, in order to ease the design of cross-environment applications.
It can be compiled with multiple backends:
- The security layer can be provided through [OpenSSL](https://www.openssl.org/) or [GnuTLS](https://www.gnutls.org/).
- The connectivity for WebRTC can be provided through my ad-hoc ICE library [libjuice](https://github.com/paullouisageneau/libjuice) as submodule or through [libnice](https://github.com/libnice/libnice).
This projet is originally inspired by [librtcdcpp](https://github.com/chadnickbok/librtcdcpp), however it is a complete rewrite from scratch, because the messy architecture of librtcdcpp made solving its implementation issues difficult.
The connectivity can be provided through my ad-hoc ICE library [libjuice](https://github.com/paullouisageneau/libjuice) as submodule or through [libnice](https://github.com/libnice/libnice). The security layer can be provided through [GnuTLS](https://www.gnutls.org/) or [OpenSSL](https://www.openssl.org/).
Licensed under LGPLv2, see [LICENSE](https://github.com/paullouisageneau/libdatachannel/blob/master/LICENSE).
## Compatibility
The library aims at fully implementing WebRTC SCTP DataChannels ([draft-ietf-rtcweb-data-channel-13](https://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-13)) over DTLS/UDP ([RFC7350](https://tools.ietf.org/html/rfc7350) and [RFC8261](https://tools.ietf.org/html/rfc8261)) with ICE ([RFC8445](https://tools.ietf.org/html/rfc8445)). It has been tested to be compatible with Firefox and Chromium. It supports IPv6 and Multicast DNS candidates resolution ([draft-ietf-rtcweb-mdns-ice-candidates-03](https://tools.ietf.org/html/draft-ietf-rtcweb-mdns-ice-candidates-03)) provided the operating system also supports it.
The library aims at implementing the following communication protocols:
### WebRTC Data Channels and Media Transport
The WebRTC stack has been tested to be compatible with Firefox and Chromium.
Protocol stack:
- SCTP-based Data Channels ([draft-ietf-rtcweb-data-channel-13](https://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-13))
- SRTP-based Media Transport ([draft-ietf-rtcweb-rtp-usage-26](https://tools.ietf.org/html/draft-ietf-rtcweb-rtp-usage-26))
- 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 ([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))
- Multicast DNS candidates ([draft-ietf-rtcweb-mdns-ice-candidates-04](https://tools.ietf.org/html/draft-ietf-rtcweb-mdns-ice-candidates-04))
- SRTP and SRTCP key derivation from DTLS ([RFC5764](https://tools.ietf.org/html/rfc5764))
- 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 ([draft-ietf-mmusic-sdp-bundle-negotiation-54](https://tools.ietf.org/html/draft-ietf-mmusic-sdp-bundle-negotiation-54)). The behavior is equivalent to the JSEP bundle-only policy: the library always negociates one unique network component, where SRTP media streams are multiplexed with SRTCP control packets ([RFC5761](https://tools.ietf.org/html/rfc5761)) and SCTP/DTLS data traffic ([RFC5764](https://tools.ietf.org/html/rfc5764)).
### WebSocket
WebSocket is the protocol of choice for WebRTC signaling. The support is optional and can be disabled at compile time.
Protocol stack:
- WebSocket protocol ([RFC6455](https://tools.ietf.org/html/rfc6455)), client-side only
- HTTP over TLS ([RFC2818](https://tools.ietf.org/html/rfc2818))
Features:
- IPv6 and IPv4/IPv6 dual-stack support
- Keepalive with ping/pong
## Dependencies
Dependencies:
- GnuTLS: https://www.gnutls.org/ or OpenSSL: https://www.openssl.org/
Optional:
- libnice: https://github.com/libnice/libnice (substituable with libjuice)
Submodules:
- usrsctp: https://github.com/sctplab/usrsctp
- libjuice: https://github.com/paullouisageneau/libjuice
- usrsctp: https://github.com/sctplab/usrsctp
- libsrtp: https://github.com/cisco/libsrtp
Optional dependencies:
- libnice: https://nice.freedesktop.org/ (if selected as ICE backend instead of libjuice)
- libsrtp: https://github.com/cisco/libsrtp (if selected instead of the submodule)
## Building
### Clone repository and submodules
```bash
$ git clone https://github.com/paullouisageneau/libdatachannel.git
$ cd libdatachannel
$ git submodule update --init --recursive
$ mkdir build
$ cd build
$ cmake -DUSE_JUICE=1 -DUSE_GNUTLS=1 ..
$ make
```
## Example
### Building with CMake
In the following example, note the callbacks are called in another thread.
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
```
### 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.
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
```
## 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/master/include/rtc/rtc.h).
### Signal a PeerConnection
@ -49,12 +147,12 @@ config.iceServers.emplace_back("mystunserver.org:3478");
auto pc = make_shared<rtc::PeerConnection>(config);
pc->onLocalDescription([](const rtc::Description &sdp) {
pc->onLocalDescription([](rtc::Description sdp) {
// Send the SDP to the remote peer
MY_SEND_DESCRIPTION_TO_REMOTE(string(sdp));
});
pc->onLocalCandidate([](const rtc::Candidate &candidate) {
pc->onLocalCandidate([](rtc::Candidate candidate) {
// Send the candidate to the remote peer
MY_SEND_CANDIDATE_TO_REMOTE(candidate.candidate(), candidate.mid());
});
@ -71,11 +169,11 @@ MY_ON_RECV_CANDIDATE_FROM_REMOTE([pc](string candidate, string mid) {
### Observe the PeerConnection state
```cpp
pc->onStateChanged([](PeerConnection::State state) {
pc->onStateChange([](PeerConnection::State state) {
cout << "State: " << state << endl;
});
pc->onGatheringStateChanged([](PeerConnection::GatheringState state) {
pc->onGatheringStateChange([](PeerConnection::GatheringState state) {
cout << "Gathering state: " << state << endl;
});
@ -85,10 +183,12 @@ pc->onGatheringStateChanged([](PeerConnection::GatheringState state) {
```cpp
auto dc = pc->createDataChannel("test");
dc->onOpen([]() {
cout << "Open" << 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;
}
@ -106,5 +206,28 @@ pc->onDataChannel([&dc](shared_ptr<rtc::DataChannel> incoming) {
```
See [test/main.cpp](https://github.com/paullouisageneau/libdatachannel/blob/master/test/main.cpp) for a complete local connection example.
### Open a WebSocket
```cpp
auto ws = make_shared<rtc::WebSocket>();
ws->onOpen([]() {
cout << "WebSocket open" << endl;
});
ws->onMessage([](variant<binary, string> message) {
if (holds_alternative<string>(message)) {
cout << "WebSocket received: " << get<string>(message) << endl;
}
});
ws->open("wss://my.websocket/service");
```
## External resources
- Rust wrapper for libdatachannel: [datachannel-rs](https://github.com/lerouxrgd/datachannel-rs)
- Node.js wrapper for libdatachannel: [node-datachannel](https://github.com/murat-dogan/node-datachannel)
- 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)

View File

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

View File

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

1
deps/json vendored Submodule

Submodule deps/json added at 973c52dd4a

2
deps/libjuice vendored

1
deps/libsrtp vendored Submodule

Submodule deps/libsrtp added at f379f48412

2
deps/plog vendored

Submodule deps/plog updated: 2931644689...afb6f6f0e8

2
deps/usrsctp vendored

16
examples/README.md Normal file
View File

@ -0,0 +1,16 @@
# Examples for libdatachannel
This directory contains different WebRTC clients and compatible WebSocket + JSON signaling servers.
- [client](client) uses libdatachannel to implement WebRTC Data Channels with WebSocket signaling
- [web](web) contains an equivalent implementation for web browsers and a node.js signaling server
- [signaling-server-python](signaling-server-python) contains a similar signaling server in Python
- [signaling-server-rust](signaling-server-rust) contains a similar signaling server in Rust (see [lerouxrgd/datachannel-rs](https://github.com/lerouxrgd/datachannel-rs) for Rust wrappers)
- [media](media) is a copy/paste demo to send the webcam from your browser into gstreamer.
- [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 main.cpp parse_cl.cpp parse_cl.h getopt.cpp getopt.h)
target_compile_definitions(datachannel-client PUBLIC STATIC_GETOPT)
else()
add_executable(datachannel-client main.cpp parse_cl.cpp parse_cl.h)
endif()
set_target_properties(datachannel-client PROPERTIES
CXX_STANDARD 17
OUTPUT_NAME client)
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()

339
examples/client/LICENSE Normal file
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.

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_

253
examples/client/main.cpp Normal file
View File

@ -0,0 +1,253 @@
/*
* libdatachannel client example
* Copyright (c) 2019-2020 Paul-Louis Ageneau
* Copyright (c) 2019 Murat Dogan
* Copyright (c) 2020 Will Munn
* Copyright (c) 2020 Nico Chatzi
* Copyright (c) 2020 Lara Mackey
* Copyright (c) 2020 Erik Cota-Robles
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; If not, see <http://www.gnu.org/licenses/>.
*/
#include "rtc/rtc.hpp"
#include "parse_cl.h"
#include <nlohmann/json.hpp>
#include <algorithm>
#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 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);
int main(int argc, char **argv) try {
auto params = std::make_unique<Cmdline>(argc, argv);
rtc::InitLogger(LogLevel::Info);
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();
while (true) {
string id;
cout << "Enter a remote ID to send an offer:" << endl;
cin >> id;
cin.ignore();
if (id.empty())
break;
if (id == localId)
continue;
cout << "Offering to " + id << endl;
auto pc = createPeerConnection(config, ws, id);
// We are the offerer, so create a data channel to initiate the process
const string label = "test";
cout << "Creating DataChannel with label \"" << label << "\"" << endl;
auto dc = pc->createDataChannel(label);
dc->onOpen([id, wdc = make_weak_ptr(dc)]() {
cout << "DataChannel from " << id << " open" << endl;
if (auto dc = wdc.lock())
dc->send("Hello from " + localId);
});
dc->onClosed([id]() { cout << "DataChannel from " << id << " closed" << endl; });
dc->onMessage([id, wdc = make_weak_ptr(dc)](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);
}
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;
dc->onClosed([id]() { cout << "DataChannel from " << id << " closed" << 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);
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,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

View File

@ -0,0 +1,27 @@
cmake_minimum_required(VERSION 3.5.1)
project(offerer C)
set(CMAKE_C_STANDARD 11)
add_executable(datachannel-copy-paste-capi-offerer offerer.c)
set_target_properties(datachannel-copy-paste-capi-offerer PROPERTIES
OUTPUT_NAME offerer)
target_link_libraries(datachannel-copy-paste-capi-offerer datachannel)
add_executable(datachannel-copy-paste-capi-answerer answerer.c)
set_target_properties(datachannel-copy-paste-capi-answerer PROPERTIES
OUTPUT_NAME answerer)
target_link_libraries(datachannel-copy-paste-capi-answerer datachannel)
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

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

View File

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

View File

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

View File

@ -0,0 +1,26 @@
cmake_minimum_required(VERSION 3.7)
add_executable(datachannel-copy-paste-offerer offerer.cpp)
set_target_properties(datachannel-copy-paste-offerer PROPERTIES
CXX_STANDARD 17
OUTPUT_NAME offerer)
target_link_libraries(datachannel-copy-paste-offerer datachannel)
add_executable(datachannel-copy-paste-answerer answerer.cpp)
set_target_properties(datachannel-copy-paste-answerer PROPERTIES
CXX_STANDARD 17
OUTPUT_NAME answerer)
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

@ -0,0 +1,157 @@
/**
* Copyright (c) 2019 Paul-Louis Ageneau, Murat Dogan
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "rtc/rtc.hpp"
#include <chrono>
#include <iostream>
#include <memory>
#include <thread>
using namespace rtc;
using namespace std;
template <class T> weak_ptr<T> make_weak_ptr(shared_ptr<T> ptr) { return ptr; }
int main(int argc, char **argv) {
rtc::InitLogger(LogLevel::Warning);
Configuration config;
// config.iceServers.emplace_back("stun.l.google.com:19302");
auto pc = std::make_shared<PeerConnection>(config);
pc->onLocalDescription([](Description description) {
cout << "Local Description (Paste this to the other peer):" << endl;
cout << string(description) << endl;
});
pc->onLocalCandidate([](Candidate candidate) {
cout << "Local Candidate (Paste this to the other peer after the local description):"
<< endl;
cout << string(candidate) << endl << endl;
});
pc->onStateChange(
[](PeerConnection::State state) { cout << "[State: " << state << "]" << endl; });
pc->onGatheringStateChange([](PeerConnection::GatheringState state) {
cout << "[Gathering State: " << state << "]" << endl;
});
shared_ptr<DataChannel> dc = nullptr;
pc->onDataChannel([&](shared_ptr<DataChannel> _dc) {
cout << "[Got a DataChannel with label: " << _dc->label() << "]" << endl;
dc = _dc;
dc->onClosed([&]() { cout << "[DataChannel closed: " << dc->label() << "]" << endl; });
dc->onMessage([](variant<binary, string> message) {
if (holds_alternative<string>(message)) {
cout << "[Received message: " << get<string>(message) << "]" << endl;
}
});
});
bool exit = false;
while (!exit) {
cout << endl
<< "**********************************************************************************"
"*****"
<< endl
<< "* 0: Exit /"
<< " 1: Enter remote description /"
<< " 2: Enter remote candidate /"
<< " 3: Send message /"
<< " 4: Print Connection Info *" << endl
<< "[Command]: ";
int command = -1;
cin >> command;
cin.ignore();
switch (command) {
case 0: {
exit = true;
break;
}
case 1: {
// Parse Description
cout << "[Description]: ";
string sdp, line;
while (getline(cin, line) && !line.empty()) {
sdp += line;
sdp += "\r\n";
}
std::cout << sdp;
pc->setRemoteDescription(sdp);
break;
}
case 2: {
// Parse Candidate
cout << "[Candidate]: ";
string candidate;
getline(cin, candidate);
pc->addRemoteCandidate(candidate);
break;
}
case 3: {
// Send Message
if (!dc || !dc->isOpen()) {
cout << "** Channel is not Open ** ";
break;
}
cout << "[Message]: ";
string message;
getline(cin, message);
dc->send(message);
break;
}
case 4: {
// Connection Info
if (!dc || !dc->isOpen()) {
cout << "** Channel is not Open ** ";
break;
}
Candidate local, remote;
std::optional<std::chrono::milliseconds> rtt = pc->rtt();
if (pc->getSelectedCandidatePair(&local, &remote)) {
cout << "Local: " << local << endl;
cout << "Remote: " << remote << endl;
cout << "Bytes Sent:" << pc->bytesSent()
<< " / Bytes Received:" << pc->bytesReceived() << " / Round-Trip Time:";
if (rtt.has_value())
cout << rtt.value().count();
else
cout << "null";
cout << " ms";
} else
cout << "Could not get Candidate Pair Info" << endl;
break;
}
default: {
cout << "** Invalid Command ** ";
break;
}
}
}
if (dc)
dc->close();
if (pc)
pc->close();
}

View File

@ -0,0 +1,157 @@
/**
* Copyright (c) 2019 Paul-Louis Ageneau, Murat Dogan
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "rtc/rtc.hpp"
#include <chrono>
#include <iostream>
#include <memory>
#include <thread>
using namespace rtc;
using namespace std;
template <class T> weak_ptr<T> make_weak_ptr(shared_ptr<T> ptr) { return ptr; }
int main(int argc, char **argv) {
rtc::InitLogger(LogLevel::Warning);
Configuration config;
// config.iceServers.emplace_back("stun.l.google.com:19302");
auto pc = std::make_shared<PeerConnection>(config);
pc->onLocalDescription([](Description description) {
cout << "Local Description (Paste this to the other peer):" << endl;
cout << string(description) << endl;
});
pc->onLocalCandidate([](Candidate candidate) {
cout << "Local Candidate (Paste this to the other peer after the local description):"
<< endl;
cout << string(candidate) << endl << endl;
});
pc->onStateChange(
[](PeerConnection::State state) { cout << "[State: " << state << "]" << endl; });
pc->onGatheringStateChange([](PeerConnection::GatheringState state) {
cout << "[Gathering State: " << state << "]" << endl;
});
auto dc = pc->createDataChannel("test"); // this is the offerer, so create a data channel
dc->onOpen([&]() { cout << "[DataChannel open: " << dc->label() << "]" << endl; });
dc->onClosed([&]() { cout << "[DataChannel closed: " << dc->label() << "]" << endl; });
dc->onMessage([](variant<binary, string> message) {
if (holds_alternative<string>(message)) {
cout << "[Received: " << get<string>(message) << "]" << endl;
}
});
this_thread::sleep_for(1s);
bool exit = false;
while (!exit) {
cout << endl
<< "**********************************************************************************"
"*****"
<< endl
<< "* 0: Exit /"
<< " 1: Enter remote description /"
<< " 2: Enter remote candidate /"
<< " 3: Send message /"
<< " 4: Print Connection Info *" << endl
<< "[Command]: ";
int command = -1;
cin >> command;
cin.ignore();
switch (command) {
case 0: {
exit = true;
break;
}
case 1: {
// Parse Description
cout << "[Description]: ";
string sdp, line;
while (getline(cin, line) && !line.empty()) {
sdp += line;
sdp += "\r\n";
}
pc->setRemoteDescription(sdp);
break;
}
case 2: {
// Parse Candidate
cout << "[Candidate]: ";
string candidate;
getline(cin, candidate);
pc->addRemoteCandidate(candidate);
break;
}
case 3: {
// Send Message
if (!dc->isOpen()) {
cout << "** Channel is not Open ** ";
break;
}
cout << "[Message]: ";
string message;
getline(cin, message);
dc->send(message);
break;
}
case 4: {
// Connection Info
if (!dc || !dc->isOpen()) {
cout << "** Channel is not Open ** ";
break;
}
Candidate local, remote;
std::optional<std::chrono::milliseconds> rtt = pc->rtt();
if (pc->getSelectedCandidatePair(&local, &remote)) {
cout << "Local: " << local << endl;
cout << "Remote: " << remote << endl;
cout << "Bytes Sent:" << pc->bytesSent()
<< " / Bytes Received:" << pc->bytesReceived() << " / Round-Trip Time:";
if (rtt.has_value())
cout << rtt.value().count();
else
cout << "null";
cout << " ms";
} else
cout << "Could not get Candidate Pair Info" << endl;
break;
}
default: {
cout << "** Invalid Command ** ";
break;
}
}
}
if (dc)
dc->close();
if (pc)
pc->close();
}

View File

@ -0,0 +1,15 @@
cmake_minimum_required(VERSION 3.7)
add_executable(datachannel-media main.cpp)
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->setRtcpHandler(session);
track->onMessage(
[session, sock, addr](rtc::binary message) {
// This is an RTP packet
sendto(sock, reinterpret_cast<const char *>(message.data()), int(message.size()), 0,
reinterpret_cast<const struct sockaddr *>(&addr), sizeof(addr));
},
nullptr);
pc->setLocalDescription();
std::cout << "Expect RTP video traffic on localhost:5000" << std::endl;
std::cout << "Please copy/paste the answer provided by the browser: " << std::endl;
std::string sdp;
std::getline(std::cin, sdp);
std::cout << "Got answer" << sdp << std::endl;
json j = json::parse(sdp);
rtc::Description answer(j["sdp"].get<std::string>(), j["type"].get<std::string>());
pc->setRemoteDescription(answer);
std::cout << "Press any key to exit." << std::endl;
std::cin >> sdp;
} catch (const std::exception &e) {
std::cerr << "Error: " << e.what() << std::endl;
}
}

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>

View File

@ -0,0 +1,15 @@
cmake_minimum_required(VERSION 3.7)
add_executable(datachannel-sfu-media main.cpp)
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->setRtcpHandler(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>

View File

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

View File

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

View File

@ -0,0 +1 @@
/target

940
examples/signaling-server-rust/Cargo.lock generated Normal file
View File

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

View File

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

View File

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

View File

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

View File

@ -0,0 +1,75 @@
/*
* libdatachannel streamer example
* Copyright (c) 2020 Filip Klembara (in2core)
*
* 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 "ArgParser.hpp"
#include <iostream>
ArgParser::ArgParser(std::vector<std::pair<std::string, std::string>> options, std::vector<std::pair<std::string, std::string>> flags) {
for(auto option: options) {
this->options.insert(option.first);
this->options.insert(option.second);
shortToLongMap.emplace(option.first, option.second);
shortToLongMap.emplace(option.second, option.second);
}
for(auto flag: flags) {
this->flags.insert(flag.first);
this->flags.insert(flag.second);
shortToLongMap.emplace(flag.first, flag.second);
shortToLongMap.emplace(flag.second, flag.second);
}
}
std::optional<std::string> ArgParser::toKey(std::string prefixedKey) {
if (prefixedKey.find("--") == 0) {
return prefixedKey.substr(2, prefixedKey.length());
} else if (prefixedKey.find("-") == 0) {
return prefixedKey.substr(1, prefixedKey.length());
} else {
return std::nullopt;
}
}
bool ArgParser::parse(int argc, char **argv, std::function<bool (std::string, std::string)> onOption, std::function<bool (std::string)> onFlag) {
std::optional<std::string> currentOption = std::nullopt;
for(int i = 1; i < argc; i++) {
std::string current = argv[i];
auto optKey = toKey(current);
if (!currentOption.has_value() && optKey.has_value() && flags.find(optKey.value()) != flags.end()) {
auto check = onFlag(shortToLongMap.at(optKey.value()));
if (!check) {
return false;
}
} else if (!currentOption.has_value() && optKey.has_value() && options.find(optKey.value()) != options.end()) {
currentOption = optKey.value();
} else if (currentOption.has_value()) {
auto check = onOption(shortToLongMap.at(currentOption.value()), current);
if (!check) {
return false;
}
currentOption = std::nullopt;
} else {
std::cerr << "Unrecognized option " << current << std::endl;
return false;
}
}
if (currentOption.has_value()) {
std::cerr << "Missing value for " << currentOption.value() << std::endl;
return false;
}
return true;
}

View File

@ -0,0 +1,41 @@
/*
* libdatachannel streamer example
* Copyright (c) 2020 Filip Klembara (in2core)
*
* 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/>.
*/
#ifndef ArgParser_hpp
#define ArgParser_hpp
#include <functional>
#include <vector>
#include <utility>
#include <string>
#include <set>
#include <unordered_map>
#include <optional>
struct ArgParser {
private:
std::set<std::string> options{};
std::set<std::string> flags{};
std::unordered_map<std::string, std::string> shortToLongMap{};
public:
ArgParser(std::vector<std::pair<std::string, std::string>> options, std::vector<std::pair<std::string, std::string>> flags);
std::optional<std::string> toKey(std::string prefixedKey);
bool parse(int argc, char **argv, std::function<bool (std::string, std::string)> onOption, std::function<bool (std::string)> onFlag);
};
#endif /* ArgParser_hpp */

View File

@ -0,0 +1,40 @@
cmake_minimum_required(VERSION 3.7)
if(POLICY CMP0079)
cmake_policy(SET CMP0079 NEW)
endif()
add_executable(streamer
main.cpp
dispatchqueue.cpp
dispatchqueue.hpp
h264fileparser.cpp
h264fileparser.hpp
helpers.cpp
helpers.hpp
opusfileparser.cpp
opusfileparser.hpp
fileparser.cpp
fileparser.hpp
stream.cpp
stream.hpp
ArgParser.cpp
ArgParser.hpp
)
if(WIN32)
target_compile_definitions(streamer PUBLIC STATIC_GETOPT)
endif()
set_target_properties(streamer PROPERTIES
CXX_STANDARD 17
OUTPUT_NAME streamer)
target_link_libraries(streamer datachannel nlohmann_json)
if(WIN32)
add_custom_command(TARGET streamer POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"$<TARGET_FILE_DIR:datachannel>/datachannel.dll"
$<TARGET_FILE_DIR:streamer>
)
endif()

View File

@ -0,0 +1,32 @@
# Streaming H264 and opus
This example streams H264 and opus<sup id="a1">[1](#f1)</sup> samples to the connected browser client.
## Starting signaling server
```sh
$ python3 ../signaling-server-python/signaling-server.py
```
## Starting php
```sh
$ php -S 127.0.0.1:8080
```
Now you can open demo at [127.0.0.1:8080](127.0.0.1:8080).
## Arguments
- `-a` Directory with OPUS samples (default: *../../../../examples/streamer/samples/opus/*).
- `-b` Directory with H264 samples (default: *../../../../examples/streamer/samples/h264/*).
- `-d` Signaling server IP address (default: 127.0.0.1).
- `-p` Signaling server port (default: 8000).
- `-v` Enable debug logs.
- `-h` Print this help and exit.
## Generating H264 and Opus samples
You can generate H264 and Opus sample with *samples/generate_h264.py* and *samples/generate_opus.py* respectively. This require ffmpeg, python3 and kaitaistruct library to be installed. Use `-h`/`--help` to learn more about arguments.
<b id="f1">1</b> Opus samples are generated from music downloaded at [bensound](https://www.bensound.com). [](#a1)

207
examples/streamer/client.js Normal file
View File

@ -0,0 +1,207 @@
/** @type {RTCPeerConnection} */
let rtc;
const iceConnectionLog = document.getElementById('ice-connection-state'),
iceGatheringLog = document.getElementById('ice-gathering-state'),
signalingLog = document.getElementById('signaling-state'),
dataChannelLog = document.getElementById('data-channel');
function randomString(len) {
const charSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
let randomString = '';
for (let i = 0; i < len; i++) {
const randomPoz = Math.floor(Math.random() * charSet.length);
randomString += charSet.substring(randomPoz, randomPoz + 1);
}
return randomString;
}
const receiveID = randomString(10);
const websocket = new WebSocket('ws://127.0.0.1:8000/' + receiveID);
websocket.onopen = function () {
document.getElementById('start').disabled = false;
}
// data channel
let dc = null, dcTimeout = null;
function createPeerConnection() {
const config = {
sdpSemantics: 'unified-plan',
bundlePolicy: "max-bundle",
};
if (document.getElementById('use-stun').checked) {
config.iceServers = [{urls: ['stun:stun.l.google.com:19302']}];
}
let pc = new RTCPeerConnection(config);
// register some listeners to help debugging
pc.addEventListener('icegatheringstatechange', function () {
iceGatheringLog.textContent += ' -> ' + pc.iceGatheringState;
}, false);
iceGatheringLog.textContent = pc.iceGatheringState;
pc.addEventListener('iceconnectionstatechange', function () {
iceConnectionLog.textContent += ' -> ' + pc.iceConnectionState;
}, false);
iceConnectionLog.textContent = pc.iceConnectionState;
pc.addEventListener('signalingstatechange', function () {
signalingLog.textContent += ' -> ' + pc.signalingState;
}, false);
signalingLog.textContent = pc.signalingState;
// connect audio / video
pc.addEventListener('track', function (evt) {
document.getElementById('media').style.display = 'block';
const videoTag = document.getElementById('video');
videoTag.srcObject = evt.streams[0];
videoTag.play();
});
let time_start = null;
function current_stamp() {
if (time_start === null) {
time_start = new Date().getTime();
return 0;
} else {
return new Date().getTime() - time_start;
}
}
pc.ondatachannel = function (event) {
dc = event.channel;
dc.onopen = function () {
dataChannelLog.textContent += '- open\n';
dataChannelLog.scrollTop = dataChannelLog.scrollHeight;
};
dc.onmessage = function (evt) {
dataChannelLog.textContent += '< ' + evt.data + '\n';
dataChannelLog.scrollTop = dataChannelLog.scrollHeight;
dcTimeout = setTimeout(function () {
if (dc == null && dcTimeout != null) {
dcTimeout = null;
return
}
const message = 'Pong ' + current_stamp();
dataChannelLog.textContent += '> ' + message + '\n';
dataChannelLog.scrollTop = dataChannelLog.scrollHeight;
dc.send(message);
}, 1000);
}
dc.onclose = function () {
clearTimeout(dcTimeout);
dcTimeout = null;
dataChannelLog.textContent += '- close\n';
dataChannelLog.scrollTop = dataChannelLog.scrollHeight;
};
}
return pc;
}
function sendAnswer(pc) {
return pc.createAnswer()
.then((answer) => rtc.setLocalDescription(answer))
.then(function () {
// wait for ICE gathering to complete
return new Promise(function (resolve) {
if (pc.iceGatheringState === 'complete') {
resolve();
} else {
function checkState() {
if (pc.iceGatheringState === 'complete') {
pc.removeEventListener('icegatheringstatechange', checkState);
resolve();
}
}
pc.addEventListener('icegatheringstatechange', checkState);
}
});
}).then(function () {
const answer = pc.localDescription;
document.getElementById('answer-sdp').textContent = answer.sdp;
return websocket.send(JSON.stringify(
{
id: "server",
type: answer.type,
sdp: answer.sdp,
}));
}).catch(function (e) {
alert(e);
});
}
function handleOffer(offer) {
rtc = createPeerConnection();
return rtc.setRemoteDescription(offer)
.then(() => sendAnswer(rtc));
}
function sendStreamRequest() {
websocket.send(JSON.stringify(
{
id: "server",
type: "streamRequest",
receiver: receiveID,
}));
}
async function start() {
document.getElementById('start').style.display = 'none';
document.getElementById('stop').style.display = 'inline-block';
document.getElementById('media').style.display = 'block';
sendStreamRequest();
}
function stop() {
document.getElementById('stop').style.display = 'none';
document.getElementById('media').style.display = 'none';
document.getElementById('start').style.display = 'inline-block';
// close data channel
if (dc) {
dc.close();
dc = null;
}
// close transceivers
if (rtc.getTransceivers) {
rtc.getTransceivers().forEach(function (transceiver) {
if (transceiver.stop) {
transceiver.stop();
}
});
}
// close local audio / video
rtc.getSenders().forEach(function (sender) {
const track = sender.track;
if (track !== null) {
sender.track.stop();
}
});
// close peer connection
setTimeout(function () {
rtc.close();
rtc = null;
}, 500);
}
websocket.onmessage = async function (evt) {
const received_msg = evt.data;
const object = JSON.parse(received_msg);
if (object.type == "offer") {
document.getElementById('offer-sdp').textContent = object.sdp;
await handleOffer(object)
}
}

View File

@ -0,0 +1,94 @@
/*
* libdatachannel streamer example
* Copyright (c) 2020 Filip Klembara (in2core)
*
* 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 "dispatchqueue.hpp"
DispatchQueue::DispatchQueue(std::string name, size_t threadCount) :
name{std::move(name)}, threads(threadCount) {
for(size_t i = 0; i < threads.size(); i++)
{
threads[i] = std::thread(&DispatchQueue::dispatchThreadHandler, this);
}
}
DispatchQueue::~DispatchQueue() {
// Signal to dispatch threads that it's time to wrap up
std::unique_lock<std::mutex> lock(lockMutex);
quit = true;
lock.unlock();
condition.notify_all();
// Wait for threads to finish before we exit
for(size_t i = 0; i < threads.size(); i++)
{
if(threads[i].joinable())
{
threads[i].join();
}
}
}
void DispatchQueue::removePending() {
std::unique_lock<std::mutex> lock(lockMutex);
queue = {};
}
void DispatchQueue::dispatch(const fp_t& op) {
std::unique_lock<std::mutex> lock(lockMutex);
queue.push(op);
// Manual unlocking is done before notifying, to avoid waking up
// the waiting thread only to block again (see notify_one for details)
lock.unlock();
condition.notify_one();
}
void DispatchQueue::dispatch(fp_t&& op) {
std::unique_lock<std::mutex> lock(lockMutex);
queue.push(std::move(op));
// Manual unlocking is done before notifying, to avoid waking up
// the waiting thread only to block again (see notify_one for details)
lock.unlock();
condition.notify_one();
}
void DispatchQueue::dispatchThreadHandler(void) {
std::unique_lock<std::mutex> lock(lockMutex);
do {
//Wait until we have data or a quit signal
condition.wait(lock, [this]{
return (queue.size() || quit);
});
//after wait, we own the lock
if(!quit && queue.size())
{
auto op = std::move(queue.front());
queue.pop();
//unlock now that we're done messing with the queue
lock.unlock();
op();
lock.lock();
}
} while (!quit);
}

View File

@ -0,0 +1,59 @@
/*
* libdatachannel streamer example
* Copyright (c) 2020 Filip Klembara (in2core)
*
* 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/>.
*/
#ifndef dispatchqueue_hpp
#define dispatchqueue_hpp
#include <thread>
#include <mutex>
#include <condition_variable>
#include <queue>
#include <functional>
class DispatchQueue {
typedef std::function<void(void)> fp_t;
public:
DispatchQueue(std::string name, size_t threadCount = 1);
~DispatchQueue();
// dispatch and copy
void dispatch(const fp_t& op);
// dispatch and move
void dispatch(fp_t&& op);
void removePending();
// Deleted operations
DispatchQueue(const DispatchQueue& rhs) = delete;
DispatchQueue& operator=(const DispatchQueue& rhs) = delete;
DispatchQueue(DispatchQueue&& rhs) = delete;
DispatchQueue& operator=(DispatchQueue&& rhs) = delete;
private:
std::string name;
std::mutex lockMutex;
std::vector<std::thread> threads;
std::queue<fp_t> queue;
std::condition_variable condition;
bool quit = false;
void dispatchThreadHandler(void);
};
#endif /* dispatchqueue_hpp */

View File

@ -0,0 +1,59 @@
/*
* libdatachannel streamer example
* Copyright (c) 2020 Filip Klembara (in2core)
*
* 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 "fileparser.hpp"
#include <fstream>
using namespace std;
FileParser::FileParser(string directory, string extension, uint32_t samplesPerSecond, bool loop): sampleDuration_us(1000 * 1000 / samplesPerSecond), StreamSource() {
this->directory = directory;
this->extension = extension;
this->loop = loop;
}
void FileParser::start() {
sampleTime_us = -sampleDuration_us;
loadNextSample();
}
void FileParser::stop() {
StreamSource::stop();
counter = -1;
}
void FileParser::loadNextSample() {
string frame_id = to_string(++counter);
string url = directory + "/sample-" + frame_id + extension;
ifstream source(url, ios_base::binary);
if (!source) {
if (loop && counter > 0) {
loopTimestampOffset = sampleTime_us;
counter = -1;
loadNextSample();
return;
}
sample = {};
return;
}
vector<uint8_t> fileContents((std::istreambuf_iterator<char>(source)), std::istreambuf_iterator<char>());
sample = *reinterpret_cast<vector<byte> *>(&fileContents);
sampleTime_us += sampleDuration_us;
}

View File

@ -0,0 +1,40 @@
/*
* libdatachannel streamer example
* Copyright (c) 2020 Filip Klembara (in2core)
*
* 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/>.
*/
#ifndef fileparser_hpp
#define fileparser_hpp
#include <string>
#include <vector>
#include "stream.hpp"
class FileParser: public StreamSource {
std::string directory;
std::string extension;
uint32_t counter = -1;
bool loop;
uint64_t loopTimestampOffset = 0;
public:
const uint64_t sampleDuration_us;
virtual void start();
virtual void stop();
FileParser(std::string directory, std::string extension, uint32_t samplesPerSecond, bool loop);
virtual void loadNextSample();
};
#endif /* fileparser_hpp */

View File

@ -0,0 +1,70 @@
/*
* libdatachannel streamer example
* Copyright (c) 2020 Filip Klembara (in2core)
*
* 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 "h264fileparser.hpp"
#include <fstream>
#include "rtc/rtc.hpp"
using namespace std;
H264FileParser::H264FileParser(string directory, uint32_t fps, bool loop): FileParser(directory, ".h264", fps, loop) { }
void H264FileParser::loadNextSample() {
FileParser::loadNextSample();
unsigned long long i = 0;
while (i < sample.size()) {
assert(i + 4 < sample.size());
auto lengthPtr = (uint32_t *) (sample.data() + i);
uint32_t length = ntohl(*lengthPtr);
auto naluStartIndex = i + 4;
auto naluEndIndex = naluStartIndex + length;
assert(naluEndIndex <= sample.size());
auto header = reinterpret_cast<rtc::NalUnitHeader *>(sample.data() + naluStartIndex);
auto type = header->unitType();
switch (type) {
case 7:
previousUnitType7 = {sample.begin() + i, sample.begin() + naluEndIndex};
break;
case 8:
previousUnitType8 = {sample.begin() + i, sample.begin() + naluEndIndex};;
break;
case 5:
previousUnitType5 = {sample.begin() + i, sample.begin() + naluEndIndex};;
break;
}
i = naluEndIndex;
}
}
vector<byte> H264FileParser::initialNALUS() {
vector<byte> units{};
if (previousUnitType7.has_value()) {
auto nalu = previousUnitType7.value();
units.insert(units.end(), nalu.begin(), nalu.end());
}
if (previousUnitType8.has_value()) {
auto nalu = previousUnitType8.value();
units.insert(units.end(), nalu.begin(), nalu.end());
}
if (previousUnitType5.has_value()) {
auto nalu = previousUnitType5.value();
units.insert(units.end(), nalu.begin(), nalu.end());
}
return units;
}

View File

@ -0,0 +1,36 @@
/*
* libdatachannel streamer example
* Copyright (c) 2020 Filip Klembara (in2core)
*
* 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/>.
*/
#ifndef h264fileparser_hpp
#define h264fileparser_hpp
#include "fileparser.hpp"
#include <optional>
class H264FileParser: public FileParser {
std::optional<std::vector<std::byte>> previousUnitType5 = std::nullopt;
std::optional<std::vector<std::byte>> previousUnitType7 = std::nullopt;
std::optional<std::vector<std::byte>> previousUnitType8 = std::nullopt;
public:
H264FileParser(std::string directory, uint32_t fps, bool loop);
void loadNextSample() override;
std::vector<std::byte> initialNALUS();
};
#endif /* h264fileparser_hpp */

View File

@ -0,0 +1,87 @@
/*
* libdatachannel streamer example
* Copyright (c) 2020 Filip Klembara (in2core)
*
* 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 "helpers.hpp"
#include <ctime>
#if _WIN32
// taken from https://stackoverflow.com/questions/10905892/equivalent-of-gettimeday-for-windows
#include <Windows.h>
struct timezone {
int tz_minuteswest;
int tz_dsttime;
};
int gettimeofday(struct timeval *tv, struct timezone *tz)
{
if (tv) {
FILETIME filetime; /* 64-bit value representing the number of 100-nanosecond intervals since January 1, 1601 00:00 UTC */
ULARGE_INTEGER x;
ULONGLONG usec;
static const ULONGLONG epoch_offset_us = 11644473600000000ULL; /* microseconds betweeen Jan 1,1601 and Jan 1,1970 */
#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
GetSystemTimePreciseAsFileTime(&filetime);
#else
GetSystemTimeAsFileTime(&filetime);
#endif
x.LowPart = filetime.dwLowDateTime;
x.HighPart = filetime.dwHighDateTime;
usec = x.QuadPart / 10 - epoch_offset_us;
tv->tv_sec = (time_t)(usec / 1000000ULL);
tv->tv_usec = (long)(usec % 1000000ULL);
}
if (tz) {
TIME_ZONE_INFORMATION timezone;
GetTimeZoneInformation(&timezone);
tz->tz_minuteswest = timezone.Bias;
tz->tz_dsttime = 0;
}
return 0;
}
#endif
using namespace std;
using namespace rtc;
ClientTrackData::ClientTrackData(shared_ptr<Track> track, shared_ptr<RtcpSrReporter> sender) {
this->track = track;
this->sender = sender;
}
void Client::setState(State state) {
std::unique_lock lock(_mutex);
this->state = state;
}
Client::State Client::getState() {
std::shared_lock lock(_mutex);
return state;
}
ClientTrack::ClientTrack(string id, shared_ptr<ClientTrackData> trackData) {
this->id = id;
this->trackData = trackData;
}
uint64_t currentTimeInMicroSeconds() {
struct timeval time;
gettimeofday(&time, NULL);
return uint64_t(time.tv_sec) * 1000 * 1000 + time.tv_usec;
}

View File

@ -0,0 +1,63 @@
/*
* libdatachannel streamer example
* Copyright (c) 2020 Filip Klembara (in2core)
*
* 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/>.
*/
#ifndef helpers_hpp
#define helpers_hpp
#include "rtc/rtc.hpp"
struct ClientTrackData {
std::shared_ptr<rtc::Track> track;
std::shared_ptr<rtc::RtcpSrReporter> sender;
ClientTrackData(std::shared_ptr<rtc::Track> track, std::shared_ptr<rtc::RtcpSrReporter> sender);
};
struct Client {
enum class State {
Waiting,
WaitingForVideo,
WaitingForAudio,
Ready
};
const std::shared_ptr<rtc::PeerConnection> & peerConnection = _peerConnection;
Client(std::shared_ptr<rtc::PeerConnection> pc) {
_peerConnection = pc;
}
std::optional<std::shared_ptr<ClientTrackData>> video;
std::optional<std::shared_ptr<ClientTrackData>> audio;
std::optional<std::shared_ptr<rtc::DataChannel>> dataChannel{};
void setState(State state);
State getState();
private:
std::shared_mutex _mutex;
State state = State::Waiting;
std::string id;
std::shared_ptr<rtc::PeerConnection> _peerConnection;
};
struct ClientTrack {
std::string id;
std::shared_ptr<ClientTrackData> trackData;
ClientTrack(std::string id, std::shared_ptr<ClientTrackData> trackData);
};
uint64_t currentTimeInMicroSeconds();
#endif /* helpers_hpp */

View File

@ -0,0 +1,72 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>libdatachannel media example</title>
<style>
button {
padding: 8px 16px;
}
pre {
overflow-x: hidden;
overflow-y: auto;
}
video {
width: 100%;
}
.option {
margin-bottom: 8px;
}
#media {
max-width: 1280px;
}
</style>
</head>
<body>
<script src="https://webrtc.github.io/adapter/adapter-latest.js"></script>
<h2>Options</h2>
<div class="option">
<input id="use-stun" type="checkbox"/>
<label for="use-stun">Use STUN server</label>
</div>
<button id="start" onclick="start()" disabled>Start</button>
<button id="stop" style="display: none" onclick="stop()">Stop</button>
<h2>State</h2>
<p>
ICE gathering state: <span id="ice-gathering-state"></span>
</p>
<p>
ICE connection state: <span id="ice-connection-state"></span>
</p>
<p>
Signaling state: <span id="signaling-state"></span>
</p>
<div id="media" style="display: none">
<h2>Media</h2>
<video id="video" autoplay playsinline></video>
</div>
<h2>Data channel</h2>
<pre id="data-channel" style="height: 200px;"></pre>
<h2>SDP</h2>
<h3>Offer</h3>
<pre id="offer-sdp"></pre>
<h3>Answer</h3>
<pre id="answer-sdp"></pre>
<script src="client.js"></script>
</body>
</html>

480
examples/streamer/main.cpp Normal file
View File

@ -0,0 +1,480 @@
/*
* libdatachannel client example
* Copyright (c) 2019-2020 Paul-Louis Ageneau
* Copyright (c) 2019 Murat Dogan
* Copyright (c) 2020 Will Munn
* Copyright (c) 2020 Nico Chatzi
* Copyright (c) 2020 Lara Mackey
* Copyright (c) 2020 Erik Cota-Robles
* Copyright (c) 2020 Filip Klembara (in2core)
*
* 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 "nlohmann/json.hpp"
#include "h264fileparser.hpp"
#include "opusfileparser.hpp"
#include "helpers.hpp"
#include "ArgParser.hpp"
using namespace rtc;
using namespace std;
using namespace std::chrono_literals;
using json = nlohmann::json;
template <class T> weak_ptr<T> make_weak_ptr(shared_ptr<T> ptr) { return ptr; }
/// all connected clients
unordered_map<string, shared_ptr<Client>> clients{};
/// Creates peer connection and client representation
/// @param config Configuration
/// @param wws Websocket for signaling
/// @param id Client ID
/// @returns Client
shared_ptr<Client> createPeerConnection(const Configuration &config,
weak_ptr<WebSocket> wws,
string id);
/// Creates stream
/// @param h264Samples Directory with H264 samples
/// @param fps Video FPS
/// @param opusSamples Directory with opus samples
/// @returns Stream object
shared_ptr<Stream> createStream(const string h264Samples, const unsigned fps, const string opusSamples);
/// Add client to stream
/// @param client Client
/// @param adding_video True if adding video
void addToStream(shared_ptr<Client> client, bool isAddingVideo);
/// Start stream
void startStream();
/// Main dispatch queue
DispatchQueue MainThread("Main");
/// Audio and video stream
optional<shared_ptr<Stream>> avStream = nullopt;
const string defaultRootDirectory = "../../../../examples/streamer/samples/";
const string defaultH264SamplesDirectory = defaultRootDirectory + "h264/";
string h264SamplesDirectory = defaultH264SamplesDirectory;
const string defaultOpusSamplesDirectory = defaultRootDirectory + "opus/";
string opusSamplesDirectory = defaultOpusSamplesDirectory;
const string defaultIPAddress = "127.0.0.1";
const uint16_t defaultPort = 8000;
string ip_address = defaultIPAddress;
uint16_t port = defaultPort;
/// Incomming message handler for websocket
/// @param message Incommint message
/// @param config Configuration
/// @param ws Websocket
void wsOnMessage(json message, Configuration config, shared_ptr<WebSocket> ws) {
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>();
if (type == "streamRequest") {
shared_ptr<Client> c = createPeerConnection(config, make_weak_ptr(ws), id);
clients.emplace(id, c);
} else if (type == "answer") {
shared_ptr<Client> c;
if (auto jt = clients.find(id); jt != clients.end()) {
auto pc = clients.at(id)->peerConnection;
auto sdp = message["sdp"].get<string>();
auto description = Description(sdp, type);
pc->setRemoteDescription(description);
}
}
}
int main(int argc, char **argv) try {
bool enableDebugLogs = false;
bool printHelp = false;
int c = 0;
auto parser = ArgParser({{"a", "audio"}, {"b", "video"}, {"d", "ip"}, {"p","port"}}, {{"h", "help"}, {"v", "verbose"}});
auto parsingResult = parser.parse(argc, argv, [](string key, string value) {
if (key == "audio") {
opusSamplesDirectory = value + "/";
} else if (key == "video") {
h264SamplesDirectory = value + "/";
} else if (key == "ip") {
ip_address = value;
} else if (key == "port") {
port = atoi(value.data());
} else {
cerr << "Invalid option --" << key << " with value " << value << endl;
return false;
}
return true;
}, [&enableDebugLogs, &printHelp](string flag){
if (flag == "verbose") {
enableDebugLogs = true;
} else if (flag == "help") {
printHelp = true;
} else {
cerr << "Invalid flag --" << flag << endl;
return false;
}
return true;
});
if (!parsingResult) {
return 1;
}
if (printHelp) {
cout << "usage: stream-h264 [-a opus_samples_folder] [-b h264_samples_folder] [-d ip_address] [-p port] [-v] [-h]" << endl
<< "Arguments:" << endl
<< "\t -a " << "Directory with opus samples (default: " << defaultOpusSamplesDirectory << ")." << endl
<< "\t -b " << "Directory with H264 samples (default: " << defaultH264SamplesDirectory << ")." << endl
<< "\t -d " << "Signaling server IP address (default: " << defaultIPAddress << ")." << endl
<< "\t -p " << "Signaling server port (default: " << defaultPort << ")." << endl
<< "\t -v " << "Enable debug logs." << endl
<< "\t -h " << "Print this help and exit." << endl;
return 0;
}
if (enableDebugLogs) {
InitLogger(LogLevel::Debug);
}
Configuration config;
string stunServer = "stun:stun.l.google.com:19302";
cout << "Stun server is " << stunServer << endl;
config.iceServers.emplace_back(stunServer);
string localId = "server";
cout << "The local ID is: " << localId << endl;
auto ws = make_shared<WebSocket>();
ws->onOpen([]() { cout << "WebSocket connected, signaling ready" << endl; });
ws->onClosed([]() { cout << "WebSocket closed" << endl; });
ws->onError([](const string &error) { cout << "WebSocket failed: " << error << endl; });
ws->onMessage([&](variant<binary, string> data) {
if (!holds_alternative<string>(data))
return;
json message = json::parse(get<string>(data));
MainThread.dispatch([message, config, ws]() {
wsOnMessage(message, config, ws);
});
});
const string url = "ws://" + ip_address + ":" + to_string(port) + "/" + localId;
cout << "Url is " << url << endl;
ws->open(url);
cout << "Waiting for signaling to be connected..." << endl;
while (!ws->isOpen()) {
if (ws->isClosed())
return 1;
this_thread::sleep_for(100ms);
}
while (true) {
string id;
cout << "Enter to exit" << endl;
cin >> id;
cin.ignore();
cout << "exiting" << endl;
break;
}
cout << "Cleaning up..." << endl;
return 0;
} catch (const std::exception &e) {
std::cout << "Error: " << e.what() << std::endl;
return -1;
}
shared_ptr<ClientTrackData> addVideo(const shared_ptr<PeerConnection> pc, const uint8_t payloadType, const uint32_t ssrc, const string cname, const string msid, const function<void (void)> onOpen) {
auto video = Description::Video(cname);
video.addH264Codec(payloadType);
video.addSSRC(ssrc, cname, msid, cname);
auto track = pc->addTrack(video);
// create RTP configuration
auto rtpConfig = shared_ptr<RtpPacketizationConfig>(new RtpPacketizationConfig(ssrc, cname, payloadType, H264RtpPacketizer::defaultClockRate));
// create packetizer
auto packetizer = shared_ptr<H264RtpPacketizer>(new H264RtpPacketizer(H264RtpPacketizer::Separator::Length, rtpConfig));
// create H264 handler
shared_ptr<H264PacketizationHandler> h264Handler(new H264PacketizationHandler(packetizer));
// add RTCP SR handler
auto srReporter = make_shared<RtcpSrReporter>(rtpConfig);
h264Handler->addToChain(srReporter);
// add RTCP NACK handler
auto nackResponder = make_shared<RtcpNackResponder>();
h264Handler->addToChain(nackResponder);
// set handler
track->setRtcpHandler(h264Handler);
track->onOpen(onOpen);
auto trackData = make_shared<ClientTrackData>(track, srReporter);
return trackData;
}
shared_ptr<ClientTrackData> addAudio(const shared_ptr<PeerConnection> pc, const uint8_t payloadType, const uint32_t ssrc, const string cname, const string msid, const function<void (void)> onOpen) {
auto audio = Description::Audio(cname);
audio.addOpusCodec(payloadType);
audio.addSSRC(ssrc, cname, msid, cname);
auto track = pc->addTrack(audio);
// create RTP configuration
auto rtpConfig = shared_ptr<RtpPacketizationConfig>(new RtpPacketizationConfig(ssrc, cname, payloadType, OpusRtpPacketizer::defaultClockRate));
// create packetizer
auto packetizer = make_shared<OpusRtpPacketizer>(rtpConfig);
// create opus handler
auto opusHandler = make_shared<OpusPacketizationHandler>(packetizer);
// add RTCP SR handler
auto srReporter = make_shared<RtcpSrReporter>(rtpConfig);
opusHandler->addToChain(srReporter);
// add RTCP NACK handler
auto nackResponder = make_shared<RtcpNackResponder>();
opusHandler->addToChain(nackResponder);
// set handler
track->setRtcpHandler(opusHandler);
track->onOpen(onOpen);
auto trackData = make_shared<ClientTrackData>(track, srReporter);
return trackData;
}
// Create and setup a PeerConnection
shared_ptr<Client> createPeerConnection(const Configuration &config,
weak_ptr<WebSocket> wws,
string id) {
auto pc = make_shared<PeerConnection>(config);
shared_ptr<Client> client(new Client(pc));
pc->onStateChange([id](PeerConnection::State state) {
cout << "State: " << state << endl;
if (state == PeerConnection::State::Disconnected ||
state == PeerConnection::State::Failed ||
state == PeerConnection::State::Closed) {
// remove disconnected client
MainThread.dispatch([id]() {
clients.erase(id);
});
}
});
pc->onGatheringStateChange(
[wpc = make_weak_ptr(pc), id, wws](PeerConnection::GatheringState state) {
cout << "Gathering State: " << state << endl;
if (state == PeerConnection::GatheringState::Complete) {
if(auto pc = wpc.lock()) {
auto description = pc->localDescription();
json message = {
{"id", id},
{"type", description->typeString()},
{"sdp", string(description.value())}
};
// Gathering complete, send answer
if (auto ws = wws.lock()) {
ws->send(message.dump());
}
}
}
});
client->video = addVideo(pc, 102, 1, "video-stream", "stream1", [id, wc = make_weak_ptr(client)]() {
MainThread.dispatch([wc]() {
if (auto c = wc.lock()) {
addToStream(c, true);
}
});
cout << "Video from " << id << " opened" << endl;
});
client->audio = addAudio(pc, 111, 2, "audio-stream", "stream1", [id, wc = make_weak_ptr(client)]() {
MainThread.dispatch([wc]() {
if (auto c = wc.lock()) {
addToStream(c, false);
}
});
cout << "Audio from " << id << " opened" << endl;
});
auto dc = pc->addDataChannel("ping-pong");
dc->onOpen([id, wdc = make_weak_ptr(dc)]() {
if (auto dc = wdc.lock()) {
dc->send("Ping");
}
});
dc->onMessage(nullptr, [id, wdc = make_weak_ptr(dc)](string msg) {
cout << "Message from " << id << " received: " << msg << endl;
if (auto dc = wdc.lock()) {
dc->send("Ping");
}
});
client->dataChannel = dc;
pc->setLocalDescription();
return client;
};
/// Create stream
shared_ptr<Stream> createStream(const string h264Samples, const unsigned fps, const string opusSamples) {
// video source
auto video = make_shared<H264FileParser>(h264Samples, fps, true);
// audio source
auto audio = make_shared<OPUSFileParser>(opusSamples, true);
auto stream = make_shared<Stream>(video, audio);
// set callback responsible for sample sending
stream->onSample([ws = make_weak_ptr(stream)](Stream::StreamSourceType type, uint64_t sampleTime, rtc::binary sample) {
vector<ClientTrack> tracks{};
string streamType = type == Stream::StreamSourceType::Video ? "video" : "audio";
// get track for given type
function<optional<shared_ptr<ClientTrackData>> (shared_ptr<Client>)> getTrackData = [type](shared_ptr<Client> client) {
return type == Stream::StreamSourceType::Video ? client->video : client->audio;
};
// get all clients with Ready state
for(auto id_client: clients) {
auto id = id_client.first;
auto client = id_client.second;
auto optTrackData = getTrackData(client);
if (client->getState() == Client::State::Ready && optTrackData.has_value()) {
auto trackData = optTrackData.value();
tracks.push_back(ClientTrack(id, trackData));
}
}
if (!tracks.empty()) {
auto message = make_message(move(sample));
for (auto clientTrack: tracks) {
auto client = clientTrack.id;
auto trackData = clientTrack.trackData;
// sample time is in us, we need to convert it to seconds
auto elapsedSeconds = double(sampleTime) / (1000 * 1000);
auto rtpConfig = trackData->sender->rtpConfig;
// get elapsed time in clock rate
uint32_t elapsedTimestamp = rtpConfig->secondsToTimestamp(elapsedSeconds);
// set new timestamp
rtpConfig->timestamp = rtpConfig->startTimestamp + elapsedTimestamp;
// get elapsed time in clock rate from last RTCP sender report
auto reportElapsedTimestamp = rtpConfig->timestamp - trackData->sender->previousReportedTimestamp;
// check if last report was at least 1 second ago
if (rtpConfig->timestampToSeconds(reportElapsedTimestamp) > 1) {
trackData->sender->setNeedsToReport();
}
cout << "Sending " << streamType << " sample with size: " << to_string(message->size()) << " to " << client << endl;
bool send = false;
try {
// send sample
send = trackData->track->send(*message);
} catch (...) {
send = false;
}
if (!send) {
cerr << "Unable to send "<< streamType << " packet" << endl;
break;
}
}
}
MainThread.dispatch([ws]() {
if (clients.empty()) {
// we have no clients, stop the stream
if (auto stream = ws.lock()) {
stream->stop();
}
}
});
});
return stream;
}
/// Start stream
void startStream() {
shared_ptr<Stream> stream;
if (avStream.has_value()) {
stream = avStream.value();
if (stream->isRunning) {
// stream is already running
return;
}
} else {
stream = createStream(h264SamplesDirectory, 30, opusSamplesDirectory);
avStream = stream;
}
stream->start();
}
/// Send previous key frame so browser can show something to user
/// @param stream Stream
/// @param video Video track data
void sendInitialNalus(shared_ptr<Stream> stream, shared_ptr<ClientTrackData> video) {
auto h264 = dynamic_cast<H264FileParser *>(stream->video.get());
auto initialNalus = h264->initialNALUS();
// send previous NALU key frame so users don't have to wait to see stream works
if (!initialNalus.empty()) {
const double frameDuration_s = double(h264->sampleDuration_us) / (1000 * 1000);
const uint32_t frameTimestampDuration = video->sender->rtpConfig->secondsToTimestamp(frameDuration_s);
video->sender->rtpConfig->timestamp = video->sender->rtpConfig->startTimestamp - frameTimestampDuration * 2;
video->track->send(initialNalus);
video->sender->rtpConfig->timestamp += frameTimestampDuration;
// Send initial NAL units again to start stream in firefox browser
video->track->send(initialNalus);
}
}
/// Add client to stream
/// @param client Client
/// @param adding_video True if adding video
void addToStream(shared_ptr<Client> client, bool isAddingVideo) {
if (client->getState() == Client::State::Waiting) {
client->setState(isAddingVideo ? Client::State::WaitingForAudio : Client::State::WaitingForVideo);
} else if ((client->getState() == Client::State::WaitingForAudio && !isAddingVideo)
|| (client->getState() == Client::State::WaitingForVideo && isAddingVideo)) {
// Audio and video tracks are collected now
assert(client->video.has_value() && client->audio.has_value());
auto video = client->video.value();
auto audio = client->audio.value();
auto currentTime_us = double(currentTimeInMicroSeconds());
auto currentTime_s = currentTime_us / (1000 * 1000);
// set start time of stream
video->sender->rtpConfig->setStartTime(currentTime_s, RtpPacketizationConfig::EpochStart::T1970);
audio->sender->rtpConfig->setStartTime(currentTime_s, RtpPacketizationConfig::EpochStart::T1970);
// start stat recording of RTCP SR
video->sender->startRecording();
audio->sender->startRecording();
if (avStream.has_value()) {
sendInitialNalus(avStream.value(), video);
}
client->setState(Client::State::Ready);
}
if (client->getState() == Client::State::Ready) {
startStream();
}
}

View File

@ -0,0 +1,23 @@
/*
* libdatachannel streamer example
* Copyright (c) 2020 Filip Klembara (in2core)
*
* 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 "opusfileparser.hpp"
using namespace std;
OPUSFileParser::OPUSFileParser(string directory, bool loop, uint32_t samplesPerSecond): FileParser(directory, ".opus", samplesPerSecond, loop) { }

View File

@ -0,0 +1,32 @@
/*
* libdatachannel streamer example
* Copyright (c) 2020 Filip Klembara (in2core)
*
* 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/>.
*/
#ifndef opusfileparser_hpp
#define opusfileparser_hpp
#include "fileparser.hpp"
class OPUSFileParser: public FileParser {
static const uint32_t defaultSamplesPerSecond = 50;
public:
OPUSFileParser(std::string directory, bool loop, uint32_t samplesPerSecond = OPUSFileParser::defaultSamplesPerSecond);
};
#endif /* opusfileparser_hpp */

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,115 @@
#!/usr/bin/env python3
import os
import getopt
import sys
import glob
from functools import reduce
from typing import Optional, List
class H264ByteStream:
@staticmethod
def nalu_type(nalu: bytes) -> int:
return nalu[0] & 0x1F
@staticmethod
def merge_sample(sample: List[bytes]) -> bytes:
result = bytes()
for nalu in sample:
result += len(nalu).to_bytes(4, byteorder='big') + nalu
return result
@staticmethod
def reduce_nalus_to_samples(samples: List[List[bytes]], current: bytes) -> List[List[bytes]]:
last_nalus = samples[-1]
samples[-1] = last_nalus + [current]
if H264ByteStream.nalu_type(current) in [1, 5]:
samples.append([])
return samples
def __init__(self, file_name: str):
with open(file_name, "rb") as file:
byte_stream = file.read()
long_split = byte_stream.split(b"\x00\x00\x00\x01")
splits = reduce(lambda acc, x: acc + x.split(b"\x00\x00\x01"), long_split, [])
nalus = filter(lambda x: len(x) > 0, splits)
self.samples = list(
filter(lambda x: len(x) > 0, reduce(H264ByteStream.reduce_nalus_to_samples, nalus, [[]])))
def generate(input_file: str, output_dir: str, max_samples: Optional[int], fps: Optional[int]):
if output_dir[-1] != "/":
output_dir += "/"
if os.path.isdir(output_dir):
files_to_delete = glob.glob(output_dir + "*.h264")
if len(files_to_delete) > 0:
print("Remove following files?")
for file in files_to_delete:
print(file)
response = input("Remove files? [y/n] ").lower()
if response != "y" and response != "yes":
print("Cancelling...")
return
print("Removing files")
for file in files_to_delete:
os.remove(file)
else:
os.makedirs(output_dir, exist_ok=True)
video_stream_file = "_video_stream.h264"
if os.path.isfile(video_stream_file):
os.remove(video_stream_file)
fps_line = "" if fps is None else "-filter:v fps=fps={} ".format(fps)
command = 'ffmpeg -i {} -an -vcodec libx264 -preset slow -profile baseline {}{}'.format(input_file, fps_line,
video_stream_file)
os.system(command)
data = H264ByteStream(video_stream_file)
index = 0
for sample in data.samples[:max_samples]:
name = "{}sample-{}.h264".format(output_dir, index)
index += 1
with open(name, 'wb') as file:
merged_sample = H264ByteStream.merge_sample(sample)
file.write(merged_sample)
os.remove(video_stream_file)
def main(argv):
input_file = None
default_output_dir = "h264/"
output_dir = default_output_dir
max_samples = None
fps = None
try:
opts, args = getopt.getopt(argv, "hi:o:m:f:", ["help", "ifile=", "odir=", "max=", "fps"])
except getopt.GetoptError:
print('generate_h264.py -i <input_files> [-o <output_files>] [-m <max_samples>] [-f <fps>] [-h]')
sys.exit(2)
for opt, arg in opts:
if opt in ("-h", "--help"):
print("Usage: generate_h264.py -i <input_files> [-o <output_files>] [-m <max_samples>] [-f <fps>] [-h]")
print("Arguments:")
print("\t-i,--ifile: Input file")
print("\t-o,--odir: Output directory (default: " + default_output_dir + ")")
print("\t-m,--max: Maximum generated samples")
print("\t-f,--fps: Output fps")
print("\t-h,--help: Print this help and exit")
sys.exit()
elif opt in ("-i", "--ifile"):
input_file = arg
elif opt in ("-o", "--ofile"):
output_dir = arg
elif opt in ("-m", "--max"):
max_samples = int(arg)
elif opt in ("-f", "--fps"):
fps = int(arg)
if input_file is None:
print("Missing argument -i")
sys.exit(2)
generate(input_file, output_dir, max_samples, fps)
if __name__ == "__main__":
main(sys.argv[1:])

View File

@ -0,0 +1,142 @@
#!/usr/bin/env python3
from kaitaistruct import KaitaiStruct, ValidationNotEqualError
import os
import getopt
import sys
import glob
from functools import reduce
class Ogg(KaitaiStruct):
"""Ogg is a popular media container format, which provides basic
streaming / buffering mechanisms and is content-agnostic. Most
popular codecs that are used within Ogg streams are Vorbis (thus
making Ogg/Vorbis streams) and Theora (Ogg/Theora).
Ogg stream is a sequence Ogg pages. They can be read sequentially,
or one can jump into arbitrary stream location and scan for "OggS"
sync code to find the beginning of a new Ogg page and continue
decoding the stream contents from that one.
"""
def __init__(self, _io, _parent=None, _root=None):
KaitaiStruct.__init__(self, _io)
self._parent = _parent
self._root = _root if _root else self
self._read()
def _read(self):
self.pages = []
i = 0
while not self._io.is_eof():
self.pages.append(Ogg.Page(self._io, self, self._root))
i += 1
class Page(KaitaiStruct):
"""Ogg page is a basic unit of data in an Ogg bitstream, usually
it's around 4-8 KB, with a maximum size of 65307 bytes.
"""
def __init__(self, _io, _parent=None, _root=None):
KaitaiStruct.__init__(self, _io)
self._parent = _parent
self._root = _root if _root else self
self._read()
def _read(self):
self.sync_code = self._io.read_bytes(4)
if not self.sync_code == b"\x4F\x67\x67\x53":
raise ValidationNotEqualError(b"\x4F\x67\x67\x53", self.sync_code, self._io,
u"/types/page/seq/0")
self.version = self._io.read_bytes(1)
if not self.version == b"\x00":
raise ValidationNotEqualError(b"\x00", self.version, self._io, u"/types/page/seq/1")
self.reserved1 = self._io.read_bits_int_be(5)
self.is_end_of_stream = self._io.read_bits_int_be(1) != 0
self.is_beginning_of_stream = self._io.read_bits_int_be(1) != 0
self.is_continuation = self._io.read_bits_int_be(1) != 0
self._io.align_to_byte()
self.granule_pos = self._io.read_u8le()
self.bitstream_serial = self._io.read_u4le()
self.page_seq_num = self._io.read_u4le()
self.crc32 = self._io.read_u4le()
self.num_segments = self._io.read_u1()
self.len_segments = [None] * self.num_segments
for i in range(self.num_segments):
self.len_segments[i] = self._io.read_u1()
self.segments = [None] * self.num_segments
for i in range(self.num_segments):
self.segments[i] = self._io.read_bytes(self.len_segments[i])
def generate(input_file: str, output_dir: str, max_samples: int):
if output_dir[-1] != "/":
output_dir += "/"
if os.path.isdir(output_dir):
files_to_delete = glob.glob(output_dir + "*.opus")
if len(files_to_delete) > 0:
print("Remove following files?")
for file in files_to_delete:
print(file)
response = input("Remove files? [y/n] ").lower()
if response != "y" and response != "yes":
print("Cancelling...")
return
print("Removing files")
for file in files_to_delete:
os.remove(file)
else:
os.makedirs(output_dir, exist_ok=True)
audio_stream_file = "_audio_stream.ogg"
if os.path.isfile(audio_stream_file):
os.remove(audio_stream_file)
os.system('ffmpeg -i {} -vn -ar 48000 -ac 2 -vbr off -acodec libopus -ab 64k {}'.format(input_file, audio_stream_file))
data = Ogg.from_file(audio_stream_file)
index = 0
valid_pages = data.pages[2:]
segments = list(reduce(lambda x, y: x + y.segments, valid_pages, []))[:max_samples]
for segment in segments:
name = "{}sample-{}.opus".format(output_dir, index)
index += 1
with open(name, 'wb') as file:
assert len(list(segment)) == 160
file.write(segment)
os.remove(audio_stream_file)
def main(argv):
input_file = None
default_output_dir = "opus/"
output_dir = default_output_dir
max_samples = None
try:
opts, args = getopt.getopt(argv, "hi:o:m:", ["help", "ifile=", "odir=", "max="])
except getopt.GetoptError:
print('generate_opus.py -i <input_files> [-o <output_files>] [-m <max_samples>] [-h]')
sys.exit(2)
for opt, arg in opts:
if opt in ("-h", "--help"):
print("Usage: generate_opus.py -i <input_files> [-o <output_files>] [-m <max_samples>] [-h]")
print("Arguments:")
print("\t-i,--ifile: Input file")
print("\t-o,--odir: Output directory (default: " + default_output_dir + ")")
print("\t-m,--max: Maximum generated samples")
print("\t-h,--help: Print this help and exit")
sys.exit()
elif opt in ("-i", "--ifile"):
input_file = arg
elif opt in ("-o", "--ofile"):
output_dir = arg
elif opt in ("-m", "--max"):
max_samples = int(arg)
if input_file is None:
print("Missing argument -i")
sys.exit(2)
generate(input_file, output_dir, max_samples)
if __name__ == "__main__":
main(sys.argv[1:])

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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