Reset TURN port NONCE when a new socket is created.

webrtc/p2p/base/turnserver.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 181 matching lines @@
   void AddInternalSocket(rtc::AsyncPacketSocket* socket,
                          ProtocolType proto);
   // Starts listening for the connections on this socket. When someone tries
   // to connect, the connection will be accepted and a new internal socket
   // will be added.
   void AddInternalServerSocket(rtc::AsyncSocket* socket,
                                ProtocolType proto);
   // Specifies the factory to use for creating external sockets.
   void SetExternalSocketFactory(rtc::PacketSocketFactory* factory,
                                 const rtc::SocketAddress& address);
+  // For testing only.
+  std::string SetTimestampForNextNonce(uint32_t timestamp) {
+    ts_for_next_nonce_ = timestamp;
+    return GenerateNonce(timestamp);
+  }
 
  private:
+  std::string GenerateNonce(uint32_t now) const;
   void OnInternalPacket(rtc::AsyncPacketSocket* socket, const char* data,
                         size_t size, const rtc::SocketAddress& address,
                         const rtc::PacketTime& packet_time);
 
   void OnNewInternalConnection(rtc::AsyncSocket* socket);
 
   // Accept connections on this server socket.
   void AcceptConnection(rtc::AsyncSocket* server_socket);
   void OnInternalSocketClose(rtc::AsyncPacketSocket* socket, int err);
 
   void HandleStunMessage(
       TurnServerConnection* conn, const char* data, size_t size);
   void HandleBindingRequest(TurnServerConnection* conn, const StunMessage* msg);
   void HandleAllocateRequest(TurnServerConnection* conn, const TurnMessage* msg,
                              const std::string& key);
 
   bool GetKey(const StunMessage* msg, std::string* key);
   bool CheckAuthorization(TurnServerConnection* conn, const StunMessage* msg,
                           const char* data, size_t size,
                           const std::string& key);
-  std::string GenerateNonce() const;
   bool ValidateNonce(const std::string& nonce) const;
 
   TurnServerAllocation* FindAllocation(TurnServerConnection* conn);
   TurnServerAllocation* CreateAllocation(
       TurnServerConnection* conn, int proto, const std::string& key);
 
   void SendErrorResponse(TurnServerConnection* conn, const StunMessage* req,
                          int code, const std::string& reason);
 
   void SendErrorResponseWithRealmAndNonce(TurnServerConnection* conn,
@@ skipping 28 matching lines @@
   bool reject_private_addresses_ = false;
 
   InternalSocketMap server_sockets_;
   ServerSocketMap server_listen_sockets_;
   rtc::scoped_ptr<rtc::PacketSocketFactory>
       external_socket_factory_;
   rtc::SocketAddress external_addr_;
 
   AllocationMap allocations_;
 
+  // For testing only. If this is non-zero, the next NONCE will be generated
+  // from this value, and it will be reset to 0 after generating the NONCE.
+  uint32_t ts_for_next_nonce_ = 0;
+
   friend class TurnServerAllocation;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TURNSERVER_H_