diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2024-01-30 16:10:40 +0100 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2024-01-30 16:33:25 +0100 |
| commit | 5b4221462b9a0edcddd0221bb6d26d6a20cc40a2 (patch) | |
| tree | 23ce354db8d5cf2adca511e8d70bbf1846d75ae8 | |
| parent | 86d080b328b4367984cd7932bd1ce676e9ca5103 (diff) | |
| download | fork-godot-webrtc-native-5b4221462b9a0edcddd0221bb6d26d6a20cc40a2.tar.gz fork-godot-webrtc-native-5b4221462b9a0edcddd0221bb6d26d6a20cc40a2.tar.bz2 fork-godot-webrtc-native-5b4221462b9a0edcddd0221bb6d26d6a20cc40a2.zip | |
Update to libdatachannel 0.20.1, OpenSSL 3.0.13
Replace deprecated options with the (new) standard ones.
| -rw-r--r-- | src/WebRTCLibDataChannel.cpp | 4 | ||||
| -rw-r--r-- | src/WebRTCLibPeerConnection.cpp | 6 | ||||
| -rw-r--r-- | thirdparty/README.md | 10 | ||||
| m--------- | thirdparty/libdatachannel | 0 | ||||
| m--------- | thirdparty/openssl | 0 |
5 files changed, 9 insertions, 11 deletions
diff --git a/src/WebRTCLibDataChannel.cpp b/src/WebRTCLibDataChannel.cpp index 6577433..442caf0 100644 --- a/src/WebRTCLibDataChannel.cpp +++ b/src/WebRTCLibDataChannel.cpp @@ -143,12 +143,12 @@ int32_t WebRTCLibDataChannel::_get_id() const { int32_t WebRTCLibDataChannel::_get_max_packet_life_time() const { ERR_FAIL_COND_V(!channel, 0); - return channel->reliability().type == rtc::Reliability::Type::Timed ? std::get<std::chrono::milliseconds>(channel->reliability().rexmit).count() : -1; + return channel->reliability().maxPacketLifeTime.has_value() ? channel->reliability().maxPacketLifeTime.value().count() : -1; } int32_t WebRTCLibDataChannel::_get_max_retransmits() const { ERR_FAIL_COND_V(!channel, 0); - return channel->reliability().type == rtc::Reliability::Type::Rexmit ? std::get<int>(channel->reliability().rexmit) : -1; + return channel->reliability().maxRetransmits.value_or(-1); } String WebRTCLibDataChannel::_get_protocol() const { diff --git a/src/WebRTCLibPeerConnection.cpp b/src/WebRTCLibPeerConnection.cpp index 88bd29a..69bb89f 100644 --- a/src/WebRTCLibPeerConnection.cpp +++ b/src/WebRTCLibPeerConnection.cpp @@ -96,11 +96,9 @@ Error WebRTCLibPeerConnection::_parse_channel_config(rtc::DataChannelInit &r_con // Channels cannot be both time-constrained and retry-constrained. ERR_FAIL_COND_V(p_dict.has("maxPacketLifeTime") && p_dict.has("maxRetransmits"), ERR_INVALID_PARAMETER); if (p_dict.has("maxPacketLifeTime")) { - r_config.reliability.type = rtc::Reliability::Type::Timed; - r_config.reliability.rexmit = std::chrono::milliseconds(p_dict["maxPacketLifeTime"].operator int32_t()); + r_config.reliability.maxPacketLifeTime = std::chrono::milliseconds(p_dict["maxPacketLifeTime"].operator int32_t()); } else if (p_dict.has("maxRetransmits")) { - r_config.reliability.type = rtc::Reliability::Type::Rexmit; - r_config.reliability.rexmit = p_dict["maxRetransmits"].operator int32_t(); + r_config.reliability.maxRetransmits = p_dict["maxRetransmits"].operator int32_t(); } if (p_dict.has("ordered") && p_dict["ordered"].operator bool() == false) { r_config.reliability.unordered = true; diff --git a/thirdparty/README.md b/thirdparty/README.md index b0ccc54..9d9ac32 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -8,7 +8,7 @@ readability. ## json - Upstream: https://github.com/nlohmann/json -- Version: 3.11.2 (bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d, 2022) +- Version: 3.11.3 (9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03, 2023) - License: MIT Module location: @@ -19,7 +19,7 @@ Module location: ## libdatachannel - Upstream: https://github.com/paullouisageneau/libdatachannel -- Version: 0.19.4 (cb77870cde2c78007a336eae3aacd234dccda161, 2023) +- Version: 0.20.1 (7841d9f34cf9bd735958ae203a2536c14240c8a5, 2024) - License: MPL 2.0 Module location: @@ -30,7 +30,7 @@ Module location: # libjuice - Upstream: https://github.com/paullouisageneau/libjuice -- Version: 1.3.3 (5f753cad49059cea4eb492eb5c11a3bbb4dd6324, 2023) +- Version: 1.3.4 (0b6f958baba55e1a4eb31ec2137f62b2e07382ae, 2024) - License: MPL 2.0 Module location: @@ -52,7 +52,7 @@ Module location: ## openssl - Upstream: git://git.openssl.org/openssl.git -- Version: 3.0.12 (c3cc0f1386b0544383a61244a4beeb762b67498f, 2023) +- Version: 3.0.13 (85cf92f55d9e2ac5aacf92bedd33fb890b9f8b4c, 2024) - License: Apache 2.0 Module location: @@ -74,7 +74,7 @@ Module location: ## usrsctp - Upstream: https://github.com/sctplab/usrsctp -- Version: git (5ca29ac7d8055802c7657191325c06386640ac24, 2023) +- Version: git (ebb18adac6501bad4501b1f6dccb67a1c85cc299, 2023) - License: BSD-3-Clause Module location: diff --git a/thirdparty/libdatachannel b/thirdparty/libdatachannel -Subproject cb77870cde2c78007a336eae3aacd234dccda16 +Subproject 7841d9f34cf9bd735958ae203a2536c14240c8a diff --git a/thirdparty/openssl b/thirdparty/openssl -Subproject c3cc0f1386b0544383a61244a4beeb762b67498 +Subproject 85cf92f55d9e2ac5aacf92bedd33fb890b9f8b4 |