Compare commits

..

6 Commits

Author SHA1 Message Date
fd97f98f23 Bumped version to 0.13.1 2021-05-17 19:06:45 +02:00
76d9ce5ba3 Updated libjuice to v0.7.3 2021-05-17 09:58:27 +02:00
f795e3293f Merge pull request #423 from paullouisageneau/remove-usrsctp-data-race-mitigation
Remove usrsctp data race mitigation
2021-05-16 19:09:56 +02:00
34aad791c6 Removed usrsctp data race mitigation 2021-05-16 18:31:54 +02:00
30703741e5 Merge pull request #420 from wasphin/feature/fix-export-name
Fix cmake export file name
2021-05-14 21:48:59 +02:00
wxf
124c073821 Fix cmake export file name 2021-05-14 11:52:44 +08:00
3 changed files with 4 additions and 7 deletions

View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.7) cmake_minimum_required(VERSION 3.7)
project(libdatachannel project(libdatachannel
VERSION 0.13.0 VERSION 0.13.1
LANGUAGES CXX) LANGUAGES CXX)
set(PROJECT_DESCRIPTION "WebRTC Data Channels Library") set(PROJECT_DESCRIPTION "WebRTC Data Channels Library")
@ -327,7 +327,7 @@ if(WARNINGS_AS_ERRORS)
endif() endif()
endif() endif()
install(TARGETS datachannel EXPORT datachannel-export install(TARGETS datachannel EXPORT libdatachannel-config
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib
@ -338,7 +338,7 @@ install(FILES ${LIBDATACHANNEL_HEADERS}
) )
install( install(
EXPORT datachannel-export EXPORT libdatachannel-config
NAMESPACE LibDatachannel:: NAMESPACE LibDatachannel::
DESTINATION share/cmake/libdatachannel DESTINATION share/cmake/libdatachannel
) )

2
deps/libjuice vendored

View File

@ -416,9 +416,6 @@ void SctpTransport::incoming(message_ptr message) {
PLOG_VERBOSE << "Incoming size=" << message->size(); PLOG_VERBOSE << "Incoming size=" << message->size();
// TODO: There seems to be a possible data race between usrsctp_sendv() and usrsctp_conninput()
// As a mitigation, lock the send mutex before calling usrsctp_conninput()
std::lock_guard lock(mSendMutex);
usrsctp_conninput(this, message->data(), message->size(), 0); usrsctp_conninput(this, message->data(), message->size(), 0);
} }