X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Ftcp.c;h=7b1cdfa30135b9b3d16017b524ee4ee7db7a89c0;hb=62cc24a877ad0e898cd173fbc75956ef217b9488;hp=adbd4602f5f80999a9ac52e668627589ff4dedd9;hpb=afe94b1cfcbf8dae446a54833e34004e168b2c2f;p=vlc diff --git a/src/network/tcp.c b/src/network/tcp.c index adbd4602f5..7b1cdfa301 100644 --- a/src/network/tcp.c +++ b/src/network/tcp.c @@ -244,18 +244,7 @@ next_ai: /* failure */ int net_AcceptSingle (vlc_object_t *obj, int lfd) { - int fd; - - do - { -#ifdef HAVE_ACCEPT4 - fd = accept4 (lfd, NULL, NULL, SOCK_CLOEXEC); - if (fd == -1 && errno == ENOSYS) -#endif - fd = accept (lfd, NULL, NULL); - } - while (fd == -1 && errno == EINTR); - + int fd = vlc_accept (lfd, NULL, NULL, true); if (fd == -1) { if (net_errno != EAGAIN && net_errno != EWOULDBLOCK) @@ -264,7 +253,7 @@ int net_AcceptSingle (vlc_object_t *obj, int lfd) } msg_Dbg (obj, "accepted socket %d (from socket %d)", fd, lfd); - net_SetupSocket (fd); + setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &(int){ 1 }, sizeof(int)); return fd; }