mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

webrtc: hold onto any unknown ICE candidates until the next SDP set

Browse source 
It is very possible for badly behaving signalling or peers to send
us ICE candidates before we receive an SDP.  While we had consideration
for that on the first set SDP, subsequent SDP's could result in
misconfigured ICE transports.  Expand the previous code to also take
into account reconfigurations.
This commit is contained in:
Matthew Waters 2019-03-04 21:44:33 +11:00
parent 177aa22bcd
commit a51db86ac4
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ext/webrtc/gstwebrtcbin.c
View file

@ -3318,13 +3318,24 @@ _clear_ice_candidate_item (IceCandidateItem ** item)
}
static void
_add_ice_candidate (GstWebRTCBin * webrtc, IceCandidateItem * item)
_add_ice_candidate (GstWebRTCBin * webrtc, IceCandidateItem * item,
gboolean drop_invalid)
{
GstWebRTCICEStream *stream;
stream = _find_ice_stream_for_session (webrtc, item->mlineindex);
if (stream == NULL) {
GST_WARNING_OBJECT (webrtc, "Unknown mline %u, ignoring", item->mlineindex);
if (drop_invalid) {
GST_WARNING_OBJECT (webrtc, "Unknown mline %u, dropping",
item->mlineindex);
} else {
IceCandidateItem *new = g_new0 (IceCandidateItem, 1);
new->mlineindex = item->mlineindex;
new->candidate = g_strdup (item->candidate);
g_array_append_val (webrtc->priv->pending_ice_candidates, new);
GST_INFO_OBJECT (webrtc, "Unknown mline %u, deferring", item->mlineindex);
}
return;
}
@ -4177,7 +4188,7 @@ _set_description_task (GstWebRTCBin * webrtc, struct set_description *sd)
g_array_index (webrtc->priv->pending_ice_candidates,
IceCandidateItem *, i);
_add_ice_candidate (webrtc, item);
_add_ice_candidate (webrtc, item, TRUE);
}
g_array_set_size (webrtc->priv->pending_ice_candidates, 0);
}
@ -4268,7 +4279,7 @@ _add_ice_candidate_task (GstWebRTCBin * webrtc, IceCandidateItem * item)
g_array_append_val (webrtc->priv->pending_ice_candidates, new);
} else {
_add_ice_candidate (webrtc, item);
_add_ice_candidate (webrtc, item, FALSE);
}
}