Changeset 247430 in webkit

Timestamp:

Jul 15, 2019 7:32:48 AM (5 years ago)

Author:

youenn@apple.com

Message:

Filter SDP c lines
​https://bugs.webkit.org/show_bug.cgi?id=199791

Reviewed by Eric Carlson.

Source/WebCore:

As discussed in ​https://github.com/rtcweb-wg/mdns-ice-candidates/issues/91,
use 0.0.0.0 for c lines when filtering the SDP.
Covered by updated test.

• Modules/mediastream/PeerConnectionBackend.cpp:

(WebCore::PeerConnectionBackend::filterSDP const):

LayoutTests:

• webrtc/datachannel/filter-ice-candidate.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webrtc/datachannel/filter-ice-candidate.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-07-15  Youenn Fablet  <youenn@apple.com>
+
+        Filter SDP c lines
+        https://bugs.webkit.org/show_bug.cgi?id=199791
+
+        Reviewed by Eric Carlson.
+
+        * webrtc/datachannel/filter-ice-candidate.html:
+
 2019-07-14  Dean Jackson  <dino@apple.com>
 

trunk/LayoutTests/webrtc/datachannel/filter-ice-candidate.html

@@ -25 +25 @@
             }
             assert_equals(pc.localDescription.sdp.indexOf("a=candidate"), -1);
+            assert_true(pc.localDescription.sdp.indexOf("c=IN IP4 0.0.0.0") != -1 || pc.localDescription.sdp.indexOf("c=IN IP6 ::") != -1);
             if (counter === 0) {
                 pc.createOffer().then((offer) => {
+                    assert_true(offer.sdp.indexOf("c=IN IP4 0.0.0.0") != -1 || pc.localDescription.sdp.indexOf("c=IN IP6 ::") != -1);
                     assert_equals(offer.sdp.indexOf("a=candidate"), -1);
                     resolve();
@@ -55 +57 @@
                 return;
             }
+            assert_true(pc.localDescription.sdp.indexOf("c=IN IP4 0.0.0.0") == -1 && pc.localDescription.sdp.indexOf("c=IN IP6 ::") === -1);
             assert_false(pc.localDescription.sdp.indexOf("a=candidate") === -1);
             if (counter !== 0) {
                 // Redoing an offer now that we have some candidates.
                 pc.createOffer().then((offer) => {
+                    assert_true(offer.sdp.indexOf("c=IN IP4 0.0.0.0") == -1 && pc.localDescription.sdp.indexOf("c=IN IP6 ::") === -1);
                     assert_false(offer.sdp.indexOf("a=candidate") === -1);
                     resolve();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-15  Youenn Fablet  <youenn@apple.com>
+
+        Filter SDP c lines
+        https://bugs.webkit.org/show_bug.cgi?id=199791
+
+        Reviewed by Eric Carlson.
+
+        As discussed in https://github.com/rtcweb-wg/mdns-ice-candidates/issues/91,
+        use 0.0.0.0 for c lines when filtering the SDP.
+        Covered by updated test.
+
+        * Modules/mediastream/PeerConnectionBackend.cpp:
+        (WebCore::PeerConnectionBackend::filterSDP const):
+
 2019-07-15  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp

@@ -413 +413 @@
     StringBuilder filteredSDP;
     sdp.split('\n', [&filteredSDP](StringView line) {
-        if (!line.startsWith("a=candidate"))
+        if (line.startsWith("c=IN IP4"))
+            filteredSDP.append("c=IN IP4 0.0.0.0");
+        else if (line.startsWith("c=IN IP6"))
+            filteredSDP.append("c=IN IP6 ::");
+        else if (!line.startsWith("a=candidate"))
             filteredSDP.append(line);
         else if (line.find(" host ", 11) == notFound)