mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

client: improve debug and fix leaks

Browse source 
Cleanup the uri and session when there is a bad request.
This commit is contained in:
Wim Taymans 2012-11-27 12:24:21 +01:00
parent 04f26e84e6
commit d5389c940d
1 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1525,10 +1525,10 @@ handle_request (GstRTSPClient * client, GstRTSPMessage * request)
{
GstRTSPMethod method;
const gchar *uristr;
GstRTSPUrl *uri;
GstRTSPUrl *uri = NULL;
GstRTSPVersion version;
GstRTSPResult res;
GstRTSPSession *session;
GstRTSPSession *session = NULL;
GstRTSPClientState state = { NULL };
GstRTSPMessage response = { 0 };
gchar *sessid;
@ -1544,23 +1544,15 @@ handle_request (GstRTSPClient * client, GstRTSPMessage * request)
gst_rtsp_message_parse_request (request, &method, &uristr, &version);
if (version != GST_RTSP_VERSION_1_0) {
/* we can only handle 1.0 requests */
send_generic_response (client, GST_RTSP_STS_RTSP_VERSION_NOT_SUPPORTED,
&state);
return;
}
/* we can only handle 1.0 requests */
if (version != GST_RTSP_VERSION_1_0)
goto not_supported;
state.method = method;
/* we always try to parse the url first */
if (gst_rtsp_url_parse (uristr, &uri) != GST_RTSP_OK) {
send_generic_response (client, GST_RTSP_STS_BAD_REQUEST, &state);
return;
}
/* sanitize the uri */
sanitize_uri (uri);
state.uri = uri;
if (gst_rtsp_url_parse (uristr, &uri) != GST_RTSP_OK)
goto bad_request;
/* get the session if there is any */
res = gst_rtsp_message_get_header (request, GST_RTSP_HDR_SESSION, &sessid, 0);
@ -1576,9 +1568,11 @@ handle_request (GstRTSPClient * client, GstRTSPMessage * request)
* disappears because it times out, we will be notified. If all sessions are
* gone, we will close the connection */
client_watch_session (client, session);
} else
session = NULL;
}
/* sanitize the uri */
sanitize_uri (uri);
state.uri = uri;
state.session = session;
if (client->auth) {
@ -1622,30 +1616,45 @@ handle_request (GstRTSPClient * client, GstRTSPMessage * request)
send_generic_response (client, GST_RTSP_STS_BAD_REQUEST, &state);
break;
}
done:
if (session)
g_object_unref (session);
gst_rtsp_url_free (uri);
if (uri)
gst_rtsp_url_free (uri);
return;
/* ERRORS */
not_supported:
{
GST_ERROR ("client %p: version %d not supported", client, version);
send_generic_response (client, GST_RTSP_STS_RTSP_VERSION_NOT_SUPPORTED,
&state);
goto done;
}
bad_request:
{
GST_ERROR ("client %p: bad request", client);
send_generic_response (client, GST_RTSP_STS_BAD_REQUEST, &state);
goto done;
}
no_pool:
{
GST_ERROR ("client %p: no pool configured", client);
send_generic_response (client, GST_RTSP_STS_SESSION_NOT_FOUND, &state);
return;
goto done;
}
session_not_found:
{
GST_ERROR ("client %p: session not found", client);
send_generic_response (client, GST_RTSP_STS_SESSION_NOT_FOUND, &state);
return;
goto done;
}
not_authorized:
{
GST_ERROR ("client %p: not allowed", client);
handle_unauthorized_request (client, client->auth, &state);
return;
goto done;
}
}