Support a user-provided string for the TLS ALPN extension.

webrtc/p2p/base/packetsocketfactory.h

 /*
  *  Copyright 2011 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.
  */
 
 #ifndef WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_
 #define WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_
 
 #include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/rtc_base/proxyinfo.h"
 
 namespace rtc {
 
+// This structure contains options required to create TCP packet sockets.
+struct PacketSocketTcpOptions {
+  int opts;
+  std::vector<std::string> tls_alpn_protocols;
+};
+
 class AsyncPacketSocket;
 class AsyncResolverInterface;
 
 class PacketSocketFactory {
  public:
   enum Options {
     OPT_STUN = 0x04,
 
     // The TLS options below are mutually exclusive.
     OPT_TLS = 0x02,           // Real and secure TLS.
     OPT_TLS_FAKE = 0x01,      // Fake TLS with a dummy SSL handshake.
     OPT_TLS_INSECURE = 0x08,  // Insecure TLS without certificate validation.
 
     // Deprecated, use OPT_TLS_FAKE.
     OPT_SSLTCP = OPT_TLS_FAKE,
   };
 
   PacketSocketFactory() { }
   virtual ~PacketSocketFactory() { }
 
   virtual AsyncPacketSocket* CreateUdpSocket(const SocketAddress& address,
                                              uint16_t min_port,
                                              uint16_t max_port) = 0;
   virtual AsyncPacketSocket* CreateServerTcpSocket(
       const SocketAddress& local_address,
       uint16_t min_port,
       uint16_t max_port,
       int opts) = 0;
 
-  // TODO: |proxy_info| and |user_agent| should be set
+  // TODO(deadbeef): |proxy_info| and |user_agent| should be set
   // per-factory and not when socket is created.
   virtual AsyncPacketSocket* CreateClientTcpSocket(
       const SocketAddress& local_address,
       const SocketAddress& remote_address,
       const ProxyInfo& proxy_info,
       const std::string& user_agent,
       int opts) = 0;
 
+  // TODO(deadbeef): |proxy_info|, |user_agent| and |tcp_options| should
+  // be set per-factory and not when socket is created.
+  // TODO(deadbeef): Implement this method in all subclasses (namely those in
+  // Chromium), make pure virtual, and remove the old CreateClientTcpSocket.
+  virtual AsyncPacketSocket* CreateClientTcpSocket(
+      const SocketAddress& local_address,
+      const SocketAddress& remote_address,
+      const ProxyInfo& proxy_info,
+      const std::string& user_agent,
+      const PacketSocketTcpOptions& tcp_options) {
+    return CreateClientTcpSocket(local_address, remote_address, proxy_info,
+                                 user_agent, tcp_options.opts);
+  }
+
+
   virtual AsyncResolverInterface* CreateAsyncResolver() = 0;
 
  private:
   RTC_DISALLOW_COPY_AND_ASSIGN(PacketSocketFactory);
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_