zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-19 08:32:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

net_gethostbyaddr() was pretty much broken.

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3031 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-11-28 23:43:42 +00:00 • committed by cras
commit b669dfaaaa
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/core/network.c
View file

@ -466,33 +466,31 @@ int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
int net_gethostbyaddr(IPADDR *ip, char **name) int net_gethostbyaddr(IPADDR *ip, char **name)
{ {
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
struct addrinfo req, *ai; union sockaddr_union so;
int host_error; int host_error;
char hostname[NI_MAXHOST];
#else #else
struct hostent *hp; struct hostent *hp;
#endif #endif
char ipname[MAX_IP_LEN];
g_return_val_if_fail(ip != NULL, -1); g_return_val_if_fail(ip != NULL, -1);
g_return_val_if_fail(name != NULL, -1); g_return_val_if_fail(name != NULL, -1);
net_ip2host(ip, ipname);
*name = NULL; *name = NULL;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
memset(&req, 0, sizeof(struct addrinfo)); memset(&so, 0, sizeof(so));
req.ai_socktype = SOCK_STREAM; sin_set_ip(&so, ip);
req.ai_flags = AI_CANONNAME;
/* save error to host_error for later use */ /* save error to host_error for later use */
host_error = getaddrinfo(ipname, NULL, &req, &ai); host_error = getnameinfo((struct sockaddr *) &so, sizeof(so),
if (host_error != 0) hostname, sizeof(hostname), NULL, 0, 0);
return host_error; if (host_error != 0)
*name = g_strdup(ai->ai_canonname); return host_error;
freeaddrinfo(ai); *name = g_strdup(hostname);
#else #else
hp = gethostbyaddr(ipname, strlen(ipname), AF_INET); if (ip->family != AF_INET) return -1;
hp = gethostbyaddr(&ip->ip, 4, AF_INET);
if (hp == NULL) return -1; if (hp == NULL) return -1;
*name = g_strdup(hp->h_name); *name = g_strdup(hp->h_name);