| 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)) {}
|
|
|