mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-04 14:38:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

client: Send setup reply once only

Browse source 
If find_media() failed in handle_setup_request() two replies was sent.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=708819
This commit is contained in:
Jonas Holmberg 2013-09-26 09:41:10 +02:00 committed by Wim Taymans
parent 986bd13463
commit 74b8da9396
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -564,11 +564,13 @@ no_factory_access:
{ {
GST_ERROR ("client %p: not authorized to see factory path %s", client, GST_ERROR ("client %p: not authorized to see factory path %s", client,
path); path);
/* error reply is already sent */
return NULL; return NULL;
} }
not_authorized: not_authorized:
{ {
GST_ERROR ("client %p: not authorized for factory path %s", client, path); GST_ERROR ("client %p: not authorized for factory path %s", client, path);
/* error reply is already sent */
return NULL; return NULL;
} }
no_media: no_media:
@ -1420,10 +1422,12 @@ handle_setup_request (GstRTSPClient * client, GstRTSPContext * ctx)
} else { } else {
if ((media = gst_rtsp_session_media_get_media (sessmedia))) if ((media = gst_rtsp_session_media_get_media (sessmedia)))
g_object_ref (media); g_object_ref (media);
else
goto media_not_found;
} }
/* no media, not found then */ /* no media, not found then */
if (media == NULL) if (media == NULL)
goto media_not_found; goto media_not_found_no_reply;
if (path[matched] == '\0') if (path[matched] == '\0')
goto control_not_found; goto control_not_found;
@ -1548,6 +1552,12 @@ no_pool:
send_generic_response (client, GST_RTSP_STS_SESSION_NOT_FOUND, ctx); send_generic_response (client, GST_RTSP_STS_SESSION_NOT_FOUND, ctx);
return FALSE; return FALSE;
} }
media_not_found_no_reply:
{
GST_ERROR ("client %p: media '%s' not found", client, path);
/* error reply is already sent */
return FALSE;
}
media_not_found: media_not_found:
{ {
GST_ERROR ("client %p: media '%s' not found", client, path); GST_ERROR ("client %p: media '%s' not found", client, path);
@ -1980,6 +1990,7 @@ session_not_found:
not_authorized: not_authorized:
{ {
GST_ERROR ("client %p: not allowed", client); GST_ERROR ("client %p: not allowed", client);
/* error reply is already sent */
goto done; goto done;
} }
not_implemented: not_implemented: