mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

webrtc: Clean up the userinfo unescaping code

Browse source 
Continuation from 04fd705906. This is
easier to understand and also avoids two copies.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1547>
This commit is contained in:
Nirbheek Chauhan 2020-08-29 02:40:44 +05:30 committed by GStreamer Merge Bot
parent ccfb799d83
commit 16d84a2816
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/webrtc/gstwebrtcice.c
View file

@ -286,7 +286,7 @@ _parse_userinfo (const gchar * userinfo, gchar ** user, gchar ** pass)
colon = g_strstr_len (userinfo, -1, ":"); colon = g_strstr_len (userinfo, -1, ":");
if (!colon) { if (!colon) {
*user = g_strdup (userinfo); *user = g_uri_unescape_string (userinfo, NULL);
*pass = NULL; *pass = NULL;
return; return;
} }
@ -297,8 +297,8 @@ _parse_userinfo (const gchar * userinfo, gchar ** user, gchar ** pass)
"first ':' delineates user:pass. You should escape the user and pass " "first ':' delineates user:pass. You should escape the user and pass "
"before adding to the URI.", userinfo); "before adding to the URI.", userinfo);
*user = g_strndup (userinfo, colon - userinfo); *user = g_uri_unescape_segment (userinfo, colon, NULL);
*pass = g_strdup (&colon[1]); *pass = g_uri_unescape_string (&colon[1], NULL);
} }
static gchar * static gchar *
@ -334,7 +334,7 @@ _add_turn_server (GstWebRTCICE * ice, struct NiceStreamItem *item,
GstUri * turn_server) GstUri * turn_server)
{ {
gboolean ret; gboolean ret;
gchar *user, *user_unesc, *pass, *pass_unesc; gchar *user, *pass;
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,8 +358,6 @@ _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;
@ -375,7 +373,7 @@ _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_RTP, item->nice_stream_id, NICE_COMPONENT_TYPE_RTP,
gst_uri_get_host (turn_server), gst_uri_get_port (turn_server), gst_uri_get_host (turn_server), gst_uri_get_port (turn_server),
user_unesc, pass_unesc, relays[i]); user, pass, 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);
@ -385,7 +383,7 @@ _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), gst_uri_get_host (turn_server), gst_uri_get_port (turn_server),
user_unesc, pass_unesc, relays[i]); user, pass, 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);
@ -395,8 +393,6 @@ _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);