Commit aab9133d authored by Marton Balint's avatar Marton Balint

avformat/libsrt: fix checking connection result in non-blocking mode

After f8990c5f we properly set non-blocking
mode which makes the connect() call return always 0 even if no connection can
be established.

Fix this by always doing a poll after calling connect(). Also there was some
leftover copy paste code which checks for various errors which are simply not
possible with SRT.
Signed-off-by: 's avatarMarton Balint <cus@passwd.hu>
parent 006744bd
...@@ -250,34 +250,19 @@ static int libsrt_listen_connect(int eid, int fd, const struct sockaddr *addr, s ...@@ -250,34 +250,19 @@ static int libsrt_listen_connect(int eid, int fd, const struct sockaddr *addr, s
if (libsrt_socket_nonblock(fd, 1) < 0) if (libsrt_socket_nonblock(fd, 1) < 0)
av_log(h, AV_LOG_DEBUG, "ff_socket_nonblock failed\n"); av_log(h, AV_LOG_DEBUG, "ff_socket_nonblock failed\n");
while ((ret = srt_connect(fd, addr, addrlen))) { ret = srt_connect(fd, addr, addrlen);
ret = libsrt_neterrno(h);
switch (ret) {
case AVERROR(EINTR):
if (ff_check_interrupt(&h->interrupt_callback))
return AVERROR_EXIT;
continue;
case AVERROR(EINPROGRESS):
case AVERROR(EAGAIN):
ret = libsrt_network_wait_fd_timeout(h, eid, fd, 1, timeout, &h->interrupt_callback);
if (ret < 0) if (ret < 0)
return ret; return libsrt_neterrno(h);
ret = srt_getlasterror(NULL);
srt_clearlasterror(); ret = libsrt_network_wait_fd_timeout(h, eid, fd, 1, timeout, &h->interrupt_callback);
if (ret != 0) { if (ret < 0) {
char buf[128]; if (will_try_next) {
ret = AVERROR(ret);
av_strerror(ret, buf, sizeof(buf));
if (will_try_next)
av_log(h, AV_LOG_WARNING, av_log(h, AV_LOG_WARNING,
"Connection to %s failed (%s), trying next address\n", "Connection to %s failed (%s), trying next address\n",
h->filename, buf); h->filename, av_err2str(ret));
else } else {
av_log(h, AV_LOG_ERROR, "Connection to %s failed: %s\n", av_log(h, AV_LOG_ERROR, "Connection to %s failed: %s\n",
h->filename, buf); h->filename, av_err2str(ret));
}
default:
return ret;
} }
} }
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment