Ensuring that UDP TURN servers are always used as STUN servers.

webrtc/base/natsocketfactory.h

 /*
  *  Copyright 2004 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 19 matching lines @@
   virtual ~NATInternalSocketFactory() {}
   virtual AsyncSocket* CreateInternalSocket(int family, int type,
       const SocketAddress& local_addr, SocketAddress* nat_addr) = 0;
 };
 
 // Creates sockets that will send all traffic through a NAT, using an existing
 // NATServer instance running at nat_addr. The actual data is sent using sockets
 // from a socket factory, given to the constructor.
 class NATSocketFactory : public SocketFactory, public NATInternalSocketFactory {
  public:
-  NATSocketFactory(SocketFactory* factory, const SocketAddress& nat_addr);
+  NATSocketFactory(SocketFactory* factory, const SocketAddress& nat_udp_addr,
+                   const SocketAddress& nat_tcp_addr);
 
   // SocketFactory implementation
   Socket* CreateSocket(int type) override;
   Socket* CreateSocket(int family, int type) override;
   AsyncSocket* CreateAsyncSocket(int type) override;
   AsyncSocket* CreateAsyncSocket(int family, int type) override;
 
   // NATInternalSocketFactory implementation
   AsyncSocket* CreateInternalSocket(int family,
                                     int type,
                                     const SocketAddress& local_addr,
                                     SocketAddress* nat_addr) override;
 
  private:
   SocketFactory* factory_;
-  SocketAddress nat_addr_;
+  SocketAddress nat_udp_addr_;
+  SocketAddress nat_tcp_addr_;
   DISALLOW_COPY_AND_ASSIGN(NATSocketFactory);
 };
 
 // Creates sockets that will send traffic through a NAT depending on what
 // address they bind to. This can be used to simulate a client on a NAT sending
 // to a client that is not behind a NAT.
 // Note that the internal addresses of clients must be unique. This is because
 // there is only one socketserver per thread, and the Bind() address is used to
 // figure out which NAT (if any) the socket should talk to.
 //
@@ skipping 20 matching lines @@
 
   // a specific NAT
   class Translator {
    public:
     Translator(NATSocketServer* server, NATType type,
                const SocketAddress& int_addr, SocketFactory* ext_factory,
                const SocketAddress& ext_addr);
     ~Translator();
 
     SocketFactory* internal_factory() { return internal_factory_.get(); }
-    SocketAddress internal_address() const {
-      return nat_server_->internal_address();
+    SocketAddress internal_udp_address() const {
+      return nat_server_->internal_udp_address();
     }
     SocketAddress internal_tcp_address() const {
       return SocketAddress();  // nat_server_->internal_tcp_address();
     }
 
     Translator* GetTranslator(const SocketAddress& ext_ip);
     Translator* AddTranslator(const SocketAddress& ext_ip,
                               const SocketAddress& int_ip, NATType type);
     void RemoveTranslator(const SocketAddress& ext_ip);
 
@@ skipping 46 matching lines @@
 };
 
 // Free-standing NAT helper functions.
 size_t PackAddressForNAT(char* buf, size_t buf_size,
                          const SocketAddress& remote_addr);
 size_t UnpackAddressFromNAT(const char* buf, size_t buf_size,
                             SocketAddress* remote_addr);
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_NATSOCKETFACTORY_H_