Changeset 267401 in webkit

Timestamp:

Sep 22, 2020, 1:03:38 AM (6 years ago)

Author:

youenn@apple.com

Message:

toRTCIceProtocol should handle ssltcp candidates
​https://bugs.webkit.org/show_bug.cgi?id=216762

Reviewed by Darin Adler.

Source/WebCore:

Covered by mock WebRTC backend pushing ssltcp candidates.

• Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp:

(WebCore::toRTCIceProtocol):

• testing/MockLibWebRTCPeerConnection.cpp:

LayoutTests:

• fast/mediastream/RTCPeerConnection-icecandidate-event-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-icecandidate-event-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp (modified) (1 diff)
• Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-22  Youenn Fablet  <youenn@apple.com>
+
+        toRTCIceProtocol should handle ssltcp candidates
+        https://bugs.webkit.org/show_bug.cgi?id=216762
+
+        Reviewed by Darin Adler.
+
+        * fast/mediastream/RTCPeerConnection-icecandidate-event-expected.txt:
+
 2020-09-21  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-icecandidate-event-expected.txt

@@ -20 +20 @@
 PASS candidate.sdpMLineIndex is 0
 FAIL candidate.sdpMid should be null (of type object). Was 1 (of type string).
+PASS candidate.candidate: candidate:1019216384 1 ssltcp 1019216385 192.168.0.100 49888 typ host generation 0
+PASS Got candidate
+PASS candidate instanceof RTCIceCandidate is true
+PASS candidate.sdpMLineIndex is 0
+FAIL candidate.sdpMid should be null (of type object). Was 1 (of type string).
 PASS candidate.candidate: candidate:1677722111 1 tcp 1677722112 172.18.0.1 47989 typ srflx raddr 192.168.0.100 rport 47989 generation 0
 PASS Got end of candidates

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-22  Youenn Fablet  <youenn@apple.com>
+
+        toRTCIceProtocol should handle ssltcp candidates
+        https://bugs.webkit.org/show_bug.cgi?id=216762
+
+        Reviewed by Darin Adler.
+
+        Covered by mock WebRTC backend pushing ssltcp candidates.
+
+        * Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp:
+        (WebCore::toRTCIceProtocol):
+        * testing/MockLibWebRTCPeerConnection.cpp:
+
 2020-09-21  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp

@@ -267 +267 @@
     if (protocol == "udp")
         return RTCIceProtocol::Udp;
-    ASSERT(protocol == "tcp");
+    ASSERT(protocol == "tcp" || protocol == "ssltcp");
     return RTCIceProtocol::Tcp;
 }

trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp

@@ -129 +129 @@
         MockLibWebRTCIceCandidate candidate("candidate:1019216383 1 tcp 1019216384 192.168.0.100 9 typ host tcptype passive generation 0", "1");
         m_observer.OnIceCandidate(&candidate);
+        MockLibWebRTCIceCandidate candidateSSLTcp("candidate:1019216384 1 ssltcp 1019216385 192.168.0.100 49888 typ host generation 0", "1");
+        m_observer.OnIceCandidate(&candidateSSLTcp);
     });