Fix a Turn TCP port issue.

webrtc/p2p/base/turnport.h

 /*
  *  Copyright 2012 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 13 matching lines @@
 class AsyncResolver;
 class SignalThread;
 }
 
 namespace cricket {
 
 extern const char TURN_PORT_TYPE[];
 class TurnAllocateRequest;
 class TurnEntry;
 
+enum PortState {

[juberti1, 2015/07/30 20:47:40]

This should be TurnPortState, since it is at global scope

[honghaiz3, 2015/07/31 00:17:06]

I have moved this inside class TurnPort. 

+  STATE_DISCONNECTED,  // No socket available, cannot send any packets.
+  STATE_CONNECTING,    // Socket available, can send stun packets only.
+  STATE_CONNECTED      // Socket available and allocation response received,
+                       // can send any packets.
+};
+
 class TurnPort : public Port {
  public:
   static TurnPort* Create(rtc::Thread* thread,
                           rtc::PacketSocketFactory* factory,
                           rtc::Network* network,
                           rtc::AsyncPacketSocket* socket,
                           const std::string& username,  // ice username.
                           const std::string& password,  // ice password.
                           const ProtocolAddress& server_address,
                           const RelayCredentials& credentials,
@@ skipping 19 matching lines @@
                         username, password, server_address, credentials,
                         server_priority, origin);
   }
 
   virtual ~TurnPort();
 
   const ProtocolAddress& server_address() const { return server_address_; }
   // Returns an empty address if the local address has not been assigned.
   rtc::SocketAddress GetLocalAddress() const;
 
-  bool connected() const { return connected_; }
+  bool connected() const { return state_ == STATE_CONNECTED; }
   const RelayCredentials& credentials() const { return credentials_; }
 
   virtual void PrepareAddress();
   virtual Connection* CreateConnection(
       const Candidate& c, PortInterface::CandidateOrigin origin);
   virtual int SendTo(const void* data, size_t size,
                      const rtc::SocketAddress& addr,
                      const rtc::PacketOptions& options,
                      bool payload);
   virtual int SetOption(rtc::Socket::Option opt, int value);
@@ skipping 32 matching lines @@
   // Signal with resolved server address.
   // Parameters are port, server address and resolved server address.
   // This signal will be sent only if server address is resolved successfully.
   sigslot::signal3<TurnPort*,
                    const rtc::SocketAddress&,
                    const rtc::SocketAddress&> SignalResolvedServerAddress;
 
   // This signal is only for testing purpose.
   sigslot::signal3<TurnPort*, const rtc::SocketAddress&, int>
       SignalCreatePermissionResult;
+  // For testing purpose.
+  void SendAllocateRequest(int delay);
 
  protected:
   TurnPort(rtc::Thread* thread,
            rtc::PacketSocketFactory* factory,
            rtc::Network* network,
            rtc::AsyncPacketSocket* socket,
            const std::string& username,
            const std::string& password,
            const ProtocolAddress& server_address,
            const RelayCredentials& credentials,
@@ skipping 82 matching lines @@
   int error_;
 
   StunRequestManager request_manager_;
   std::string realm_;       // From 401/438 response message.
   std::string nonce_;       // From 401/438 response message.
   std::string hash_;        // Digest of username:realm:password
 
   int next_channel_number_;
   EntryList entries_;
 
-  bool connected_;
+  PortState state_;
   // By default the value will be set to 0. This value will be used in
   // calculating the candidate priority.
   int server_priority_;
 
   // The number of retries made due to allocate mismatch error.
   size_t allocate_mismatch_retries_;
 
   friend class TurnEntry;
   friend class TurnAllocateRequest;
   friend class TurnRefreshRequest;
   friend class TurnCreatePermissionRequest;
   friend class TurnChannelBindRequest;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TURNPORT_H_