X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcutil%2Fsilcnet.c;h=d083656eba63e379357d64acdc60848ec9aad701;hb=c257b555225193e54d85daf541d29578b3c93882;hp=60c5c77e3ccaf0b2a3e230e8d680668a554136e6;hpb=487b9263317ab859b530cdda115984a970ca04eb;p=silc.git

diff --git a/lib/silcutil/silcnet.c b/lib/silcutil/silcnet.c
index 60c5c77e..d083656e 100644
--- a/lib/silcutil/silcnet.c
+++ b/lib/silcutil/silcnet.c
@@ -91,6 +91,7 @@ bool silc_net_is_ip(const char *addr)
 typedef struct {
   SilcNetResolveCallback completion;
   void *context;
+  bool prefer_ipv6;
   SilcSchedule schedule;
   char *input;
   char *result;
@@ -114,14 +115,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_schedule_task_add(schedule, 0, silc_net_resolve_completion, r, 0, 1,
 			 SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
-  silc_schedule_wakeup(r->schedule);
+  silc_schedule_wakeup(schedule);
   return NULL;
 }
 
@@ -130,45 +132,56 @@ 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_schedule_task_add(schedule, 0, silc_net_resolve_completion, r, 0, 1,
 			 SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
-  silc_schedule_wakeup(r->schedule);
+  silc_schedule_wakeup(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 (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;
+  if (getnameinfo(tmp->ai_addr, tmp->ai_addrlen, address,
+		  address_len, NULL, 0, NI_NUMERICHOST)) {
+    freeaddrinfo(ai);
+    return FALSE;
   }
 
   freeaddrinfo(ai);
@@ -197,6 +210,7 @@ bool silc_net_gethostbyname(const char *name, char *address,
 /* Resolves IP address for hostname async. */
 
 void silc_net_gethostbyname_async(const char *name, 
+				  bool prefer_ipv6,
 				  SilcSchedule schedule,
 				  SilcNetResolveCallback completion,
 				  void *context)
@@ -205,6 +219,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);
 
@@ -213,7 +228,7 @@ 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)
+bool silc_net_gethostbyaddr(const char *addr, char *name, SilcUInt32 name_len)
 {
 #ifdef HAVE_IPV6
   struct addrinfo req, *ai;
@@ -224,16 +239,19 @@ bool silc_net_gethostbyaddr(const char *addr, char *name, uint32 name_len)
   
   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))
@@ -267,63 +285,76 @@ void silc_net_gethostbyaddr_async(const char *addr,
 
 bool silc_net_check_host_by_sock(int 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"));
+
+  memset(&remote, 0, sizeof(remote));
+  len = sizeof(remote);
+  rval = getpeername(sock, (struct sockaddr *)&remote, &len);
+  if (rval < 0)
+    return FALSE;
 
-  dest = gethostbyname(host_name);
-  if (!dest)
+  host_ip = inet_ntoa(remote.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], &remote.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;
 }
 
@@ -332,70 +363,99 @@ bool silc_net_check_host_by_sock(int sock, char **hostname, char **ip)
 
 bool silc_net_check_local_by_sock(int 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;
 
-  *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 local hostname and IP address"));
 
-  dest = gethostbyname(host_name);
-  if (!dest)
+  memset(&local, 0, sizeof(local));
+  len = sizeof(local);
+  rval = getsockname(sock, (struct sockaddr *)&local, &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], &local.sin_addr, 
-	       sizeof(struct in_addr)))
-      break;
-  if (!dest->h_addr_list[i])
+  host_ip = inet_ntoa(local.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;
 }
 
 /* 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;
 
@@ -405,12 +465,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(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;
 
@@ -420,6 +497,7 @@ uint16 silc_net_get_local_port(int sock)
     return 0;
 
   return ntohs(local.sin_port);
+#endif
 }
 
 /* Return name of localhost. */
@@ -431,7 +509,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));
@@ -447,7 +525,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);