mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

webrtc: Unescape turnserver user and password

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1530>
This commit is contained in:
trilene 2020-08-21 18:40:59 -04:00 committed by Tim-Philipp Müller
parent 833a65cc3c
commit 04fd705906
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/webrtc/gstwebrtcice.c
View file

@ -334,7 +334,7 @@ _add_turn_server (GstWebRTCICE * ice, struct NiceStreamItem *item,
GstUri * turn_server) GstUri * turn_server)
{ {
gboolean ret; gboolean ret;
gchar *user, *pass; gchar *user, *user_unesc, *pass, *pass_unesc;
const gchar *host, *userinfo, *transport, *scheme; const gchar *host, *userinfo, *transport, *scheme;
NiceRelayType relays[4] = { 0, }; NiceRelayType relays[4] = { 0, };
int i, relay_n = 0; int i, relay_n = 0;
@ -358,6 +358,8 @@ _add_turn_server (GstWebRTCICE * ice, struct NiceStreamItem *item,
transport = gst_uri_get_query_value (turn_server, "transport"); transport = gst_uri_get_query_value (turn_server, "transport");
userinfo = gst_uri_get_userinfo (turn_server); userinfo = gst_uri_get_userinfo (turn_server);
_parse_userinfo (userinfo, &user, &pass); _parse_userinfo (userinfo, &user, &pass);
user_unesc = g_uri_unescape_string (user, NULL);
pass_unesc = g_uri_unescape_string (pass, NULL);
if (g_strcmp0 (scheme, "turns") == 0) { if (g_strcmp0 (scheme, "turns") == 0) {
relays[relay_n++] = NICE_RELAY_TYPE_TURN_TLS; relays[relay_n++] = NICE_RELAY_TYPE_TURN_TLS;
@ -372,8 +374,8 @@ _add_turn_server (GstWebRTCICE * ice, struct NiceStreamItem *item,
for (i = 0; i < relay_n; i++) { for (i = 0; i < relay_n; i++) {
ret = nice_agent_set_relay_info (ice->priv->nice_agent, ret = nice_agent_set_relay_info (ice->priv->nice_agent,
item->nice_stream_id, NICE_COMPONENT_TYPE_RTP, item->nice_stream_id, NICE_COMPONENT_TYPE_RTP,
gst_uri_get_host (turn_server), gst_uri_get_port (turn_server), user, gst_uri_get_host (turn_server), gst_uri_get_port (turn_server),
pass, relays[i]); user_unesc, pass_unesc, relays[i]);
if (!ret) { if (!ret) {
gchar *uri = gst_uri_to_string (turn_server); gchar *uri = gst_uri_to_string (turn_server);
GST_ERROR_OBJECT (ice, "Failed to set TURN server '%s'", uri); GST_ERROR_OBJECT (ice, "Failed to set TURN server '%s'", uri);
@ -382,8 +384,8 @@ _add_turn_server (GstWebRTCICE * ice, struct NiceStreamItem *item,
} }
ret = nice_agent_set_relay_info (ice->priv->nice_agent, ret = nice_agent_set_relay_info (ice->priv->nice_agent,
item->nice_stream_id, NICE_COMPONENT_TYPE_RTCP, item->nice_stream_id, NICE_COMPONENT_TYPE_RTCP,
gst_uri_get_host (turn_server), gst_uri_get_port (turn_server), user, gst_uri_get_host (turn_server), gst_uri_get_port (turn_server),
pass, relays[i]); user_unesc, pass_unesc, relays[i]);
if (!ret) { if (!ret) {
gchar *uri = gst_uri_to_string (turn_server); gchar *uri = gst_uri_to_string (turn_server);
GST_ERROR_OBJECT (ice, "Failed to set TURN server '%s'", uri); GST_ERROR_OBJECT (ice, "Failed to set TURN server '%s'", uri);
@ -393,6 +395,8 @@ _add_turn_server (GstWebRTCICE * ice, struct NiceStreamItem *item,
} }
g_free (user); g_free (user);
g_free (pass); g_free (pass);
g_free (user_unesc);
g_free (pass_unesc);
out: out:
g_free (ip); g_free (ip);