aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-10-06 04:53:38 -04:00
Code

OK, looks like I was doing stupid things with IPv6 hostname lookups :) Back

Browse Source 
when I originally wrote that code, there wasn't any man pages for them and I
couldn't really find any good docs either, so I just copy&pasted some code
from somewhere and it seemed to work. Anyway, it was doing reverse name
lookup for uninitialized host name which really wasn't a good idea :)


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2358 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-01-29 22:16:40 +00:00 committed by cras
parent f2a4a97668
commit 13eb6379e7
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/core/network.c
View File

@ -378,9 +378,8 @@ int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
{
#ifdef HAVE_IPV6
union sockaddr_union *so;
struct addrinfo hints, *ai, *origai;
char hbuf[NI_MAXHOST];
int host_error, count;
struct addrinfo hints, *ai, *ailist;
int ret, count;
#else
struct hostent *hp;
#endif
@ -395,30 +394,23 @@ int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
hints.ai_socktype = SOCK_STREAM;
/* save error to host_error for later use */
host_error = getaddrinfo(addr, NULL, &hints, &ai);
if (host_error != 0)
return host_error;
ret = getaddrinfo(addr, NULL, &hints, &ailist);
if (ret != 0)
return ret;
if (getnameinfo(ai->ai_addr, ai->ai_addrlen, hbuf,
sizeof(hbuf), NULL, 0, NI_NUMERICHOST))
return 1;
origai = ai; count = 0;
while (ai != NULL && count < 2) {
count = 0;
for (ai = ailist; ai != NULL && count < 2; ai = ai->ai_next) {
so = (union sockaddr_union *) ai->ai_addr;
if (so != NULL) {
if (ai->ai_family == AF_INET6 && ip6->family == 0) {
sin_get_ip(so, ip6);
count++;
} else if (ai->ai_family == AF_INET && ip4->family == 0) {
sin_get_ip(so, ip4);
count++;
}
if (ai->ai_family == AF_INET6 && ip6->family == 0) {
sin_get_ip(so, ip6);
count++;
} else if (ai->ai_family == AF_INET && ip4->family == 0) {
sin_get_ip(so, ip4);
count++;
}
ai = ai->ai_next;
}
freeaddrinfo(origai);
freeaddrinfo(ailist);
#else
hp = gethostbyname(addr);
if (hp == NULL) return h_errno;
@ -427,7 +419,7 @@ int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6)
memcpy(&ip4->ip, hp->h_addr, 4);
#endif
return 0;
return count > 0 ? 0 : 1;
}
/* Get name for host, *name should be g_free()'d unless it's NULL.