From 5d629b72cba60e1af4339b5646a9c1d511d892fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 11 Jan 2010 17:45:17 +0000 Subject: [PATCH] =?UTF-8?q?Provide=20a=20fallback=20for=20getnameinfo()=20?= =?UTF-8?q?also.=20Patch=20by=20Martin=20Storsj=C3=B6=20<$firstname()$firs?= =?UTF-8?q?tname,st>.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Originally committed as revision 21150 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/network.h | 32 +++++++++++++++++++++++++++++ libavformat/os_support.c | 44 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/libavformat/network.h b/libavformat/network.h index 496cae8e4a..ea8e946701 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -92,6 +92,14 @@ struct addrinfo { #define EAI_FAIL 4 #endif +#ifndef EAI_FAMILY +#define EAI_FAMILY 5 +#endif + +#ifndef EAI_NONAME +#define EAI_NONAME 8 +#endif + #ifndef AI_PASSIVE #define AI_PASSIVE 1 #endif @@ -104,12 +112,36 @@ struct addrinfo { #define AI_NUMERICHOST 4 #endif +#ifndef NI_NOFQDN +#define NI_NOFQDN 1 +#endif + +#ifndef NI_NUMERICHOST +#define NI_NUMERICHOST 2 +#endif + +#ifndef NI_NAMERQD +#define NI_NAMERQD 4 +#endif + +#ifndef NI_NUMERICSERV +#define NI_NUMERICSERV 8 +#endif + +#ifndef NI_DGRAM +#define NI_DGRAM 16 +#endif + #if !HAVE_GETADDRINFO int ff_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res); void ff_freeaddrinfo(struct addrinfo *res); +int ff_getnameinfo(const struct sockaddr *sa, int salen, + char *host, int hostlen, + char *serv, int servlen, int flags); #define getaddrinfo ff_getaddrinfo #define freeaddrinfo ff_freeaddrinfo +#define getnameinfo ff_getnameinfo #endif #endif /* AVFORMAT_NETWORK_H */ diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 62fd183afd..120f23469f 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -128,6 +128,50 @@ void ff_freeaddrinfo(struct addrinfo *res) av_free(res->ai_addr); av_free(res); } + +int ff_getnameinfo(const struct sockaddr *sa, int salen, + char *host, int hostlen, + char *serv, int servlen, int flags) +{ + const struct sockaddr_in *sin = (const struct sockaddr_in *)sa; + + if (sa->sa_family != AF_INET) + return EAI_FAMILY; + if (!host && !serv) + return EAI_NONAME; + + if (host && hostlen > 0) { + struct hostent *ent = NULL; + uint32_t a; + if (!(flags & NI_NUMERICHOST)) + ent = gethostbyaddr((const char *)&sin->sin_addr, + sizeof(sin->sin_addr), AF_INET); + + if (ent) { + snprintf(host, hostlen, "%s", ent->h_name); + } else if (flags & NI_NAMERQD) { + return EAI_NONAME; + } else { + a = ntohl(sin->sin_addr.s_addr); + snprintf(host, hostlen, "%d.%d.%d.%d", + ((a >> 24) & 0xff), ((a >> 16) & 0xff), + ((a >> 8) & 0xff), ( a & 0xff)); + } + } + + if (serv && servlen > 0) { + struct servent *ent = NULL; + if (!(flags & NI_NUMERICSERV)) + ent = getservbyport(sin->sin_port, flags & NI_DGRAM ? "udp" : "tcp"); + + if (ent) { + snprintf(serv, servlen, "%s", ent->s_name); + } else + snprintf(serv, servlen, "%d", ntohs(sin->sin_port)); + } + + return 0; +} #endif /* resolve host with also IP address parsing */