Title: [286539] trunk/Source/ThirdParty/libwebrtc
- Revision
- 286539
- Author
- you...@apple.com
- Date
- 2021-12-06 00:05:45 -0800 (Mon, 06 Dec 2021)
Log Message
Close WebRTC allocation sequence shared socket in case of sequence network failure
https://bugs.webkit.org/show_bug.cgi?id=233808
Reviewed by Geoffrey Garen.
* Source/webrtc/p2p/client/basic_port_allocator.cc:
* Source/webrtc/p2p/client/basic_port_allocator.h:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (286538 => 286539)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-12-06 05:49:52 UTC (rev 286538)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-12-06 08:05:45 UTC (rev 286539)
@@ -1,3 +1,13 @@
+2021-12-06 Youenn Fablet <you...@apple.com>
+
+ Close WebRTC allocation sequence shared socket in case of sequence network failure
+ https://bugs.webkit.org/show_bug.cgi?id=233808
+
+ Reviewed by Geoffrey Garen.
+
+ * Source/webrtc/p2p/client/basic_port_allocator.cc:
+ * Source/webrtc/p2p/client/basic_port_allocator.h:
+
2021-11-22 Youenn Fablet <you...@apple.com>
Remove h264_bitstream_parser spurious logging
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/p2p/client/basic_port_allocator.cc (286538 => 286539)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/p2p/client/basic_port_allocator.cc 2021-12-06 05:49:52 UTC (rev 286538)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/p2p/client/basic_port_allocator.cc 2021-12-06 08:05:45 UTC (rev 286539)
@@ -1272,9 +1272,22 @@
relay_ports_.clear();
}
+#if defined(WEBRTC_WEBKIT_BUILD)
+void AllocationSequence::set_network_failed()
+{
+ network_failed_ = true;
+ if (udp_socket_) {
+ udp_socket_->SetError(ENETDOWN);
+ udp_socket_->Close();
+ }
+}
+#endif
+
void AllocationSequence::OnNetworkFailed() {
RTC_DCHECK(!network_failed_);
- network_failed_ = true;
+#if defined(WEBRTC_WEBKIT_BUILD)
+ set_network_failed();
+#endif
// Stop the allocation sequence if its network failed.
Stop();
}
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/p2p/client/basic_port_allocator.h (286538 => 286539)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/p2p/client/basic_port_allocator.h 2021-12-06 05:49:52 UTC (rev 286538)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/p2p/client/basic_port_allocator.h 2021-12-06 08:05:45 UTC (rev 286539)
@@ -355,7 +355,11 @@
rtc::Network* network() const { return network_; }
bool network_failed() const { return network_failed_; }
+#if defined(WEBRTC_WEBKIT_BUILD)
+ void set_network_failed();
+#else
void set_network_failed() { network_failed_ = true; }
+#endif
// Disables the phases for a new sequence that this one already covers for an
// equivalent network setup.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
