| Index: webrtc/p2p/base/turnport.cc
|
| diff --git a/webrtc/p2p/base/turnport.cc b/webrtc/p2p/base/turnport.cc
|
| index 4dfe06d13a50cc889a13148c866d6fccfe247521..7b7874540eadfd6fa13b115f68c62c3c287ea3d2 100644
|
| --- a/webrtc/p2p/base/turnport.cc
|
| +++ b/webrtc/p2p/base/turnport.cc
|
| @@ -221,7 +221,8 @@ TurnPort::TurnPort(rtc::Thread* thread,
|
| const ProtocolAddress& server_address,
|
| const RelayCredentials& credentials,
|
| int server_priority,
|
| - const std::string& origin)
|
| + const std::string& origin,
|
| + const std::vector<std::string>& tls_alpn_protocols)
|
| : Port(thread,
|
| RELAY_PORT_TYPE,
|
| factory,
|
| @@ -231,6 +232,7 @@ TurnPort::TurnPort(rtc::Thread* thread,
|
| username,
|
| password),
|
| server_address_(server_address),
|
| + tls_alpn_protocols_(tls_alpn_protocols),
|
| credentials_(credentials),
|
| socket_(NULL),
|
| resolver_(NULL),
|
| @@ -336,9 +338,16 @@ bool TurnPort::CreateTurnClientSocket() {
|
| }
|
| }
|
|
|
| + rtc::PacketSocketTcpOptions tcp_options;
|
| + tcp_options.opts = opts;
|
| + tcp_options.tls_alpn_protocols = tls_alpn_protocols_;
|
| +// rtc::PacketSocketTcpOptions tcp_options = {
|
| +// .opts = opts,
|
| +// .tls_alpn_protocols = tls_alpn_protocols_
|
| +// };
|
| socket_ = socket_factory()->CreateClientTcpSocket(
|
| rtc::SocketAddress(Network()->GetBestIP(), 0), server_address_.address,
|
| - proxy(), user_agent(), opts);
|
| + proxy(), user_agent(), tcp_options);
|
| }
|
|
|
| if (!socket_) {
|
|
|