Browse Source

Timeout TCP open() after 5 seconds.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.8
Michael Niedermayer 15 years ago
parent
commit
a2f5e14a86
1 changed files with 7 additions and 0 deletions
  1. +7
    -0
      libavformat/tcp.c

+ 7
- 0
libavformat/tcp.c View File

@@ -71,6 +71,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
redo: redo:
ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen); ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen);
if (ret < 0) { if (ret < 0) {
int timeout=50;
struct pollfd p = {fd, POLLOUT, 0}; struct pollfd p = {fd, POLLOUT, 0};
if (ff_neterrno() == AVERROR(EINTR)) { if (ff_neterrno() == AVERROR(EINTR)) {
if (url_interrupt_cb()) { if (url_interrupt_cb()) {
@@ -92,6 +93,12 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
ret = poll(&p, 1, 100); ret = poll(&p, 1, 100);
if (ret > 0) if (ret > 0)
break; break;
if(!--timeout){
av_log(NULL, AV_LOG_ERROR,
"TCP open %s:%d timeout\n",
hostname, port);
goto fail;
}
} }


/* test error */ /* test error */


Loading…
Cancel
Save