On Thu, 7 Jan 2021, lance.lmw...@gmail.com wrote:

From: Limin Wang <lance.lmw...@gmail.com>

Signed-off-by: Limin Wang <lance.lmw...@gmail.com>
---
libavformat/udp.c | 47 +++++++++++++++++++++++------------------------
1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/libavformat/udp.c b/libavformat/udp.c
index 13c346a..798b789 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -633,6 +633,7 @@ static int udp_open(URLContext *h, const char *uri, int 
flags)
    char buf[256];
    struct sockaddr_storage my_addr;
    socklen_t len;
+    int ret = AVERROR(EIO);

    h->is_streamed = 1;

@@ -641,12 +642,12 @@ static int udp_open(URLContext *h, const char *uri, int 
flags)
        s->buffer_size = is_output ? UDP_TX_BUF_SIZE : UDP_RX_BUF_SIZE;

    if (s->sources) {
-        if (ff_ip_parse_sources(h, s->sources, &s->filters) < 0)
+        if ((ret = ff_ip_parse_sources(h, s->sources, &s->filters)) < 0)
            goto fail;
    }

    if (s->block) {
-        if (ff_ip_parse_blocks(h, s->block, &s->filters) < 0)
+        if ((ret = ff_ip_parse_blocks(h, s->block, &s->filters)) < 0)
            goto fail;
    }

@@ -712,11 +713,11 @@ static int udp_open(URLContext *h, const char *uri, int 
flags)
            av_strlcpy(localaddr, buf, sizeof(localaddr));
        }
        if (av_find_info_tag(buf, sizeof(buf), "sources", p)) {
-            if (ff_ip_parse_sources(h, buf, &s->filters) < 0)
+            if ((ret = ff_ip_parse_sources(h, buf, &s->filters)) < 0)
                goto fail;
        }
        if (av_find_info_tag(buf, sizeof(buf), "block", p)) {
-            if (ff_ip_parse_blocks(h, buf, &s->filters) < 0)
+            if ((ret = ff_ip_parse_blocks(h, buf, &s->filters)) < 0)
                goto fail;
        }
        if (!is_output && av_find_info_tag(buf, sizeof(buf), "timeout", p))
@@ -742,7 +743,7 @@ static int udp_open(URLContext *h, const char *uri, int 
flags)
        if (!(flags & AVIO_FLAG_READ))
            goto fail;
    } else {
-        if (ff_udp_set_remote_url(h, uri) < 0)
+        if ((ret = ff_udp_set_remote_url(h, uri)) < 0)
            goto fail;
    }

@@ -763,13 +764,13 @@ static int udp_open(URLContext *h, const char *uri, int 
flags)
     */
    if (s->reuse_socket > 0 || (s->is_multicast && s->reuse_socket < 0)) {
        s->reuse_socket = 1;
-        if (setsockopt (udp_fd, SOL_SOCKET, SO_REUSEADDR, &(s->reuse_socket), 
sizeof(s->reuse_socket)) != 0)
+        if ((ret = setsockopt (udp_fd, SOL_SOCKET, SO_REUSEADDR, 
&(s->reuse_socket), sizeof(s->reuse_socket))) != 0)

ff_neterrno() has to be used here and in a lot of places below to get proper return value.

Regards,
Marton

            goto fail;
    }

    if (s->is_broadcast) {
#ifdef SO_BROADCAST
-        if (setsockopt (udp_fd, SOL_SOCKET, SO_BROADCAST, &(s->is_broadcast), 
sizeof(s->is_broadcast)) != 0)
+        if ((ret = setsockopt (udp_fd, SOL_SOCKET, SO_BROADCAST, 
&(s->is_broadcast), sizeof(s->is_broadcast))) != 0)
#endif
           goto fail;
    }
