Allow passing both hostname and IP of ICE server into PeerConnection.

webrtc/pc/iceserverparsing.cc

 /*
  *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 192 matching lines @@
   } else {
     hoststring = tokens[0];
   }
 
   int port = kDefaultStunPort;
   if (service_type == TURNS) {
     port = kDefaultStunTlsPort;
     turn_transport_type = cricket::PROTO_TLS;
   }
 
-  std::string address;
-  if (!ParseHostnameAndPortFromString(hoststring, &address, &port)) {
+  std::string hostname;
+  if (!ParseHostnameAndPortFromString(hoststring, &hostname, &port)) {
     LOG(WARNING) << "Invalid hostname format: " << uri_without_transport;
     return RTCErrorType::SYNTAX_ERROR;
   }
 
   if (port <= 0 || port > 0xffff) {
     LOG(WARNING) << "Invalid port: " << port;
     return RTCErrorType::SYNTAX_ERROR;
   }
+  rtc::SocketAddress address(hostname, port);
+  if (!server.ip.IsNil()) {
+    if (!address.IsUnresolvedIP() && address.ipaddr() != server.ip) {
+      return RTCErrorType::INVALID_PARAMETER;
+    }
+    address.SetResolvedIP(server.ip);
+  }
 
   switch (service_type) {
     case STUN:
     case STUNS:
-      stun_servers->insert(rtc::SocketAddress(address, port));
+      stun_servers->insert(address);
       break;
     case TURN:
     case TURNS: {
       if (username.empty() || server.password.empty()) {
         // The WebRTC spec requires throwing an InvalidAccessError when username
         // or credential are ommitted; this is the native equivalent.
         return RTCErrorType::INVALID_PARAMETER;
       }
       cricket::RelayServerConfig config = cricket::RelayServerConfig(
-          address, port, username, server.password, turn_transport_type);
+          address, username, server.password, turn_transport_type);
       if (server.tls_cert_policy ==
           PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck) {
         config.tls_cert_policy =
             cricket::TlsCertPolicy::TLS_CERT_POLICY_INSECURE_NO_CHECK;
       }
       turn_servers->push_back(config);
       break;
     }
     default:
       // We shouldn't get to this point with an invalid service_type, we should
@@ skipping 37 matching lines @@
   // are performed in a well-defined order.
   int priority = static_cast<int>(turn_servers->size() - 1);
   for (cricket::RelayServerConfig& turn_server : *turn_servers) {
     // First in the list gets highest priority.
     turn_server.priority = priority--;
   }
   return RTCErrorType::NONE;
 }
 
 }  // namespace webrtc