mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 10:42:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

server: disable use of SO_LINGER

Browse source 
SO_LINGER cause the client to fail to receive a TEARDOWN message because the
server close()s the connection.
This commit is contained in:
Wim Taymans 2010-08-20 10:18:34 +02:00
parent 2607ff079d
commit af732fa749
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/rtsp-server/rtsp-server.c
View file

@ -27,6 +27,11 @@
#define DEFAULT_SERVICE "8554" #define DEFAULT_SERVICE "8554"
#define DEFAULT_BACKLOG 5 #define DEFAULT_BACKLOG 5
/* Define to use the SO_LINGER option so that the server sockets can be resused
* sooner. Disabled for now because it is not very well implemented by various
* OSes and it causes clients to fail to read the TEARDOWN response. */
#undef USE_SOLINGER
enum enum
{ {
PROP_0, PROP_0,
@ -421,7 +426,9 @@ gst_rtsp_server_sink_init_send (GstRTSPServer * server)
int ret, sockfd; int ret, sockfd;
struct addrinfo hints; struct addrinfo hints;
struct addrinfo *result, *rp; struct addrinfo *result, *rp;
#ifdef USE_SOLINGER
struct linger linger; struct linger linger;
#endif
memset(&hints, 0, sizeof(struct addrinfo)); memset(&hints, 0, sizeof(struct addrinfo));
hints.ai_family = AF_UNSPEC; /* Allow IPv4 or IPv6 */ hints.ai_family = AF_UNSPEC; /* Allow IPv4 or IPv6 */
@ -477,13 +484,16 @@ gst_rtsp_server_sink_init_send (GstRTSPServer * server)
(void *) &ret, sizeof (ret)) < 0) (void *) &ret, sizeof (ret)) < 0)
goto keepalive_failed; goto keepalive_failed;
/* make sure socket is reset immediately after close. This ensure that we can #ifdef USE_SOLINGER
* reuse the socket quickly. */ /* make sure socket is reset 5 seconds after close. This ensure that we can
* reuse the socket quickly while still having a chance to send data to the
* client. */
linger.l_onoff = 1; linger.l_onoff = 1;
linger.l_linger = 5; linger.l_linger = 5;
if (setsockopt (server->server_sock.fd, SOL_SOCKET, SO_LINGER, if (setsockopt (server->server_sock.fd, SOL_SOCKET, SO_LINGER,
(void *) &linger, sizeof (linger)) < 0) (void *) &linger, sizeof (linger)) < 0)
goto linger_failed; goto linger_failed;
#endif
/* set the server socket to nonblocking */ /* set the server socket to nonblocking */
fcntl (server->server_sock.fd, F_SETFL, O_NONBLOCK); fcntl (server->server_sock.fd, F_SETFL, O_NONBLOCK);
@ -522,11 +532,13 @@ keepalive_failed:
GST_ERROR_OBJECT (server, "failed to configure keepalive socket: %s", g_strerror (errno)); GST_ERROR_OBJECT (server, "failed to configure keepalive socket: %s", g_strerror (errno));
goto close_error; goto close_error;
} }
#ifdef USE_SOLINGER
linger_failed: linger_failed:
{ {
GST_ERROR_OBJECT (server, "failed to no linger socket: %s", g_strerror (errno)); GST_ERROR_OBJECT (server, "failed to no linger socket: %s", g_strerror (errno));
goto close_error; goto close_error;
} }
#endif
listen_failed: listen_failed:
{ {
GST_ERROR_OBJECT (server, "failed to listen on socket: %s", g_strerror (errno)); GST_ERROR_OBJECT (server, "failed to listen on socket: %s", g_strerror (errno));