X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcutil%2Fsilcnet.c;h=a6c0f9271456171013bc36b0aac679bae7a2b03c;hb=9905799a86c606304fd7df2cd401de1740a272a1;hp=272e7e300f306738495159bad4af86abf1f3a0e4;hpb=99865727f85eb96f5462158eed8dc935710d1a0b;p=silc.git diff --git a/lib/silcutil/silcnet.c b/lib/silcutil/silcnet.c index 272e7e30..a6c0f927 100644 --- a/lib/silcutil/silcnet.c +++ b/lib/silcutil/silcnet.c @@ -4,13 +4,12 @@ Author: Pekka Riikonen - Copyright (C) 1997 - 2001 Pekka Riikonen + Copyright (C) 1997 - 2006 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + the Free Software Foundation; version 2 of the License. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -19,8 +18,28 @@ */ /* $Id$ */ -#include "silcincludes.h" -#include "silcnet.h" +#include "silc.h" + +/* Returns bound port from listener */ + +SilcUInt16 *silc_net_listener_get_port(SilcNetListener listener, + SilcUInt32 *port_count) +{ + SilcUInt16 *ports; + int i; + + ports = silc_calloc(listener->socks_count, sizeof(*ports)); + if (!ports) + return NULL; + + for (i = 0; i < listener->socks_count; i++) + ports[i] = silc_net_get_local_port(listener->socks[i]); + + if (port_count) + *port_count = listener->socks_count; + + return ports; +} /* Accepts a connection from a particular socket */ @@ -38,7 +57,7 @@ int silc_net_set_socket_opt(int sock, int level, int option, int on) /* Get socket options */ -int silc_net_get_socket_opt(int sock, int level, int option, +int silc_net_get_socket_opt(int sock, int level, int option, void *optval, int *opt_len) { return getsockopt(sock, level, option, optval, opt_len); @@ -46,12 +65,12 @@ int silc_net_get_socket_opt(int sock, int level, int option, /* Checks whether IP address sent as argument is valid IPv4 address. */ -bool silc_net_is_ip4(const char *addr) +SilcBool silc_net_is_ip4(const char *addr) { int count = 0; while (*addr) { - if (*addr != '.' && !isdigit(*addr)) + if (*addr != '.' && !isdigit((int)*addr)) return FALSE; if (*addr == '.') count++; @@ -60,27 +79,27 @@ bool silc_net_is_ip4(const char *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) +SilcBool silc_net_is_ip6(const char *addr) { /* XXX does this work with all kinds of IPv6 addresses? */ while (*addr) { - if (*addr != ':' && !isxdigit(*addr)) + if (*addr != ':' && !isxdigit((int)*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) +SilcBool silc_net_is_ip(const char *addr) { if (silc_net_is_ip4(addr)) return TRUE; @@ -91,6 +110,7 @@ bool silc_net_is_ip(const char *addr) typedef struct { SilcNetResolveCallback completion; void *context; + SilcBool prefer_ipv6; SilcSchedule schedule; char *input; char *result; @@ -114,14 +134,15 @@ SILC_TASK_CALLBACK(silc_net_resolve_completion) static void *silc_net_gethostbyname_thread(void *context) { SilcNetResolveContext r = (SilcNetResolveContext)context; + SilcSchedule schedule = r->schedule; char tmp[64]; - if (silc_net_gethostbyname(r->input, tmp, sizeof(tmp))) + if (silc_net_gethostbyname(r->input, r->prefer_ipv6, 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); + silc_schedule_task_add(schedule, 0, silc_net_resolve_completion, r, 0, 1, + SILC_TASK_TIMEOUT); + silc_schedule_wakeup(schedule); return NULL; } @@ -130,37 +151,58 @@ static void *silc_net_gethostbyname_thread(void *context) static void *silc_net_gethostbyaddr_thread(void *context) { SilcNetResolveContext r = (SilcNetResolveContext)context; + SilcSchedule schedule = r->schedule; 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); + silc_schedule_task_add(schedule, 0, silc_net_resolve_completion, r, 0, 1, + SILC_TASK_TIMEOUT); + silc_schedule_wakeup(schedule); return NULL; } /* Resolves IP address for hostname. */ -bool silc_net_gethostbyname(const char *name, char *address, - uint32 address_len) +SilcBool silc_net_gethostbyname(const char *name, + SilcBool prefer_ipv6, char *address, + SilcUInt32 address_len) { #ifdef HAVE_IPV6 - struct addrinfo hints, *ai; - char hbuf[NI_MAXHOST]; + struct addrinfo hints, *ai, *tmp, *ip4 = NULL, *ip6 = NULL; 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)) + for (tmp = ai; tmp; tmp = tmp->ai_next) { + if (tmp->ai_family == AF_INET6) { + ip6 = tmp; + if (ip4) + break; + continue; + } + if (tmp->ai_family == AF_INET) { + ip4 = tmp; + if (ip6) + break; + continue; + } + } + + tmp = (prefer_ipv6 ? (ip6 ? ip6 : ip4) : (ip4 ? ip4 : ip6)); + if (!tmp) { + freeaddrinfo(ai); return FALSE; - - if (!inet_ntop(ai->ai_family, ai->ai_addr, address, address_len)) + } + + if (getnameinfo(tmp->ai_addr, tmp->ai_addrlen, address, + address_len, NULL, 0, NI_NUMERICHOST)) { + freeaddrinfo(ai); return FALSE; + } freeaddrinfo(ai); #else @@ -181,13 +223,14 @@ bool silc_net_gethostbyname(const char *name, char *address, 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, +void silc_net_gethostbyname_async(const char *name, + SilcBool prefer_ipv6, SilcSchedule schedule, SilcNetResolveCallback completion, void *context) @@ -196,6 +239,7 @@ void silc_net_gethostbyname_async(const char *name, r->completion = completion; r->context = context; + r->prefer_ipv6 = prefer_ipv6; r->schedule = schedule; r->input = strdup(name); @@ -204,27 +248,31 @@ void silc_net_gethostbyname_async(const char *name, /* Resolves hostname by IP address. */ -bool silc_net_gethostbyaddr(const char *addr, char *name, uint32 name_len) +SilcBool silc_net_gethostbyaddr(const char *addr, char *name, + SilcUInt32 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)) + if (getnameinfo(ai->ai_addr, ai->ai_addrlen, name, name_len, NULL, 0, 0)) { + freeaddrinfo(ai); return FALSE; - memset(name, 0, name_len); - strncpy(name, ai->ai_canonname, strlen(ai->ai_canonname)); - + } freeaddrinfo(ai); #else struct hostent *hp; + unsigned char a[16]; - hp = gethostbyaddr(addr, strlen(addr), AF_INET); + if (!silc_net_addr2bin(addr, a, sizeof(a))) + return FALSE; + + hp = gethostbyaddr(a, 4, AF_INET); if (!hp) return FALSE; if (name_len < strlen(hp->h_name)) @@ -232,13 +280,13 @@ bool silc_net_gethostbyaddr(const char *addr, char *name, uint32 name_len) 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, +void silc_net_gethostbyaddr_async(const char *addr, SilcSchedule schedule, SilcNetResolveCallback completion, void *context) @@ -253,140 +301,186 @@ void silc_net_gethostbyaddr_async(const char *addr, silc_thread_create(silc_net_gethostbyaddr_thread, r, FALSE); } +#ifndef SILC_SYMBIAN + /* Performs lookups for remote name and IP address. This peforms reverse lookup as well to verify that the IP has FQDN. */ -bool silc_net_check_host_by_sock(int sock, char **hostname, char **ip) +SilcBool silc_net_check_host_by_sock(SilcSocket sock, char **hostname, + char **ip) { - struct sockaddr_in remote; - struct hostent *dest; - char *host_ip = NULL; - char host_name[1024]; + char host[1024]; int rval, len; - int i; - *hostname = NULL; +#ifdef HAVE_IPV6 + struct sockaddr_storage remote; + char s[NI_MAXHOST]; + + if (hostname) + *hostname = NULL; *ip = NULL; SILC_LOG_DEBUG(("Resolving remote hostname and IP address")); memset(&remote, 0, sizeof(remote)); + memset(&s, 0, sizeof(s)); len = sizeof(remote); rval = getpeername(sock, (struct sockaddr *)&remote, &len); if (rval < 0) return FALSE; - host_ip = inet_ntoa(remote.sin_addr); - if (!host_ip) + if (getnameinfo((struct sockaddr *)&remote, len, s, sizeof(s), NULL, 0, + NI_NUMERICHOST)) return FALSE; - *ip = silc_calloc(strlen(host_ip) + 1, sizeof(char)); - memcpy(*ip, host_ip, strlen(host_ip)); - - /* Get host by address */ - dest = gethostbyaddr((char *)&remote.sin_addr, - sizeof(struct in_addr), AF_INET); - if (!dest) + *ip = silc_memdup(s, strlen(s)); + if (*ip == NULL) return FALSE; +#else + struct sockaddr_in remote; + char *host_ip; - /* Get same host by name to see that the remote host really is - the who it says it is */ - memset(host_name, 0, sizeof(host_name)); - memcpy(host_name, dest->h_name, strlen(dest->h_name)); + if (hostname) + *hostname = NULL; + *ip = NULL; - *hostname = silc_calloc(strlen(host_name) + 1, sizeof(char)); - memcpy(*hostname, host_name, strlen(host_name)); - SILC_LOG_DEBUG(("Resolved hostname `%s'", *hostname)); + SILC_LOG_DEBUG(("Resolving remote hostname and IP address")); - dest = gethostbyname(host_name); - if (!dest) + memset(&remote, 0, sizeof(remote)); + len = sizeof(remote); + rval = getpeername(sock, (struct sockaddr *)&remote, &len); + if (rval < 0) return FALSE; - /* Find the address from list */ - for (i = 0; dest->h_addr_list[i]; i++) - if (!memcmp(dest->h_addr_list[i], &remote.sin_addr, - sizeof(struct in_addr))) - break; - if (!dest->h_addr_list[i]) + host_ip = inet_ntoa(remote.sin_addr); + if (!host_ip) return FALSE; - silc_free(*ip); - *ip = silc_calloc(strlen(host_ip) + 1, sizeof(char)); - memcpy(*ip, host_ip, strlen(host_ip)); - SILC_LOG_DEBUG(("Resolved IP address `%s'", *ip)); + *ip = silc_memdup(host_ip, strlen(host_ip)); + if (*ip == NULL) + return FALSE; +#endif + + /* Do reverse lookup if we want hostname too. */ + if (hostname) { + /* Get host by address */ + if (!silc_net_gethostbyaddr(*ip, host, sizeof(host))) + return FALSE; + + *hostname = silc_memdup(host, strlen(host)); + SILC_LOG_DEBUG(("Resolved hostname `%s'", *hostname)); + + /* Reverse */ + if (!silc_net_gethostbyname(*hostname, TRUE, host, sizeof(host))) + return FALSE; + + if (strcmp(*ip, host)) + return FALSE; + } + SILC_LOG_DEBUG(("Resolved IP address `%s'", *ip)); return TRUE; } /* Performs lookups for local name and IP address. This peforms reverse lookup as well to verify that the IP has FQDN. */ -bool silc_net_check_local_by_sock(int sock, char **hostname, char **ip) +SilcBool silc_net_check_local_by_sock(SilcSocket sock, char **hostname, + char **ip) { - struct sockaddr_in local; - struct hostent *dest; - char *host_ip = NULL; - char host_name[1024]; + char host[1024]; int rval, len; - int i; - *hostname = NULL; +#ifdef HAVE_IPV6 + struct sockaddr_storage local; + char s[NI_MAXHOST]; + + if (hostname) + *hostname = NULL; *ip = NULL; SILC_LOG_DEBUG(("Resolving local hostname and IP address")); memset(&local, 0, sizeof(local)); + memset(&s, 0, sizeof(s)); len = sizeof(local); rval = getsockname(sock, (struct sockaddr *)&local, &len); if (rval < 0) return FALSE; - host_ip = inet_ntoa(local.sin_addr); - if (!host_ip) + if (getnameinfo((struct sockaddr *)&local, len, s, sizeof(s), NULL, 0, + NI_NUMERICHOST)) return FALSE; - *ip = silc_calloc(strlen(host_ip) + 1, sizeof(char)); - memcpy(*ip, host_ip, strlen(host_ip)); - - /* Get host by address */ - dest = gethostbyaddr((char *)&local.sin_addr, - sizeof(struct in_addr), AF_INET); - if (!dest) + *ip = silc_memdup(s, strlen(s)); + if (*ip == NULL) return FALSE; +#else + struct sockaddr_in local; + char *host_ip; - /* Get same host by name to see that the local host really is - the who it says it is */ - memset(host_name, 0, sizeof(host_name)); - memcpy(host_name, dest->h_name, strlen(dest->h_name)); + if (hostname) + *hostname = NULL; + *ip = NULL; + + SILC_LOG_DEBUG(("Resolving local hostname and IP address")); - *hostname = silc_calloc(strlen(host_name) + 1, sizeof(char)); - memcpy(*hostname, host_name, strlen(host_name)); - SILC_LOG_DEBUG(("Resolved hostname `%s'", *hostname)); + memset(&local, 0, sizeof(local)); + len = sizeof(local); + rval = getsockname(sock, (struct sockaddr *)&local, &len); + if (rval < 0) + return FALSE; - dest = gethostbyname(host_name); - if (!dest) + host_ip = inet_ntoa(local.sin_addr); + if (!host_ip) return FALSE; - /* Find the address from list */ - for (i = 0; dest->h_addr_list[i]; i++) - if (!memcmp(dest->h_addr_list[i], &local.sin_addr, - sizeof(struct in_addr))) - break; - if (!dest->h_addr_list[i]) + *ip = silc_memdup(host_ip, strlen(host_ip)); + if (*ip == NULL) return FALSE; +#endif - silc_free(*ip); - *ip = silc_calloc(strlen(host_ip) + 1, sizeof(char)); - memcpy(*ip, host_ip, strlen(host_ip)); - SILC_LOG_DEBUG(("Resolved IP address `%s'", *ip)); + /* Do reverse lookup if we want hostname too. */ + if (hostname) { + /* Get host by address */ + if (!silc_net_gethostbyaddr(*ip, host, sizeof(host))) + return FALSE; + + *hostname = silc_memdup(host, strlen(host)); + SILC_LOG_DEBUG(("Resolved hostname `%s'", *hostname)); + /* Reverse */ + if (!silc_net_gethostbyname(*hostname, TRUE, host, sizeof(host))) + return FALSE; + + if (strcmp(*ip, host)) + return FALSE; + } + + SILC_LOG_DEBUG(("Resolved IP address `%s'", *ip)); return TRUE; } /* Return remote port by socket. */ -uint16 silc_net_get_remote_port(int sock) +SilcUInt16 silc_net_get_remote_port(SilcSocket sock) { +#ifdef HAVE_IPV6 + struct sockaddr_storage remote; + int len; + char s[NI_MAXSERV]; + + memset(&remote, 0, sizeof(remote)); + len = sizeof(remote); + if (getpeername(sock, (struct sockaddr *)&remote, &len) < 0) + return 0; + + if (getnameinfo((struct sockaddr *)&remote, len, NULL, 0, s, sizeof(s), + NI_NUMERICSERV)) + return 0; + + return atoi(s); +#else struct sockaddr_in remote; int len; @@ -396,12 +490,29 @@ uint16 silc_net_get_remote_port(int sock) return 0; return ntohs(remote.sin_port); +#endif } /* Return local port by socket. */ -uint16 silc_net_get_local_port(int sock) +SilcUInt16 silc_net_get_local_port(SilcSocket sock) { +#ifdef HAVE_IPV6 + struct sockaddr_storage local; + int len; + char s[NI_MAXSERV]; + + memset(&local, 0, sizeof(local)); + len = sizeof(local); + if (getsockname(sock, (struct sockaddr *)&local, &len) < 0) + return 0; + + if (getnameinfo((struct sockaddr *)&local, len, NULL, 0, s, sizeof(s), + NI_NUMERICSERV)) + return 0; + + return atoi(s); +#else struct sockaddr_in local; int len; @@ -411,7 +522,9 @@ uint16 silc_net_get_local_port(int sock) return 0; return ntohs(local.sin_port); +#endif } +#endif /* !SILC_SYMBIAN */ /* Return name of localhost. */ @@ -422,7 +535,7 @@ char *silc_net_localhost(void) if (gethostname(hostname, sizeof(hostname))) return NULL; - if (!silc_net_gethostbyname(hostname, ip_addr, sizeof(ip_addr))) + if (!silc_net_gethostbyname(hostname, TRUE, ip_addr, sizeof(ip_addr))) return strdup(hostname); silc_net_gethostbyaddr(ip_addr, hostname, sizeof(hostname)); @@ -438,7 +551,7 @@ char *silc_net_localip(void) if (gethostname(hostname, sizeof(hostname))) return NULL; - if (!silc_net_gethostbyname(hostname, ip_addr, sizeof(ip_addr))) + if (!silc_net_gethostbyname(hostname, TRUE, ip_addr, sizeof(ip_addr))) return NULL; return strdup(ip_addr);