commit 1dca9d513ada149c444a7316e16e91d53635ab5b
author Diogo Real <diogor@google.com> Tue Aug 29 19:18:32 2017
committer Commit Bot <commit-bot@chromium.org> Tue Aug 29 20:11:16 2017
tree bf4f8c25ad1fa88a7b03515ffbd14466e18956a2
parent 6ee66b6399eeccd7746ec59925a3e17d8be4b500

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

Fix source formatting
Add TLS ALPN extension.

Bug: webrtc:8086
Change-Id: I1f28ccd78760d3415e465f734744d2c2f93845e2
Reviewed-on: https://chromium-review.googlesource.com/611150
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Justin Uberti <juberti@webrtc.org>
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Reviewed-by: Peter Thatcher <pthatcher@webrtc.org>
Commit-Queue: Diogo Real <diogor@google.com>
Cr-Commit-Position: refs/heads/master@{#19588}

webrtc/pc/iceserverparsing.cc

diff --git a/webrtc/pc/iceserverparsing.cc b/webrtc/pc/iceserverparsing.cc
index d9f4885..00e9f25 100644
--- a/webrtc/pc/iceserverparsing.cc
+++ b/webrtc/pc/iceserverparsing.cc
@@ -257,6 +257,8 @@
         config.tls_cert_policy =
             cricket::TlsCertPolicy::TLS_CERT_POLICY_INSECURE_NO_CHECK;
       }
+      config.tls_alpn_protocols = server.tls_alpn_protocols;
+
       turn_servers->push_back(config);
       break;
     }