Attachment 294938 Details for Bug 164587 – patch

[patch] patch

patch.patch (text/plain), 2.87 KB, created by Philippe Normand on 2016-11-16 07:41:41 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Normand

Created: 2016-11-16 07:41:41 PST

Size: 2.87 KB

patch

obsolete

>From 06ed45aac17e79168b611b54e498e95d738bcb20 Mon Sep 17 00:00:00 2001
>From: Philippe Normand <pnormand@igalia.com>
>Date: Wed, 16 Nov 2016 16:41:16 +0100
>Subject: [PATCH] patch
>
>---
> Source/WebCore/ChangeLog                                     | 12 ++++++++++++
> .../platform/mediastream/openwebrtc/MediaEndpointOwr.cpp     |  6 +++++-
> 2 files changed, 17 insertions(+), 1 deletion(-)
>
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index fdf437aa..e52af43 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,5 +1,17 @@
> 2016-11-16  Philippe Normand  <pnormand@igalia.com>
> 
>+        [WebRTC][OpenWebRTC] parse turns urls
>+        https://bugs.webkit.org/show_bug.cgi?id=164587
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/mediastream/openwebrtc/MediaEndpointOwr.cpp:
>+        (WebCore::MediaEndpointOwr::ensureTransportAgentAndTransceivers):
>+        Hook turns servers between the RTCConfiguration and the underlying
>+        OpenWebRTC layer.
>+
>+2016-11-16  Philippe Normand  <pnormand@igalia.com>
>+
>         [GStreamer][GL] build broken when using gst-plugins-bad from git
>         https://bugs.webkit.org/show_bug.cgi?id=164776
> 
>diff --git a/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp b/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp
>index a725398..691c827 100644
>--- a/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp
>+++ b/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp
>@@ -58,7 +58,7 @@ static const Vector<String> candidateTypes = { "host", "srflx", "prflx", "relay"
> static const Vector<String> candidateTcpTypes = { "", "active", "passive", "so" };
> static const Vector<String> codecTypes = { "NONE", "PCMU", "PCMA", "OPUS", "H264", "VP8" };
> 
>-static const char* helperServerRegEx = "(turn|stun):([\\w\\.\\-]+|\\[[\\w\\:]+\\])(:\\d+)?(\\?.+)?";
>+static const char* helperServerRegEx = "(turns|turn|stun):([\\w\\.\\-]+|\\[[\\w\\:]+\\])(:\\d+)?(\\?.+)?";
> 
> static const unsigned short helperServerDefaultPort = 3478;
> static const unsigned short candidateDefaultPort = 9;
>@@ -581,6 +581,10 @@ void MediaEndpointOwr::ensureTransportAgentAndTransceivers(bool isInitiator, con
>                     owr_transport_agent_add_helper_server(m_transportAgent, serverType,
>                         url.host.ascii().data(), port,
>                         server.username.ascii().data(), server.credential.ascii().data());
>+                } else if (url.protocol == "turns") {
>+                    owr_transport_agent_add_helper_server(m_transportAgent, OWR_HELPER_SERVER_TYPE_TURN_TLS,
>+                                                          url.host.ascii().data(), port,
>+                                                          server.username.ascii().data(), server.credential.ascii().data());
>                 } else
>                     ASSERT_NOT_REACHED();
>             }
>-- 
>2.10.2

Actions: View | Formatted Diff | Diff

Attachments on bug 164587: 294938 | 294940