Merge remote-tracking branch 'qatar/master'

* qatar/master:
  network: factor out connect-listening code

Conflicts:
	libavformat/network.h
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 48 insertions, 0 deletions

diff --git a/libavformat/network.c b/libavformat/network.c
index 454ee13ff1..f80f43ec2a 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -20,6 +20,7 @@
 
 #include "libavutil/avutil.h"
 #include "network.h"
+#include "url.h"
 #include "libavcodec/internal.h"
 #include "libavutil/mem.h"
 #include "url.h"
@@ -241,3 +242,50 @@ int ff_listen_bind(int fd, const struct sockaddr *addr,
     ff_socket_nonblock(ret, 1);
     return ret;
 }
+
+int ff_listen_connect(int fd, const struct sockaddr *addr,
+                      socklen_t addrlen, int rw_timeout, URLContext *h)
+{
+    struct pollfd p = {fd, POLLOUT, 0};
+    int64_t wait_started;
+    int ret;
+    socklen_t optlen;
+
+    ff_socket_nonblock(fd, 1);
+
+    while ((ret = connect(fd, addr, addrlen))) {
+        ret = ff_neterrno();
+        switch (ret) {
+        case AVERROR(EINTR):
+            if (ff_check_interrupt(&h->interrupt_callback))
+                return AVERROR_EXIT;
+            continue;
+        case AVERROR(EINPROGRESS):
+        case AVERROR(EAGAIN):
+            wait_started = av_gettime();
+            do {
+                if (ff_check_interrupt(&h->interrupt_callback))
+                    return AVERROR_EXIT;
+                ret = poll(&p, 1, 100);
+                if (ret > 0)
+                    break;
+            } while (!rw_timeout || (av_gettime() - wait_started < rw_timeout));
+            if (ret <= 0)
+                return AVERROR(ETIMEDOUT);
+            optlen = sizeof(ret);
+            if (getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen))
+                ret = AVUNERROR(ff_neterrno());
+            if (ret != 0) {
+                char errbuf[100];
+                ret = AVERROR(ret);
+                av_strerror(ret, errbuf, sizeof(errbuf));
+                av_log(h, AV_LOG_ERROR,
+                       "Connection to %s failed: %s\n",
+                       h->filename, errbuf);
+            }
+        default:
+            return ret;
+        }
+    }
+    return ret;
+}