@@ -779,16 +780,16 @@ static int udp_open(URLContext *h, const char *uri, int 
flags)
     * Otherwise, the receiver will drop all packets.
     */
    if (s->udplite_coverage) {
-        if (setsockopt (udp_fd, IPPROTO_UDPLITE, UDPLITE_SEND_CSCOV, 
&(s->udplite_coverage), sizeof(s->udplite_coverage)) != 0)
+        if ((ret = setsockopt (udp_fd, IPPROTO_UDPLITE, UDPLITE_SEND_CSCOV, 
&(s->udplite_coverage), sizeof(s->udplite_coverage))) != 0)
            av_log(h, AV_LOG_WARNING, "socket option UDPLITE_SEND_CSCOV not 
available");

-        if (setsockopt (udp_fd, IPPROTO_UDPLITE, UDPLITE_RECV_CSCOV, 
&(s->udplite_coverage), sizeof(s->udplite_coverage)) != 0)
+        if ((ret = setsockopt (udp_fd, IPPROTO_UDPLITE, UDPLITE_RECV_CSCOV, 
&(s->udplite_coverage), sizeof(s->udplite_coverage))) != 0)
            av_log(h, AV_LOG_WARNING, "socket option UDPLITE_RECV_CSCOV not 
available");
    }

    if (dscp >= 0) {
        dscp <<= 2;
-        if (setsockopt (udp_fd, IPPROTO_IP, IP_TOS, &dscp, sizeof(dscp)) != 0)
+        if ((ret = setsockopt (udp_fd, IPPROTO_IP, IP_TOS, &dscp, 
sizeof(dscp))) != 0)
            goto fail;
    }

@@ -802,7 +803,7 @@ static int udp_open(URLContext *h, const char *uri, int 
flags)
    /* bind to the local address if not multicast or if the multicast
     * bind failed */
    /* the bind is needed to give a port to the socket now */
-    if (bind_ret < 0 && bind(udp_fd,(struct sockaddr *)&my_addr, len) < 0) {
+    if (bind_ret < 0 && (ret = bind(udp_fd,(struct sockaddr *)&my_addr, len)) 
< 0) {
        ff_log_net_error(h, AV_LOG_ERROR, "bind failed");
        goto fail;
    }
@@ -814,28 +815,28 @@ static int udp_open(URLContext *h, const char *uri, int 
flags)
    if (s->is_multicast) {
        if (h->flags & AVIO_FLAG_WRITE) {
            /* output */
-            if (udp_set_multicast_ttl(udp_fd, s->ttl, (struct sockaddr 
*)&s->dest_addr) < 0)
+            if ((ret = udp_set_multicast_ttl(udp_fd, s->ttl, (struct sockaddr 
*)&s->dest_addr)) < 0)
                goto fail;
        }
        if (h->flags & AVIO_FLAG_READ) {
            /* input */
            if (s->filters.nb_include_addrs) {
-                if (udp_set_multicast_sources(h, udp_fd,
+                if ((ret = udp_set_multicast_sources(h, udp_fd,
                                              (struct sockaddr *)&s->dest_addr,
                                              s->dest_addr_len, 
&s->local_addr_storage,
                                              s->filters.include_addrs,
-                                              s->filters.nb_include_addrs, 1) 
< 0)
+                                              s->filters.nb_include_addrs, 1)) 
< 0)
                    goto fail;
            } else {
-                if (udp_join_multicast_group(udp_fd, (struct sockaddr 
*)&s->dest_addr,(struct sockaddr *)&s->local_addr_storage) < 0)
+                if ((ret = udp_join_multicast_group(udp_fd, (struct sockaddr 
*)&s->dest_addr,(struct sockaddr *)&s->local_addr_storage)) < 0)
                    goto fail;
            }
            if (s->filters.nb_exclude_addrs) {
-                if (udp_set_multicast_sources(h, udp_fd,
+                if ((ret = udp_set_multicast_sources(h, udp_fd,
                                              (struct sockaddr *)&s->dest_addr,
                                              s->dest_addr_len, 
&s->local_addr_storage,
                                              s->filters.exclude_addrs,
-                                              s->filters.nb_exclude_addrs, 0) 
< 0)
+                                              s->filters.nb_exclude_addrs, 0)) 
< 0)
                    goto fail;
            }
        }
@@ -844,18 +845,18 @@ static int udp_open(URLContext *h, const char *uri, int 
flags)
    if (is_output) {
        /* limit the tx buf size to limit latency */
        tmp = s->buffer_size;
-        if (setsockopt(udp_fd, SOL_SOCKET, SO_SNDBUF, &tmp, sizeof(tmp)) < 0) {
+        if ((ret = setsockopt(udp_fd, SOL_SOCKET, SO_SNDBUF, &tmp, sizeof(tmp))) 
< 0) {
            ff_log_net_error(h, AV_LOG_ERROR, "setsockopt(SO_SNDBUF)");
            goto fail;
        }
    } else {
        /* set udp recv buffer size to the requested value (default 
UDP_RX_BUF_SIZE) */
        tmp = s->buffer_size;
-        if (setsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, sizeof(tmp)) < 0) {
+        if ((ret = setsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, sizeof(tmp))) 
< 0) {
            ff_log_net_error(h, AV_LOG_WARNING, "setsockopt(SO_RECVBUF)");
        }
        len = sizeof(tmp);
-        if (getsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, &len) < 0) {
+        if ((ret = getsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, &len)) < 0) 
{
            ff_log_net_error(h, AV_LOG_WARNING, "getsockopt(SO_RCVBUF)");
        } else {
            av_log(h, AV_LOG_DEBUG, "end receive buffer size reported is %d\n", 
tmp);
@@ -867,7 +868,7 @@ static int udp_open(URLContext *h, const char *uri, int 
flags)
        ff_socket_nonblock(udp_fd, 1);
    }
    if (s->is_connected) {
-        if (connect(udp_fd, (struct sockaddr *) &s->dest_addr, 
s->dest_addr_len)) {
+        if (ret = connect(udp_fd, (struct sockaddr *) &s->dest_addr, 
s->dest_addr_len)) {
            ff_log_net_error(h, AV_LOG_ERROR, "connect");
            goto fail;
        }
@@ -888,8 +889,6 @@ static int udp_open(URLContext *h, const char *uri, int 
flags)
    }

    if ((!is_output && s->circular_buffer_size) || (is_output && s->bitrate && 
s->circular_buffer_size)) {
-        int ret;
-
        /* start the task going */
        s->fifo = av_fifo_alloc(s->circular_buffer_size);
        ret = pthread_mutex_init(&s->mutex, NULL);
@@ -923,7 +922,7 @@ static int udp_open(URLContext *h, const char *uri, int 
flags)
        closesocket(udp_fd);
    av_fifo_freep(&s->fifo);
    ff_ip_reset_filters(&s->filters);
-    return AVERROR(EIO);
+    return ret;
}

static int udplite_open(URLContext *h, const char *uri, int flags)
--
1.8.3.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Reply via email to