return silc_net_is_ip6(addr);
}
+/* Internal context for async resolving */
+typedef struct {
+ SilcNetResolveCallback completion;
+ void *context;
+ bool prefer_ipv6;
+ 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, 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);
+ 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)
+bool silc_net_gethostbyname(const char *name, bool 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
return TRUE;
}
+/* Resolves IP address for hostname async. */
+
+void silc_net_gethostbyname_async(const char *name,
+ bool prefer_ipv6,
+ SilcSchedule schedule,
+ SilcNetResolveCallback completion,
+ void *context)
+{
+ SilcNetResolveContext r = silc_calloc(1, sizeof(*r));
+
+ r->completion = completion;
+ r->context = context;
+ r->prefer_ipv6 = prefer_ipv6;
+ 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)
+bool silc_net_gethostbyaddr(const char *addr, char *name, SilcUInt32 name_len)
{
#ifdef HAVE_IPV6
struct addrinfo req, *ai;
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;
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
lookup as well to verify that the IP has FQDN. */
/* Return remote port by socket. */
-uint16 silc_net_get_remote_port(int sock)
+SilcUInt16 silc_net_get_remote_port(int 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;
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(int 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;
return 0;
return ntohs(local.sin_port);
+#endif
}
/* Return name of localhost. */
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));
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);
projects / silc.git / blobdiff