videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

lavf/network: log ff_listen() errors to proper contexts rather than NULL

This commit is contained in:
Anton Khirnov 2022-01-10 17:34:04 +01:00
parent d2519e8625
commit 9e4693a1cb
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/network.c
View File

@ -208,12 +208,12 @@ int ff_socket(int af, int type, int proto, void *logctx)
}
int ff_listen(int fd, const struct sockaddr *addr,
socklen_t addrlen)
socklen_t addrlen, void *logctx)
{
int ret;
int reuse = 1;
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse))) {
av_log(NULL, AV_LOG_WARNING, "setsockopt(SO_REUSEADDR) failed\n");
av_log(logctx, AV_LOG_WARNING, "setsockopt(SO_REUSEADDR) failed\n");
}
ret = bind(fd, addr, addrlen);
if (ret)
@ -247,7 +247,7 @@ int ff_listen_bind(int fd, const struct sockaddr *addr,
socklen_t addrlen, int timeout, URLContext *h)
{
int ret;
if ((ret = ff_listen(fd, addr, addrlen)) < 0)
if ((ret = ff_listen(fd, addr, addrlen, h)) < 0)
return ret;
if ((ret = ff_accept(fd, timeout, h)) < 0)
return ret;

3
libavformat/network.h
View File

@ -271,7 +271,8 @@ int ff_listen_bind(int fd, const struct sockaddr *addr,
* @param addrlen Third argument of bind().
* @return 0 on success or an AVERROR on failure.
*/
int ff_listen(int fd, const struct sockaddr *addr, socklen_t addrlen);
int ff_listen(int fd, const struct sockaddr *addr, socklen_t addrlen,
void *logctx);
/**
* Poll for a single connection on the passed file descriptor.

2
libavformat/tcp.c
View File

@ -188,7 +188,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
if (s->listen == 2) {
// multi-client
if ((ret = ff_listen(fd, cur_ai->ai_addr, cur_ai->ai_addrlen)) < 0)
if ((ret = ff_listen(fd, cur_ai->ai_addr, cur_ai->ai_addrlen, h)) < 0)
goto fail1;
} else if (s->listen == 1) {
// single client