mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

client: small cleanup

Browse source
This commit is contained in:
Wim Taymans 2012-11-26 16:45:04 +01:00
parent 8da4171055
commit 26a4b98ab0
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -175,7 +175,7 @@ gst_rtsp_client_init (GstRTSPClient * client)
{
g_mutex_init (&client->lock);
client->use_client_settings = DEFAULT_USE_CLIENT_SETTINGS;
client->close_response_seq = 0;
client->close_seq = 0;
}
static void
@ -329,7 +329,7 @@ send_response (GstRTSPClient * client, GstRTSPSession * session,
/* send the response and store the seq number so we can wait until it's
* written to the client to close the connection */
gst_rtsp_watch_send_message (client->watch, response, close ?
&client->close_response_seq : NULL);
&client->close_seq : NULL);
gst_rtsp_message_unset (response);
}
@ -1917,11 +1917,10 @@ message_received (GstRTSPWatch * watch, GstRTSPMessage * message,
static GstRTSPResult
message_sent (GstRTSPWatch * watch, guint cseq, gpointer user_data)
{
GstRTSPClient *client;
GstRTSPClient *client = GST_RTSP_CLIENT (user_data);
client = GST_RTSP_CLIENT (user_data);
if (client->close_response_seq && client->close_response_seq == cseq) {
client->close_response_seq = 0;
if (client->close_seq && client->close_seq == cseq) {
client->close_seq = 0;
close_connection (client);
}

4
gst/rtsp-server/rtsp-client.h
View file

@ -77,7 +77,7 @@ struct _GstRTSPClientState {
* @lock: lock protecting the client object
* @connection: the connection object handling the client request.
* @watch: watch for the connection
* @close_response_seq: sequence number of message with close header
* @close_seq: sequence number of message with close header
* @server_ip: ip address of the server
* @is_ipv6: if we are IPv6
* @use_client_settings: whether to allow client transport settings for multicast
@ -97,7 +97,7 @@ struct _GstRTSPClient {
GMutex lock;
GstRTSPConnection *connection;
GstRTSPWatch *watch;
guint close_response_seq;
guint close_seq;
gchar *server_ip;
gboolean is_ipv6;
gboolean use_client_settings;