Title: [236316] trunk/Source/ThirdParty/libwebrtc
Revision
236316
Author
commit-qu...@webkit.org
Date
2018-09-21 07:37:48 -0700 (Fri, 21 Sep 2018)

Log Message

[libwebrtc] Allow IP mismatch for local connections on localhost
https://bugs.webkit.org/show_bug.cgi?id=189828

Patch by Thibault Saunier <tsaun...@igalia.com> on 2018-09-21
Reviewed by Alejandro G. Castro.

The rest of the code allows it, but there was an unecessary assert

See Bug 187302

* Source/webrtc/p2p/base/tcpport.cc:

Modified Paths

Diff

Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (236315 => 236316)


--- trunk/Source/ThirdParty/libwebrtc/ChangeLog	2018-09-21 14:35:38 UTC (rev 236315)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog	2018-09-21 14:37:48 UTC (rev 236316)
@@ -1,3 +1,16 @@
+2018-09-21  Thibault Saunier  <tsaun...@igalia.com>
+
+        [libwebrtc] Allow IP mismatch for local connections on localhost
+        https://bugs.webkit.org/show_bug.cgi?id=189828
+
+        Reviewed by Alejandro G. Castro.
+
+        The rest of the code allows it, but there was an unecessary assert
+
+        See Bug 187302
+
+        * Source/webrtc/p2p/base/tcpport.cc:
+
 2018-09-18  Youenn Fablet  <you...@apple.com>
 
         Implement RTCRtpReceiver getContributingSources/getSynchronizationSources

Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/p2p/base/tcpport.cc (236315 => 236316)


--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/p2p/base/tcpport.cc	2018-09-21 14:35:38 UTC (rev 236315)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/p2p/base/tcpport.cc	2018-09-21 14:37:48 UTC (rev 236316)
@@ -351,11 +351,21 @@
                         << ", port() Network:" << port->Network()->ToString();
     const std::vector<rtc::InterfaceAddress>& desired_addresses =
         port_->Network()->GetIPs();
+
+#if defined(WEBRTC_WEBKIT_BUILD)
+    RTC_DCHECK(socket->GetLocalAddress().IsLoopbackIP() ||
+               (std::find_if(desired_addresses.begin(), desired_addresses.end(),
+                            [this](const rtc::InterfaceAddress& addr) {
+                              return socket_->GetLocalAddress().ipaddr() ==
+                                     addr;
+                            }) != desired_addresses.end()));
+#else
     RTC_DCHECK(std::find_if(desired_addresses.begin(), desired_addresses.end(),
                             [this](const rtc::InterfaceAddress& addr) {
                               return socket_->GetLocalAddress().ipaddr() ==
                                      addr;
                             }) != desired_addresses.end());
+#endif
     ConnectSocketSignals(socket);
   }
 }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to