summaryrefslogtreecommitdiffstats
path: root/ffserver.c
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2007-04-27 00:41:50 +0000
committerAlex Beregszaszi <alex@rtfs.hu>2007-04-27 00:41:50 +0000
commitba472aaf010e69661866decbd3cfde177d8c0ee9 (patch)
treee5a955ea482a37f9c2651cd195f59072ca8291b3 /ffserver.c
parent8da4034f529f3c5dcc3f95a7d81032cc9be543fb (diff)
downloadffmpeg-streaming-ba472aaf010e69661866decbd3cfde177d8c0ee9.zip
ffmpeg-streaming-ba472aaf010e69661866decbd3cfde177d8c0ee9.tar.gz
implement ff_socket_nonblock and use it in networking code
Originally committed as revision 8846 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c
index 9f5502b..8f9bba6 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -440,7 +440,7 @@ static int socket_open_listen(struct sockaddr_in *my_addr)
closesocket(server_fd);
return -1;
}
- fcntl(server_fd, F_SETFL, O_NONBLOCK);
+ ff_socket_nonblock(server_fd, 1);
return server_fd;
}
@@ -649,7 +649,7 @@ static void new_connection(int server_fd, int is_rtsp)
&len);
if (fd < 0)
return;
- fcntl(fd, F_SETFL, O_NONBLOCK);
+ ff_socket_nonblock(fd, 1);
/* XXX: should output a warning page when coming
close to the connection limit */
OpenPOWER on IntegriCloud