From fdcdd5396e2214ecf9fa39cef03f46e5eba7170b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Mon, 11 Jan 2010 17:32:40 +0000
Subject: [PATCH] =?UTF-8?q?Use=20getaddrinfo()=20instead=20of=20resolve=5F?=
=?UTF-8?q?host().=20Patch=20by=20Martin=20Storsj=C3=B6=20<$firstname()$fi?=
=?UTF-8?q?rstname,st>.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Originally committed as revision 21147 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/tcp.c | 34 +++++++++++++++++++++++++---------
1 file changed, 25 insertions(+), 9 deletions(-)
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index 05676eb83df..ffcc6ff13cc 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -34,7 +34,7 @@ typedef struct TCPContext {
/* return non zero if error */
static int tcp_open(URLContext *h, const char *uri, int flags)
{
- struct sockaddr_in dest_addr;
+ struct addrinfo hints, *ai, *cur_ai;
int port, fd = -1;
TCPContext *s = NULL;
fd_set wfds;
@@ -42,6 +42,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
struct timeval tv;
socklen_t optlen;
char hostname[1024],proto[1024],path[1024];
+ char portstr[10];
if(!ff_network_init())
return AVERROR(EIO);
@@ -51,19 +52,23 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
if (strcmp(proto,"tcp") || port <= 0 || port >= 65536)
return AVERROR(EINVAL);
- dest_addr.sin_family = AF_INET;
- dest_addr.sin_port = htons(port);
- if (resolve_host(&dest_addr.sin_addr, hostname) < 0)
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = PF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ snprintf(portstr, sizeof(portstr), "%d", port);
+ if (getaddrinfo(hostname, portstr, &hints, &ai))
return AVERROR(EIO);
- fd = socket(AF_INET, SOCK_STREAM, 0);
+ cur_ai = ai;
+
+ restart:
+ fd = socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol);
if (fd < 0)
- return AVERROR(EIO);
+ goto fail;
ff_socket_nonblock(fd, 1);
redo:
- ret = connect(fd, (struct sockaddr *)&dest_addr,
- sizeof(dest_addr));
+ ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen);
if (ret < 0) {
if (ff_neterrno() == FF_NETERROR(EINTR))
goto redo;
@@ -94,18 +99,29 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
goto fail;
}
s = av_malloc(sizeof(TCPContext));
- if (!s)
+ if (!s) {
+ freeaddrinfo(ai);
return AVERROR(ENOMEM);
+ }
h->priv_data = s;
h->is_streamed = 1;
s->fd = fd;
+ freeaddrinfo(ai);
return 0;
fail:
+ if (cur_ai->ai_next) {
+ /* Retry with the next sockaddr */
+ cur_ai = cur_ai->ai_next;
+ if (fd >= 0)
+ closesocket(fd);
+ goto restart;
+ }
ret = AVERROR(EIO);
fail1:
if (fd >= 0)
closesocket(fd);
+ freeaddrinfo(ai);
return ret;
}
--
GitLab