Title: [216436] trunk/Source
- Revision
- 216436
- Author
- commit-qu...@webkit.org
- Date
- 2017-05-08 10:39:37 -0700 (Mon, 08 May 2017)
Log Message
TURNS gathering is not working properly
https://bugs.webkit.org/show_bug.cgi?id=171747
Patch by Youenn Fablet <you...@apple.com> on 2017-05-08
Reviewed by Eric Carlson.
Source/ThirdParty/libwebrtc:
* Source/webrtc/base/openssladapter.cc: Adding support for SNI in case of TLS ice candidate gathering.
Source/WebCore:
Covered by manual tests.
* Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp:
(WebCore::configurationFromMediaEndpointConfiguration): Reveting TURNS ice server skipping.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (216435 => 216436)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-05-08 17:39:20 UTC (rev 216435)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-05-08 17:39:37 UTC (rev 216436)
@@ -1,3 +1,12 @@
+2017-05-08 Youenn Fablet <you...@apple.com>
+
+ TURNS gathering is not working properly
+ https://bugs.webkit.org/show_bug.cgi?id=171747
+
+ Reviewed by Eric Carlson.
+
+ * Source/webrtc/base/openssladapter.cc: Adding support for SNI in case of TLS ice candidate gathering.
+
2017-04-29 Dan Bernstein <m...@apple.com>
[Xcode] libwebrtc SRCROOT includes examples
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/openssladapter.cc (216435 => 216436)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/openssladapter.cc 2017-05-08 17:39:20 UTC (rev 216435)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/openssladapter.cc 2017-05-08 17:39:37 UTC (rev 216436)
@@ -332,6 +332,11 @@
}
SSL_set_app_data(ssl_, this);
+ // WEBKIT Changes - Start
+ if (ssl_host_name_.length()) {
+ SSL_set_tlsext_host_name(ssl_, ssl_host_name_.c_str());
+ }
+ // WEBKIT Changes - End
SSL_set_bio(ssl_, bio, bio);
SSL_set_mode(ssl_, SSL_MODE_ENABLE_PARTIAL_WRITE |
Modified: trunk/Source/WebCore/ChangeLog (216435 => 216436)
--- trunk/Source/WebCore/ChangeLog 2017-05-08 17:39:20 UTC (rev 216435)
+++ trunk/Source/WebCore/ChangeLog 2017-05-08 17:39:37 UTC (rev 216436)
@@ -1,3 +1,15 @@
+2017-05-08 Youenn Fablet <you...@apple.com>
+
+ TURNS gathering is not working properly
+ https://bugs.webkit.org/show_bug.cgi?id=171747
+
+ Reviewed by Eric Carlson.
+
+ Covered by manual tests.
+
+ * Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp:
+ (WebCore::configurationFromMediaEndpointConfiguration): Reveting TURNS ice server skipping.
+
2017-05-08 Michael Catanzaro <mcatanz...@igalia.com>
Unreviewed, rolling out r216419.
Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp (216435 => 216436)
--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp 2017-05-08 17:39:20 UTC (rev 216435)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp 2017-05-08 17:39:37 UTC (rev 216436)
@@ -88,14 +88,9 @@
webrtc::PeerConnectionInterface::IceServer iceServer;
iceServer.username = server.username.utf8().data();
iceServer.password = server.credential.utf8().data();
- for (auto& url : server.urls) {
- // FIXME: If TURNS is failing, the whole ICE candidate gathering is failing.
- // We should fix that and reactivate TURNS gathering.
- if (!url.protocolIs("turns"))
- iceServer.urls.push_back({ url.string().utf8().data() });
- }
- if (iceServer.urls.size())
- rtcConfiguration.servers.push_back(WTFMove(iceServer));
+ for (auto& url : server.urls)
+ iceServer.urls.push_back({ url.string().utf8().data() });
+ rtcConfiguration.servers.push_back(WTFMove(iceServer));
}
rtcConfiguration.ice_candidate_pool_size = configuration.iceCandidatePoolSize;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
