name change for connect(..) param in reTurn; is_v6 -> allowV6

git-svn-id: https://svn.resiprocate.org/rep/resiprocate/branches/b-counterpath-recon-20130424@10204 ddefafc4-47db-0310-ae44-fa13212b10f2
resiprocate · May 9, 2013 · f5754d3 · f5754d3
1 parent 4a68f9f
commit f5754d3
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/reTurn/AsyncSocketBase.hxx b/reTurn/AsyncSocketBase.hxx
@@ -30,7 +30,7 @@ public:
 
    /// Note:  The following API's are thread safe and queue the request to be handled by the ioService thread
    virtual asio::error_code bind(const asio::ip::address& address, unsigned short port) = 0;
-   virtual void connect(const std::string& address, unsigned short port, bool is_v6) = 0;  
+   virtual void connect(const std::string& address, unsigned short port, bool allowV6) = 0;  
    /// Note: destination is ignored for TCP and TLS connections
    virtual void send(const StunTuple& destination, boost::shared_ptr<DataBuffer>& data);  // Send unframed data
    virtual void send(const StunTuple& destination, unsigned short channel, boost::shared_ptr<DataBuffer>& data);  // send with turn framing

diff --git a/reTurn/AsyncTcpSocketBase.cxx b/reTurn/AsyncTcpSocketBase.cxx
@@ -47,7 +47,7 @@ AsyncTcpSocketBase::bind(const asio::ip::address& address, unsigned short port)
 }
 
 void 
-AsyncTcpSocketBase::connect(const std::string& address, unsigned short port, bool is_v6)
+AsyncTcpSocketBase::connect(const std::string& address, unsigned short port, bool allowV6)
 {
    // Start an asynchronous resolve to translate the address
    // into a list of endpoints.

diff --git a/reTurn/AsyncTcpSocketBase.hxx b/reTurn/AsyncTcpSocketBase.hxx
@@ -17,7 +17,7 @@ public:
    virtual unsigned int getSocketDescriptor();
 
    virtual asio::error_code bind(const asio::ip::address& address, unsigned short port);
-   virtual void connect(const std::string& address, unsigned short port, bool is_v6);  
+   virtual void connect(const std::string& address, unsigned short port, bool allowV6);  
 
    virtual void transportReceive();
    virtual void transportFramedReceive();

diff --git a/reTurn/AsyncTlsSocketBase.cxx b/reTurn/AsyncTlsSocketBase.cxx
@@ -54,7 +54,7 @@ AsyncTlsSocketBase::bind(const asio::ip::address& address, unsigned short port)
 }
 
 void 
-AsyncTlsSocketBase::connect(const std::string& address, unsigned short port, bool is_v6)
+AsyncTlsSocketBase::connect(const std::string& address, unsigned short port, bool allowV6)
 {
    mHostname = address;
 

diff --git a/reTurn/AsyncTlsSocketBase.hxx b/reTurn/AsyncTlsSocketBase.hxx
@@ -24,7 +24,7 @@ public:
    virtual unsigned int getSocketDescriptor();
 
    virtual asio::error_code bind(const asio::ip::address& address, unsigned short port);
-   virtual void connect(const std::string& address, unsigned short port, bool is_v6);  
+   virtual void connect(const std::string& address, unsigned short port, bool allowV6);  
 
    void doHandshake();
 

diff --git a/reTurn/AsyncUdpSocketBase.cxx b/reTurn/AsyncUdpSocketBase.cxx
@@ -44,13 +44,13 @@ AsyncUdpSocketBase::bind(const asio::ip::address& address, unsigned short port)
 }
 
 void 
-AsyncUdpSocketBase::connect(const std::string& address, unsigned short port, bool is_v6)
+AsyncUdpSocketBase::connect(const std::string& address, unsigned short port, bool allowV6)
 {
    // Start an asynchronous resolve to translate the address
    // into a list of endpoints.
    resip::Data service(port);
 #ifdef USE_IPV6
-   asio::ip::udp::resolver::query query((is_v6 ? asio::ip::udp::v6() : asio::ip::udp::v4()), address, service.c_str());   
+   asio::ip::udp::resolver::query query((allowV6 ? asio::ip::udp::v6() : asio::ip::udp::v4()), address, service.c_str());   
 #else
    asio::ip::udp::resolver::query query(asio::ip::udp::v4(), address, service.c_str());   
 #endif

diff --git a/reTurn/AsyncUdpSocketBase.hxx b/reTurn/AsyncUdpSocketBase.hxx
@@ -17,7 +17,7 @@ public:
    virtual unsigned int getSocketDescriptor();
 
    virtual asio::error_code bind(const asio::ip::address& address, unsigned short port);
-   virtual void connect(const std::string& address, unsigned short port, bool is_v6);  
+   virtual void connect(const std::string& address, unsigned short port, bool allowV6);  
 
    virtual void transportReceive();
    virtual void transportFramedReceive();

diff --git a/reTurn/client/TurnAsyncSocket.cxx b/reTurn/client/TurnAsyncSocket.cxx
@@ -1100,9 +1100,9 @@ TurnAsyncSocket::sendToRemotePeer(RemotePeer& remotePeer, boost::shared_ptr<Data
 }
 
 void
-TurnAsyncSocket::connect(const std::string& address, unsigned short port, bool is_v6)
+TurnAsyncSocket::connect(const std::string& address, unsigned short port, bool allowV6)
 {
-   mAsyncSocketBase.connect(address, port, is_v6);
+   mAsyncSocketBase.connect(address, port, allowV6);
 }
 
 void

diff --git a/reTurn/client/TurnAsyncSocket.hxx b/reTurn/client/TurnAsyncSocket.hxx
@@ -58,7 +58,7 @@ public:
    // Sets the local HmacKey, used to check the integrity of incoming STUN messages
    void setLocalPassword(const char* password);
 
-   void connect(const std::string& address, unsigned short port, bool is_v6);
+   void connect(const std::string& address, unsigned short port, bool allowV6);
 
    // Stun Binding Method - use getReflexiveTuple() to get binding info
    void bindRequest();

diff --git a/reTurn/client/test/TestAsyncClient.cxx b/reTurn/client/test/TestAsyncClient.cxx
@@ -293,7 +293,7 @@ int main(int argc, char* argv[])
     handler.setTurnAsyncSocket(turnSocket.get());
 
     // Connect to Stun/Turn Server
-    turnSocket->connect(argv[1], port);
+    turnSocket->connect(argv[1], port, false);
 
     // Set the username and password
     turnSocket->setUsernameAndPassword(username, password);

diff --git a/reTurn/client/test/TestRtpLoad.cxx b/reTurn/client/test/TestRtpLoad.cxx
@@ -368,7 +368,7 @@ int main(int argc, char* argv[])
     handler.setTurnAsyncSocket(turnSocket.get());
 
     // Connect to Stun/Turn Server
-    turnSocket->connect(turnAddress.c_str(), port);
+    turnSocket->connect(turnAddress.c_str(), port, false);
 
     // Set the username and password
     turnSocket->setUsernameAndPassword(username, password);