mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-16 11:15:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

client: let stream check supported transport

Browse source 
Delegate the check if a transport is allowed to the stream.

See https://bugzilla.gnome.org/show_bug.cgi?id=720696
This commit is contained in:
Wim Taymans 2014-01-07 12:28:47 +01:00
parent a1202effda
commit 78c6648c96
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gst/rtsp-server/rtsp-client.c
View file

@ -1200,10 +1200,10 @@ do_keepalive (GstRTSPSession * session)
}
/* parse @transport and return a valid transport in @tr. only transports
* from @supported are returned. Returns FALSE if no valid transport
* supported by @stream are returned. Returns FALSE if no valid transport
* was found. */
static gboolean
parse_transport (const char *transport, GstRTSPLowerTrans supported,
parse_transport (const char *transport, GstRTSPStream * stream,
GstRTSPTransport * tr)
{
gint i;
@ -1226,13 +1226,8 @@ parse_transport (const char *transport, GstRTSPLowerTrans supported,
goto next;
}
/* we have a transport, see if it's RTP/AVP */
if (tr->trans != GST_RTSP_TRANS_RTP || tr->profile != GST_RTSP_PROFILE_AVP) {
GST_WARNING ("invalid transport %s", transports[i]);
goto next;
}
if (!(tr->lower_transport & supported)) {
/* we have a transport, see if it's supported */
if (!gst_rtsp_stream_is_transport_supported (stream, tr)) {
GST_WARNING ("unsupported transport %s", transports[i]);
goto next;
}
@ -1409,7 +1404,6 @@ handle_setup_request (GstRTSPClient * client, GstRTSPContext * ctx)
GstRTSPUrl *uri;
gchar *transport;
GstRTSPTransport *ct, *st;
GstRTSPLowerTrans supported;
GstRTSPStatusCode code;
GstRTSPSession *session;
GstRTSPStreamTransport *trans;
@ -1517,11 +1511,8 @@ handle_setup_request (GstRTSPClient * client, GstRTSPContext * ctx)
gst_rtsp_transport_new (&ct);
/* our supported transports */
supported = gst_rtsp_stream_get_protocols (stream);
/* parse and find a usable supported transport */
if (!parse_transport (transport, supported, ct))
if (!parse_transport (transport, stream, ct))
goto unsupported_transports;
/* update the client transport */