Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Unified Diff: webrtc/p2p/base/portallocator.h

Issue 2926823003: Allow passing both hostname and IP of ICE server into PeerConnection. (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/api/peerconnectioninterface.h ('k') | webrtc/pc/iceserverparsing.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/portallocator.h
diff --git a/webrtc/p2p/base/portallocator.h b/webrtc/p2p/base/portallocator.h
index a77b037e7294133973f83bc41f49ba2dabb836bc..9e7537d8fac9dc909f3a811e7dded18bcd89dfc4 100644
--- a/webrtc/p2p/base/portallocator.h
+++ b/webrtc/p2p/base/portallocator.h
@@ -129,13 +129,12 @@ typedef std::vector<ProtocolAddress> PortList;
struct RelayServerConfig {
RelayServerConfig(RelayType type) : type(type) {}
- RelayServerConfig(const std::string& address,
- int port,
+ RelayServerConfig(const rtc::SocketAddress& address,
const std::string& username,
const std::string& password,
ProtocolType proto)
: type(RELAY_TURN), credentials(username, password) {
- ports.push_back(ProtocolAddress(rtc::SocketAddress(address, port), proto));
+ ports.push_back(ProtocolAddress(address, proto));
}
// Legacy constructor where "secure" and PROTO_TCP implies PROTO_TLS.
@@ -145,8 +144,7 @@ struct RelayServerConfig {
const std::string& password,
ProtocolType proto,
bool secure)
- : RelayServerConfig(address,
- port,
+ : RelayServerConfig(rtc::SocketAddress(address, port),
username,
password,
(proto == PROTO_TCP && secure ? PROTO_TLS : proto)) {}
« no previous file with comments | « webrtc/api/peerconnectioninterface.h ('k') | webrtc/pc/iceserverparsing.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698