Changeset 231235 in webkit

Timestamp:

May 2, 2018 9:42:10 AM (6 years ago)

Author:

youenn@apple.com

Message:

Cannot gather srflx or relay ICE candidates on IPv6 network (ICE agent hangs?)
​https://bugs.webkit.org/show_bug.cgi?id=181009
<rdar://problem/36144555>

Reviewed by Eric Carlson.

On iOS/IPv6 networks, STUN servers name resolution returns a zero IPv6 IP address.
No error is raised which leads to sending STUN requests with that IP address.
Once the request times out, the ICE candidate gathering finishes with host candidates only.

This patch makes WebRTC DNS resolver to send only IPv4 resolved addresses.
STUN is used for NAT traversal which is for IPv4 addresses.
Not sending IPv6 addresses allows terminating ICE candidate gathering sooner.

Manually tested on iOS with IPv4/IPv6 and IPv6 networks.

• NetworkProcess/webrtc/NetworkRTCResolverCocoa.cpp:

(WebKit::resolvedName):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/webrtc/NetworkRTCResolverCocoa.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-05-02  Youenn Fablet  <youenn@apple.com>
+
+        Cannot gather srflx or relay ICE candidates on IPv6 network (ICE agent hangs?)
+        https://bugs.webkit.org/show_bug.cgi?id=181009
+        <rdar://problem/36144555>
+
+        Reviewed by Eric Carlson.
+
+        On iOS/IPv6 networks, STUN servers name resolution returns a zero IPv6 IP address.
+        No error is raised which leads to sending STUN requests with that IP address.
+        Once the request times out, the ICE candidate gathering finishes with host candidates only.
+
+        This patch makes WebRTC DNS resolver to send only IPv4 resolved addresses.
+        STUN is used for NAT traversal which is for IPv4 addresses.
+        Not sending IPv6 addresses allows terminating ICE candidate gathering sooner.
+
+        Manually tested on iOS with IPv4/IPv6 and IPv6 networks.
+
+        * NetworkProcess/webrtc/NetworkRTCResolverCocoa.cpp:
+        (WebKit::resolvedName):
+
 2018-05-02  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/NetworkProcess/webrtc/NetworkRTCResolverCocoa.cpp

@@ -57 +57 @@
         CFDataRef data = (CFDataRef)CFArrayGetValueAtIndex(resolvedAddresses, index);
         auto* address = reinterpret_cast<const struct sockaddr_in*>(CFDataGetBytePtr(data));
-        addresses.uncheckedAppend(WebCore::IPAddress(*address));
+        if (address->sin_family == AF_INET)
+            addresses.uncheckedAppend(WebCore::IPAddress(*address));
+        // FIXME: We should probably return AF_INET6 addresses as well.
+    }
+    if (addresses.isEmpty()) {
+        resolver->completed(makeUnexpected(WebCore::DNSError::CannotResolve));
+        return;
     }
     resolver->completed(WTFMove(addresses));