| Index: webrtc/p2p/base/stunport.h
|
| diff --git a/webrtc/p2p/base/stunport.h b/webrtc/p2p/base/stunport.h
|
| index 62b23cf074ba2084b9ce4b8cd4ca0553b2c6f635..9570b8065b691d574981415354dcb1852a5cb9b0 100644
|
| --- a/webrtc/p2p/base/stunport.h
|
| +++ b/webrtc/p2p/base/stunport.h
|
| @@ -35,10 +35,9 @@ class UDPPort : public Port {
|
| const std::string& username,
|
| const std::string& password,
|
| const std::string& origin,
|
| - bool emit_localhost_for_anyaddress) {
|
| - UDPPort* port = new UDPPort(thread, factory, network, socket,
|
| - username, password, origin,
|
| - emit_localhost_for_anyaddress);
|
| + bool emit_local_for_anyaddress) {
|
| + UDPPort* port = new UDPPort(thread, factory, network, socket, username,
|
| + password, origin, emit_local_for_anyaddress);
|
| if (!port->Init()) {
|
| delete port;
|
| port = NULL;
|
| @@ -55,11 +54,10 @@ class UDPPort : public Port {
|
| const std::string& username,
|
| const std::string& password,
|
| const std::string& origin,
|
| - bool emit_localhost_for_anyaddress) {
|
| - UDPPort* port = new UDPPort(thread, factory, network,
|
| - ip, min_port, max_port,
|
| - username, password, origin,
|
| - emit_localhost_for_anyaddress);
|
| + bool emit_local_for_anyaddress) {
|
| + UDPPort* port =
|
| + new UDPPort(thread, factory, network, ip, min_port, max_port, username,
|
| + password, origin, emit_local_for_anyaddress);
|
| if (!port->Init()) {
|
| delete port;
|
| port = NULL;
|
| @@ -115,7 +113,7 @@ class UDPPort : public Port {
|
| const std::string& username,
|
| const std::string& password,
|
| const std::string& origin,
|
| - bool emit_localhost_for_anyaddress);
|
| + bool emit_local_for_anyaddress);
|
|
|
| UDPPort(rtc::Thread* thread,
|
| rtc::PacketSocketFactory* factory,
|
| @@ -124,7 +122,7 @@ class UDPPort : public Port {
|
| const std::string& username,
|
| const std::string& password,
|
| const std::string& origin,
|
| - bool emit_localhost_for_anyaddress);
|
| + bool emit_local_for_anyaddress);
|
|
|
| bool Init();
|
|
|
| @@ -211,8 +209,9 @@ class UDPPort : public Port {
|
| bool ready_;
|
| int stun_keepalive_delay_;
|
|
|
| - // This is true when PORTALLOCATOR_ENABLE_LOCALHOST_CANDIDATE is specified.
|
| - bool emit_localhost_for_anyaddress_;
|
| + // This is true by default and false when
|
| + // PORTALLOCATOR_DISABLE_LOCAL_CANDIDATE is specified.
|
| + bool emit_local_for_anyaddress_;
|
|
|
| friend class StunBindingRequest;
|
| };
|
|
|