virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

network: factor out bind-listening code

Browse Source 
Introduce ff_listen_bind, to be shared with the other non-tcp
network protocols.
This commit is contained in:
Luca Barbato 2013-05-30 01:08:51 +02:00
parent de421b2085
commit 28306e6d62
3 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavformat/network.c
View File

@ -187,3 +187,32 @@ int ff_is_multicast_address(struct sockaddr *addr)
return 0; return 0;
} }
int ff_listen_bind(int fd, const struct sockaddr *addr,
socklen_t addrlen, int timeout)
{
int ret;
int reuse = 1;
struct pollfd lp = { fd, POLLIN, 0 };
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse));
ret = bind(fd, addr, addrlen);
if (ret)
return ff_neterrno();
ret = listen(fd, 1);
if (ret)
return ff_neterrno();
ret = poll(&lp, 1, timeout >= 0 ? timeout : -1);
if (ret <= 0)
return AVERROR(ETIMEDOUT);
ret = accept(fd, NULL, NULL);
if (ret < 0)
return ff_neterrno();
closesocket(fd);
ff_socket_nonblock(ret, 1);
return ret;
}

3
libavformat/network.h
View File

@ -209,4 +209,7 @@ const char *ff_gai_strerror(int ecode);
int ff_is_multicast_address(struct sockaddr *addr); int ff_is_multicast_address(struct sockaddr *addr);
int ff_listen_bind(int fd, const struct sockaddr *addr,
socklen_t addrlen, int timeout);
#endif /* AVFORMAT_NETWORK_H */ #endif /* AVFORMAT_NETWORK_H */

34
libavformat/tcp.c
View File

@ -85,39 +85,18 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
cur_ai = ai; cur_ai = ai;
restart: restart:
ret = AVERROR(EIO);
fd = socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol); fd = socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol);
if (fd < 0) if (fd < 0) {
ret = ff_neterrno();
goto fail; goto fail;
}
if (listen_socket) { if (listen_socket) {
int fd1; if ((fd = ff_listen_bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen,
int reuse = 1; listen_timeout)) < 0) {
struct pollfd lp = { fd, POLLIN, 0 }; ret = fd;
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse));
ret = bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen);
if (ret) {
ret = ff_neterrno();
goto fail1; goto fail1;
} }
ret = listen(fd, 1);
if (ret) {
ret = ff_neterrno();
goto fail1;
}
ret = poll(&lp, 1, listen_timeout >= 0 ? listen_timeout : -1);
if (ret <= 0) {
ret = AVERROR(ETIMEDOUT);
goto fail1;
}
fd1 = accept(fd, NULL, NULL);
if (fd1 < 0) {
ret = ff_neterrno();
goto fail1;
}
closesocket(fd);
fd = fd1;
ff_socket_nonblock(fd, 1);
} else { } else {
redo: redo:
ff_socket_nonblock(fd, 1); ff_socket_nonblock(fd, 1);
@ -177,6 +156,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
cur_ai = cur_ai->ai_next; cur_ai = cur_ai->ai_next;
if (fd >= 0) if (fd >= 0)
closesocket(fd); closesocket(fd);
ret = 0;
goto restart; goto restart;
} }
fail1: fail1: