#include "internal.h"
#include "network.h"
#include "os_support.h"
-#if HAVE_SYS_SELECT_H
-#include <sys/select.h>
+#if HAVE_POLL_H
+#include <poll.h>
#endif
#include <sys/time.h>
struct addrinfo hints, *ai, *cur_ai;
int port, fd = -1;
TCPContext *s = NULL;
- fd_set wfds;
- int fd_max, ret;
- struct timeval tv;
+ int ret;
socklen_t optlen;
char hostname[1024],proto[1024],path[1024];
char portstr[10];
- ff_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname),
+ av_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname),
&port, path, sizeof(path), uri);
if (strcmp(proto,"tcp") || port <= 0 || port >= 65536)
return AVERROR(EINVAL);
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
snprintf(portstr, sizeof(portstr), "%d", port);
- if (getaddrinfo(hostname, portstr, &hints, &ai))
+ ret = getaddrinfo(hostname, portstr, &hints, &ai);
+ if (ret) {
+ av_log(NULL, AV_LOG_ERROR,
+ "Failed to resolve hostname %s: %s\n",
+ hostname, gai_strerror(ret));
return AVERROR(EIO);
+ }
cur_ai = ai;
redo:
ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen);
if (ret < 0) {
- if (ff_neterrno() == FF_NETERROR(EINTR))
+ struct pollfd p = {fd, POLLOUT, 0};
+ if (ff_neterrno() == FF_NETERROR(EINTR)) {
+ if (url_interrupt_cb())
+ goto fail1;
goto redo;
+ }
if (ff_neterrno() != FF_NETERROR(EINPROGRESS) &&
ff_neterrno() != FF_NETERROR(EAGAIN))
goto fail;
ret = AVERROR(EINTR);
goto fail1;
}
- fd_max = fd;
- FD_ZERO(&wfds);
- FD_SET(fd, &wfds);
- tv.tv_sec = 0;
- tv.tv_usec = 100 * 1000;
- ret = select(fd_max + 1, NULL, &wfds, NULL, &tv);
- if (ret > 0 && FD_ISSET(fd, &wfds))
+ ret = poll(&p, 1, 100);
+ if (ret > 0)
break;
}
/* test error */
optlen = sizeof(ret);
getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen);
- if (ret != 0)
+ if (ret != 0) {
+ av_log(NULL, AV_LOG_ERROR,
+ "TCP connection to %s:%d failed: %s\n",
+ hostname, port, strerror(ret));
goto fail;
+ }
}
s = av_malloc(sizeof(TCPContext));
if (!s) {
static int tcp_read(URLContext *h, uint8_t *buf, int size)
{
TCPContext *s = h->priv_data;
- int len, fd_max, ret;
- fd_set rfds;
- struct timeval tv;
+ struct pollfd p = {s->fd, POLLIN, 0};
+ int len, ret;
for (;;) {
if (url_interrupt_cb())
return AVERROR(EINTR);
- fd_max = s->fd;
- FD_ZERO(&rfds);
- FD_SET(s->fd, &rfds);
- tv.tv_sec = 0;
- tv.tv_usec = 100 * 1000;
- ret = select(fd_max + 1, &rfds, NULL, NULL, &tv);
- if (ret > 0 && FD_ISSET(s->fd, &rfds)) {
+ ret = poll(&p, 1, 100);
+ if (ret == 1 && p.revents & POLLIN) {
len = recv(s->fd, buf, size, 0);
if (len < 0) {
if (ff_neterrno() != FF_NETERROR(EINTR) &&
ff_neterrno() != FF_NETERROR(EAGAIN))
- return AVERROR(ff_neterrno());
+ return ff_neterrno();
} else return len;
} else if (ret < 0) {
if (ff_neterrno() == FF_NETERROR(EINTR))
static int tcp_write(URLContext *h, const uint8_t *buf, int size)
{
TCPContext *s = h->priv_data;
- int ret, size1, fd_max, len;
- fd_set wfds;
- struct timeval tv;
+ int ret, size1, len;
+ struct pollfd p = {s->fd, POLLOUT, 0};
size1 = size;
while (size > 0) {
if (url_interrupt_cb())
return AVERROR(EINTR);
- fd_max = s->fd;
- FD_ZERO(&wfds);
- FD_SET(s->fd, &wfds);
- tv.tv_sec = 0;
- tv.tv_usec = 100 * 1000;
- ret = select(fd_max + 1, NULL, &wfds, NULL, &tv);
- if (ret > 0 && FD_ISSET(s->fd, &wfds)) {
+ ret = poll(&p, 1, 100);
+ if (ret == 1 && p.revents & POLLOUT) {
len = send(s->fd, buf, size, 0);
if (len < 0) {
if (ff_neterrno() != FF_NETERROR(EINTR) &&
ff_neterrno() != FF_NETERROR(EAGAIN))
- return AVERROR(ff_neterrno());
+ return ff_neterrno();
continue;
}
size -= len;
return s->fd;
}
-URLProtocol tcp_protocol = {
+URLProtocol ff_tcp_protocol = {
"tcp",
tcp_open,
tcp_read,