[SCM] libav/experimental: implement ff_socket_nonblock and use it in networking code
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:59:18 UTC 2013
The following commit has been merged in the experimental branch:
commit ba472aaf010e69661866decbd3cfde177d8c0ee9
Author: Alex Beregszaszi <alex at rtfs.hu>
Date: Fri Apr 27 00:41:50 2007 +0000
implement ff_socket_nonblock and use it in networking code
Originally committed as revision 8846 to svn://svn.ffmpeg.org/ffmpeg/trunk
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 */
diff --git a/libavformat/network.h b/libavformat/network.h
index 7dcbfe2..6ceba41 100644
--- a/libavformat/network.h
+++ b/libavformat/network.h
@@ -32,6 +32,8 @@
#define ff_neterrno() errno
#define FF_NETERROR(err) err
+int ff_socket_nonblock(int socket, int enable);
+
#if !defined(HAVE_INET_ATON)
/* in os_support.c */
int inet_aton (const char * str, struct in_addr * add);
diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index da303be..abee749 100644
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -114,6 +114,14 @@ int resolve_host(struct in_addr *sin_addr, const char *hostname)
}
return 0;
}
+
+int ff_socket_nonblock(int socket, int enable)
+{
+ if (enable)
+ return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) | O_NONBLOCK);
+ else
+ return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) & ~O_NONBLOCK);
+}
#endif /* CONFIG_NETWORK */
#ifdef CONFIG_FFSERVER
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index b2f6d37..36b6707 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -22,7 +22,6 @@
#include <unistd.h>
#include "network.h"
#include <sys/time.h>
-#include <fcntl.h>
typedef struct TCPContext {
int fd;
@@ -62,7 +61,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
fd = socket(AF_INET, SOCK_STREAM, 0);
if (fd < 0)
goto fail;
- fcntl(fd, F_SETFL, O_NONBLOCK);
+ ff_socket_nonblock(fd, 1);
redo:
ret = connect(fd, (struct sockaddr *)&dest_addr,
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list