X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcutil%2Fsilcnet.c;h=60c5c77e3ccaf0b2a3e230e8d680668a554136e6;hb=487b9263317ab859b530cdda115984a970ca04eb;hp=0101faae4d344522048cd24f515cf539df633f40;hpb=5a014c54d33edcca7c15a2c88b1f4a916a6a99b8;p=silc.git diff --git a/lib/silcutil/silcnet.c b/lib/silcutil/silcnet.c index 0101faae..60c5c77e 100644 --- a/lib/silcutil/silcnet.c +++ b/lib/silcutil/silcnet.c @@ -44,13 +44,222 @@ int silc_net_get_socket_opt(int sock, int level, int option, return getsockopt(sock, level, option, optval, opt_len); } +/* Checks whether IP address sent as argument is valid IPv4 address. */ + +bool silc_net_is_ip4(const char *addr) +{ + int count = 0; + + while (*addr) { + if (*addr != '.' && !isdigit(*addr)) + return FALSE; + if (*addr == '.') + count++; + addr++; + } + + if (count != 3) + return FALSE; + + return TRUE; +} + +/* Checks whether IP address sent as argument is valid IPv6 address. */ + +bool silc_net_is_ip6(const char *addr) +{ + /* XXX does this work with all kinds of IPv6 addresses? */ + while (*addr) { + if (*addr != ':' && !isxdigit(*addr)) + return FALSE; + addr++; + } + + return TRUE; +} + /* Checks whether IP address sent as argument is valid IP address. */ bool silc_net_is_ip(const char *addr) { - struct in_addr tmp; - int len = sizeof(tmp); - return silc_net_addr2bin(addr, (unsigned char *)&tmp.s_addr, len); + if (silc_net_is_ip4(addr)) + return TRUE; + return silc_net_is_ip6(addr); +} + +/* Internal context for async resolving */ +typedef struct { + SilcNetResolveCallback completion; + void *context; + SilcSchedule schedule; + char *input; + char *result; +} *SilcNetResolveContext; + +SILC_TASK_CALLBACK(silc_net_resolve_completion) +{ + SilcNetResolveContext r = (SilcNetResolveContext)context; + + /* Call the completion callback */ + if (r->completion) + (*r->completion)(r->result, r->context); + + silc_free(r->input); + silc_free(r->result); + silc_free(r); +} + +/* Thread function to resolve the address for hostname. */ + +static void *silc_net_gethostbyname_thread(void *context) +{ + SilcNetResolveContext r = (SilcNetResolveContext)context; + char tmp[64]; + + if (silc_net_gethostbyname(r->input, tmp, sizeof(tmp))) + r->result = strdup(tmp); + + silc_schedule_task_add(r->schedule, 0, silc_net_resolve_completion, r, 0, 1, + SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL); + silc_schedule_wakeup(r->schedule); + return NULL; +} + +/* Thread function to resolve the hostname for address. */ + +static void *silc_net_gethostbyaddr_thread(void *context) +{ + SilcNetResolveContext r = (SilcNetResolveContext)context; + char tmp[256]; + + if (silc_net_gethostbyaddr(r->input, tmp, sizeof(tmp))) + r->result = strdup(tmp); + + silc_schedule_task_add(r->schedule, 0, silc_net_resolve_completion, r, 0, 1, + SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL); + silc_schedule_wakeup(r->schedule); + return NULL; +} + +/* Resolves IP address for hostname. */ + +bool silc_net_gethostbyname(const char *name, char *address, + uint32 address_len) +{ +#ifdef HAVE_IPV6 + struct addrinfo hints, *ai; + char hbuf[NI_MAXHOST]; + + memset(&hints, 0, sizeof(hints)); + hints.ai_socktype = SOCK_STREAM; + if (getaddrinfo(name, NULL, &hints, &ai)) + return FALSE; + + if (getnameinfo(ai->ai_addr, ai->ai_addrlen, hbuf, + sizeof(hbuf), NULL, 0, NI_NUMERICHOST)) + return FALSE; + + if (ai->ai_family == AF_INET) { + if (!inet_ntop(ai->ai_family, + &((struct sockaddr_in *)ai->ai_addr)->sin_addr, + address, address_len)) + return FALSE; + } else { + if (!inet_ntop(ai->ai_family, + &((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr, + address, address_len)) + return FALSE; + } + + freeaddrinfo(ai); +#else + struct hostent *hp; + struct in_addr ip; + char *tmp; + + hp = gethostbyname(name); + if (!hp) + return FALSE; + + memcpy(&ip.s_addr, hp->h_addr_list[0], 4); + tmp = inet_ntoa(ip); + if (!tmp) + return FALSE; + if (address_len < strlen(tmp)) + return FALSE; + memset(address, 0, address_len); + strncpy(address, tmp, strlen(tmp)); +#endif + + return TRUE; +} + +/* Resolves IP address for hostname async. */ + +void silc_net_gethostbyname_async(const char *name, + SilcSchedule schedule, + SilcNetResolveCallback completion, + void *context) +{ + SilcNetResolveContext r = silc_calloc(1, sizeof(*r)); + + r->completion = completion; + r->context = context; + r->schedule = schedule; + r->input = strdup(name); + + silc_thread_create(silc_net_gethostbyname_thread, r, FALSE); +} + +/* Resolves hostname by IP address. */ + +bool silc_net_gethostbyaddr(const char *addr, char *name, uint32 name_len) +{ +#ifdef HAVE_IPV6 + struct addrinfo req, *ai; + + memset(&req, 0, sizeof(req)); + req.ai_socktype = SOCK_STREAM; + req.ai_flags = AI_CANONNAME; + + if (getaddrinfo(addr, NULL, &req, &ai)) + return FALSE; + if (name_len < strlen(ai->ai_canonname)) + return FALSE; + memset(name, 0, name_len); + strncpy(name, ai->ai_canonname, strlen(ai->ai_canonname)); + + freeaddrinfo(ai); +#else + struct hostent *hp; + + hp = gethostbyaddr(addr, strlen(addr), AF_INET); + if (!hp) + return FALSE; + if (name_len < strlen(hp->h_name)) + return FALSE; + memset(name, 0, name_len); + strncpy(name, hp->h_name, strlen(hp->h_name)); +#endif + + return TRUE; +} + +/* Resolves hostname by IP address async. */ + +void silc_net_gethostbyaddr_async(const char *addr, + SilcSchedule schedule, + SilcNetResolveCallback completion, + void *context) +{ + SilcNetResolveContext r = silc_calloc(1, sizeof(*r)); + + r->completion = completion; + r->context = context; + r->schedule = schedule; + r->input = strdup(addr); + + silc_thread_create(silc_net_gethostbyaddr_thread, r, FALSE); } /* Performs lookups for remote name and IP address. This peforms reverse @@ -217,45 +426,29 @@ uint16 silc_net_get_local_port(int sock) char *silc_net_localhost(void) { - char hostname[256]; - struct hostent *dest; - char *h; + char hostname[256], ip_addr[64]; if (gethostname(hostname, sizeof(hostname))) return NULL; - dest = gethostbyname(hostname); - if (!dest) + if (!silc_net_gethostbyname(hostname, ip_addr, sizeof(ip_addr))) return strdup(hostname); - h = strdup(dest->h_name); - dest = gethostbyaddr((char *)dest->h_addr_list[0], - sizeof(struct in_addr), AF_INET); - if (!dest) - return h; - - silc_free(h); - return strdup(dest->h_name); + silc_net_gethostbyaddr(ip_addr, hostname, sizeof(hostname)); + return strdup(hostname); } /* Returns local IP address */ char *silc_net_localip(void) { - char hostname[256]; - struct hostent *dest; - struct in_addr ip; - char *ips; + char hostname[256], ip_addr[64]; if (gethostname(hostname, sizeof(hostname))) return NULL; - dest = gethostbyname(hostname); - if (!dest) + if (!silc_net_gethostbyname(hostname, ip_addr, sizeof(ip_addr))) return NULL; - memcpy(&ip.s_addr, dest->h_addr_list[0], 4); - ips = inet_ntoa(ip); - - return strdup(ips); + return strdup(ip_addr); }