| Index: webrtc/p2p/base/portallocator.h
|
| diff --git a/webrtc/p2p/base/portallocator.h b/webrtc/p2p/base/portallocator.h
|
| index 723a0000e56365cc1a1bdbc9a8d140354784a250..2463d6bd101860789737d2e7c55045ea99f3c2e9 100644
|
| --- a/webrtc/p2p/base/portallocator.h
|
| +++ b/webrtc/p2p/base/portallocator.h
|
| @@ -91,6 +91,17 @@ typedef std::vector<ProtocolAddress> PortList;
|
| struct RelayServerConfig {
|
| RelayServerConfig(RelayType type) : type(type), priority(0) {}
|
|
|
| + RelayServerConfig(const std::string& address,
|
| + int port,
|
| + const std::string& username,
|
| + const std::string& password,
|
| + ProtocolType proto,
|
| + bool secure)
|
| + : type(RELAY_TURN), credentials(username, password) {
|
| + ports.push_back(
|
| + ProtocolAddress(rtc::SocketAddress(address, port), proto, secure));
|
| + }
|
| +
|
| RelayType type;
|
| PortList ports;
|
| RelayCredentials credentials;
|
| @@ -168,6 +179,10 @@ class PortAllocator : public sigslot::has_slots<> {
|
| const ServerAddresses& stun_servers,
|
| const std::vector<RelayServerConfig>& turn_servers) = 0;
|
|
|
| + // Sets the network types to ignore.
|
| + // Values are defined by the AdapterType enum.
|
| + virtual void SetNetworkIgnoreMask(int network_ignore_mask) = 0;
|
| +
|
| PortAllocatorSession* CreateSession(
|
| const std::string& sid,
|
| const std::string& content_name,
|
|
|