diff options
| author | Timo Sirainen <cras@irssi.org> | 2002-11-28 23:43:42 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2002-11-28 23:43:42 +0000 |
| commit | b669dfaaaa8d22fc9713abc9c729f679302a7e63 (patch) | |
| tree | af1d43d980b1031a1e5de41bf696692bfec61cf3 /src/core | |
| parent | ed444e1c5f2ca9f6b4bfa6b73fa1193789d30c71 (diff) | |
| download | irssi-b669dfaaaa8d22fc9713abc9c729f679302a7e63.zip | |
net_gethostbyaddr() was pretty much broken.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3031 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/network.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/core/network.c b/src/core/network.c index 6b2ceab4..b2b7fc3e 100644 --- a/src/core/network.c +++ b/src/core/network.c @@ -466,33 +466,31 @@ int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6) int net_gethostbyaddr(IPADDR *ip, char **name) { #ifdef HAVE_IPV6 - struct addrinfo req, *ai; + union sockaddr_union so; int host_error; + char hostname[NI_MAXHOST]; #else struct hostent *hp; #endif - char ipname[MAX_IP_LEN]; g_return_val_if_fail(ip != NULL, -1); g_return_val_if_fail(name != NULL, -1); - net_ip2host(ip, ipname); - *name = NULL; #ifdef HAVE_IPV6 - memset(&req, 0, sizeof(struct addrinfo)); - req.ai_socktype = SOCK_STREAM; - req.ai_flags = AI_CANONNAME; + memset(&so, 0, sizeof(so)); + sin_set_ip(&so, ip); /* save error to host_error for later use */ - host_error = getaddrinfo(ipname, NULL, &req, &ai); - if (host_error != 0) - return host_error; - *name = g_strdup(ai->ai_canonname); + host_error = getnameinfo((struct sockaddr *) &so, sizeof(so), + hostname, sizeof(hostname), NULL, 0, 0); + if (host_error != 0) + return host_error; - freeaddrinfo(ai); + *name = g_strdup(hostname); #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; *name = g_strdup(hp->h_name); |