generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tcp: Check url_interrupt_cb if connect was interrupted by a signal

Browse Source 
This makes it possible to abort a blocking connect call.

Patch by Thomas Guillem, thomas dot guillem at gmail

Originally committed as revision 26014 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Thomas Guillem 2010-12-14 23:03:05 +00:00 committed by Martin Storsjö
parent 06f6f78578
commit 1aa58c6405
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/tcp.c
View File

@ -73,8 +73,11 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
redo: redo:
ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen); ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen);
if (ret < 0) { if (ret < 0) {
if (ff_neterrno() == FF_NETERROR(EINTR)) if (ff_neterrno() == FF_NETERROR(EINTR)) {
if (url_interrupt_cb())
goto fail1;
goto redo; goto redo;
}
if (ff_neterrno() != FF_NETERROR(EINPROGRESS) && if (ff_neterrno() != FF_NETERROR(EINPROGRESS) &&
ff_neterrno() != FF_NETERROR(EAGAIN)) ff_neterrno() != FF_NETERROR(EAGAIN))
goto fail; goto fail;