| Index: webrtc/p2p/base/stunport.h
|
| diff --git a/webrtc/p2p/base/stunport.h b/webrtc/p2p/base/stunport.h
|
| index 274f188f28ef33f42334044a3a8d28e080db6857..d840a97126b9e74b24ba5e0750da32821d6b4fdc 100644
|
| --- a/webrtc/p2p/base/stunport.h
|
| +++ b/webrtc/p2p/base/stunport.h
|
| @@ -34,11 +34,9 @@
|
| rtc::AsyncPacketSocket* socket,
|
| const std::string& username,
|
| const std::string& password,
|
| - const std::string& origin,
|
| - bool emit_localhost_for_anyaddress) {
|
| + const std::string& origin) {
|
| UDPPort* port = new UDPPort(thread, factory, network, socket,
|
| - username, password, origin,
|
| - emit_localhost_for_anyaddress);
|
| + username, password, origin);
|
| if (!port->Init()) {
|
| delete port;
|
| port = NULL;
|
| @@ -54,12 +52,10 @@
|
| uint16 max_port,
|
| const std::string& username,
|
| const std::string& password,
|
| - const std::string& origin,
|
| - bool emit_localhost_for_anyaddress) {
|
| + const std::string& origin) {
|
| UDPPort* port = new UDPPort(thread, factory, network,
|
| ip, min_port, max_port,
|
| - username, password, origin,
|
| - emit_localhost_for_anyaddress);
|
| + username, password, origin);
|
| if (!port->Init()) {
|
| delete port;
|
| port = NULL;
|
| @@ -114,8 +110,7 @@
|
| uint16 max_port,
|
| const std::string& username,
|
| const std::string& password,
|
| - const std::string& origin,
|
| - bool emit_localhost_for_anyaddress);
|
| + const std::string& origin);
|
|
|
| UDPPort(rtc::Thread* thread,
|
| rtc::PacketSocketFactory* factory,
|
| @@ -123,8 +118,7 @@
|
| rtc::AsyncPacketSocket* socket,
|
| const std::string& username,
|
| const std::string& password,
|
| - const std::string& origin,
|
| - bool emit_localhost_for_anyaddress);
|
| + const std::string& origin);
|
|
|
| bool Init();
|
|
|
| @@ -207,10 +201,6 @@
|
| rtc::scoped_ptr<AddressResolver> resolver_;
|
| bool ready_;
|
| int stun_keepalive_delay_;
|
| -
|
| - // This is true when no STUN or TURN is specified in AllocationSequence and
|
| - // PORTALLOCATOR_ENABLE_LOCALHOST_CANDIDATE is specified.
|
| - bool emit_localhost_for_anyaddress_;
|
|
|
| friend class StunBindingRequest;
|
| };
|
| @@ -255,7 +245,7 @@
|
| const ServerAddresses& servers,
|
| const std::string& origin)
|
| : UDPPort(thread, factory, network, ip, min_port, max_port, username,
|
| - password, origin, false) {
|
| + password, origin) {
|
| // UDPPort will set these to local udp, updating these to STUN.
|
| set_type(STUN_PORT_TYPE);
|
| set_server_addresses(servers);
|
|
|