[FFmpeg-devel] [PATCH v2] libavformat/tcp: fix return code for tcp_accept

[Michael Niedermayer]

On Mon, May 08, 2017 at 10:58:35AM +0200, Simon Thelen wrote:
> On 17-04-20 at 05:01, Simon Thelen wrote:
> > On 17-04-08 at 14:21, Simon Thelen wrote:
> > > ff_accept can return AVERROR(ETIMEDOUT) and errno will be 0 (or
> > > undefined), return ret instead and return ff_neterror() in
> > > ff_poll_interrupt instead of AVERROR(errno) to parse WSAGetLastError on
> > > Windows.
> > > ---
> > > v2 rewords the commit message to better elucidate the issue.
> > > 
> > >  libavformat/network.c | 2 +-
> > >  libavformat/tcp.c     | 2 +-
> > >  2 files changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/libavformat/network.c b/libavformat/network.c
> > > index 2fb1c8b02a..b3987a4d11 100644
> > > --- a/libavformat/network.c
> > > +++ b/libavformat/network.c
> > > @@ -159,7 +159,7 @@ static int ff_poll_interrupt(struct pollfd *p, nfds_t nfds, int timeout,
> > >      if (!ret)
> > >          return AVERROR(ETIMEDOUT);
> > >      if (ret < 0)
> > > -        return AVERROR(errno);
> > > +        return ff_neterrno();
> > >      return ret;
> > >  }
> > >  
> > > diff --git a/libavformat/tcp.c b/libavformat/tcp.c
> > > index 3055e48015..07b4ed9fa3 100644
> > > --- a/libavformat/tcp.c
> > > +++ b/libavformat/tcp.c
> > > @@ -204,7 +204,7 @@ static int tcp_accept(URLContext *s, URLContext **c)
> > >      cc = (*c)->priv_data;
> > >      ret = ff_accept(sc->fd, sc->listen_timeout, s);
> > >      if (ret < 0)
> > > -        return ff_neterrno();
> > > +        return ret;
> > >      cc->fd = ret;
> > >      return 0;
> > >  }
> > > -- 
> > > 2.12.2
> > > 
> > > _______________________________________________
> > > ffmpeg-devel mailing list
> > > ffmpeg-devel at ffmpeg.org
> > > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> > 
> > ping
> > 
> ping?

applied

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

He who knows, does not speak. He who speaks, does not know. -- Lao Tsu
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20170510/f4ffbe8e/attachment.sig>