From 7e43f74a37b43f0b4fb5448ac01a3dddd0aa533a Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Mon, 11 Jan 2010 17:14:16 +0000
Subject: [PATCH] =?UTF-8?q?Use=20getaddrinfo(),=20if=20available,=20in=20r?=
=?UTF-8?q?esolve=5Fhost().=20Patch=20by=20Martin=20Storsj=C3=B6=20<$first?=
=?UTF-8?q?name()$firstname,st>.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Originally committed as revision 21143 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/os_support.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 96cd347b9ef..87481d674ec 100644
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -63,13 +63,34 @@ int inet_aton (const char * str, struct in_addr * add)
/* resolve host with also IP address parsing */
int resolve_host(struct in_addr *sin_addr, const char *hostname)
{
- struct hostent *hp;
if (!inet_aton(hostname, sin_addr)) {
+#if HAVE_GETADDRINFO
+ struct addrinfo *ai, *cur;
+ struct addrinfo hints;
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_INET;
+ if (getaddrinfo(hostname, NULL, &hints, &ai))
+ return -1;
+ /* getaddrinfo returns a linked list of addrinfo structs.
+ * Even if we set ai_family = AF_INET above, make sure
+ * that the returned one actually is of the correct type. */
+ for (cur = ai; cur; cur = cur->ai_next) {
+ if (cur->ai_family == AF_INET) {
+ *sin_addr = ((struct sockaddr_in *)cur->ai_addr)->sin_addr;
+ freeaddrinfo(ai);
+ return 0;
+ }
+ }
+ freeaddrinfo(ai);
+ return -1;
+#else
+ struct hostent *hp;
hp = gethostbyname(hostname);
if (!hp)
return -1;
memcpy(sin_addr, hp->h_addr_list[0], sizeof(struct in_addr));
+#endif
}
return 0;
}
--
GitLab