[FFmpeg-devel] [PATCH v3 1/3] avformat/udp: return the error code instead of generic EIO

lance.lmwang at gmail.com lance.lmwang at gmail.com
Sat Jan 9 05:11:34 EET 2021


On Sat, Jan 09, 2021 at 12:23:42AM +0100, Marton Balint wrote:
> 
> 
> On Fri, 8 Jan 2021, lance.lmwang at gmail.com wrote:
> 
> > From: Limin Wang <lance.lmwang at gmail.com>
> > 
> > Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
> > ---
> > libavformat/udp.c | 42 ++++++++++++++++++++++--------------------
> > 1 file changed, 22 insertions(+), 20 deletions(-)
> > 
> > diff --git a/libavformat/udp.c b/libavformat/udp.c
> > index 13c346a..28987e0 100644
> > --- a/libavformat/udp.c
> > +++ b/libavformat/udp.c
> > @@ -633,6 +633,8 @@ 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);
> > +    int net_ret = 0;
> > 
> >     h->is_streamed = 1;
> > 
> > @@ -641,12 +643,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 +714,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 +744,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 +765,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 ((net_ret = setsockopt (udp_fd, SOL_SOCKET, SO_REUSEADDR, &(s->reuse_socket), sizeof(s->reuse_socket))) != 0)
> >             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 ((net_ret = setsockopt (udp_fd, SOL_SOCKET, SO_BROADCAST, &(s->is_broadcast), sizeof(s->is_broadcast))) != 0)
> > #endif
> >            goto fail;
> >     }
> > @@ -788,7 +790,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)
> > 
> >     if (dscp >= 0) {
> >         dscp <<= 2;
> > -        if (setsockopt (udp_fd, IPPROTO_IP, IP_TOS, &dscp, sizeof(dscp)) != 0)
> > +        if ((net_ret = setsockopt (udp_fd, IPPROTO_IP, IP_TOS, &dscp, sizeof(dscp))) != 0)
> >             goto fail;
> >     }
> > 
> > @@ -802,7 +804,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 && (net_ret = bind(udp_fd,(struct sockaddr *)&my_addr, len)) < 0) {
> >         ff_log_net_error(h, AV_LOG_ERROR, "bind failed");
> >         goto fail;
> >     }
> > @@ -814,28 +816,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 ((net_ret = udp_set_multicast_ttl(udp_fd, s->ttl, (struct sockaddr *)&s->dest_addr)) < 0)
> 
> I suggest you make this ret as well and change udp_set_multicast_ttl to
> return ff_neterrno() instead of -1 on error.

OK, will change by suggestion.

> 
> >                 goto fail;
> >         }
> >         if (h->flags & AVIO_FLAG_READ) {
> >             /* input */
> >             if (s->filters.nb_include_addrs) {
> > -                if (udp_set_multicast_sources(h, udp_fd,
> > +                if ((net_ret = udp_set_multicast_sources(h, udp_fd,
> 
> This is ret as far as I see.
yes, use ret is better, will fix it.
> 
> >                                               (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 ((net_ret = udp_join_multicast_group(udp_fd, (struct sockaddr *)&s->dest_addr,(struct sockaddr *)&s->local_addr_storage)) < 0)
> 
> Same comment as for udp_set_multicast_ttl.

OK

> 
> >                     goto fail;
> >             }
> >             if (s->filters.nb_exclude_addrs) {
> > -                if (udp_set_multicast_sources(h, udp_fd,
> > +                if ((net_ret = udp_set_multicast_sources(h, udp_fd,
> 
> This is also ret.

OK

> 
> >                                               (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,7 +846,7 @@ 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 ((net_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;
> >         }
> > @@ -867,7 +869,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 (net_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 +890,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);
> > @@ -919,11 +919,13 @@ static int udp_open(URLContext *h, const char *uri, int flags)
> >     pthread_mutex_destroy(&s->mutex);
> > #endif
> >  fail:
> > +    if (net_ret < 0)
> 
> Strictly speaking this is not the same, because in some cases the code
> checks for non-zeroness for success of network functions, and not
> less-than-zero. I don't know if it makes a difference in practice for some
> exotic architectures, yes the current code is not conistent about it.

yes, I'll change to assign the error code for every failure of network functions to avoid
the consistent.

> 
> Regards,
> Marton
> 
> 
> > +        ret = ff_neterrno();
> >     if (udp_fd >= 0)
> >         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 at ffmpeg.org
> > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> > 
> > To unsubscribe, visit link above, or email
> > ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".

-- 
Thanks,
Limin Wang


More information about the ffmpeg-devel mailing list