[SCM] libav/experimental: Print error messages in case of connection failure or name resolution failure in tcp.c.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:14:05 UTC 2013


The following commit has been merged in the experimental branch:
commit 63638a3c4a6c8fec03e121a0bfbfa555ff6d4956
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date:   Sat Aug 14 20:34:51 2010 +0000

    Print error messages in case of connection failure or name resolution failure
    in tcp.c.
    
    Originally committed as revision 24796 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index 1827aa0..ca4a6b0 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -54,8 +54,13 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
     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;
 
@@ -93,8 +98,12 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
         /* 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) {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list