Changeset 295 for trunk/src/sh_unix.c

Timestamp:

Oct 31, 2010, 10:36:04 AM (11 years ago)

Author:

katerina

Message:

Support for IPv6 (ticket #222).

File:

• trunk/src/sh_unix.c (modified) (8 diffs)

trunk/src/sh_unix.c

@@ -98 +98 @@
 #include "sh_hash.h"
 #include "sh_tools.h"
+#include "sh_ipvx.h"
 #include "sh_tiger.h"
 #include "sh_prelink.h"
@@ -1605 +1606 @@
 {
   struct utsname   buf;
-  struct hostent * he1;
   int              i;
   int              ddot;
@@ -1611 +1611 @@
   char           * p;
   char             hostname[256];
+  char             numeric[SH_IP_BUF];
+  char           * canonical;
 
 
@@ -1656 +1658 @@
     }
 
-  SH_MUTEX_LOCK(mutex_resolv);
-  he1 = sh_gethostbyname(hostname);
-
-  if (he1 != NULL)
-    {
-      sl_strlcpy (sh.host.name, sh_unix_h_name(he1), SH_PATHBUF);
-      sh_tolower (sh.host.name);
-    }
-  SH_MUTEX_UNLOCK(mutex_resolv);
-
-  if (he1 == NULL)
-    {
-      dlog(1, FIL__, __LINE__, 
-           _("According to uname, your nodename is %s, but your resolver\nlibrary cannot resolve this nodename to a FQDN. For more information, see the entry about self-resolving under 'Most frequently' in the FAQ that you will find in the docs/ subdirectory.\n"),
-           hostname);
+  canonical = sh_ipvx_canonical(hostname, numeric, sizeof(numeric));
+
+  if (canonical == NULL)
+    {
       sl_strlcpy (sh.host.name, hostname,    SH_PATHBUF);
       sh_tolower (sh.host.name);
     }
-  
+  else
+    {
+      sl_strlcpy (sh.host.name, canonical,   SH_PATHBUF);
+      SH_FREE(canonical);
+    }
 
   /* check whether it looks like a FQDN
@@ -1683 +1678 @@
     if (sh.host.name[i] == '.') ++ddot; 
 
-  if (ddot == 0 && he1 != NULL)
+  if (ddot == 0)
     { 
       dlog(1, FIL__, __LINE__, 
            _("According to uname, your nodename is %s, but your resolver\nlibrary cannot resolve this nodename to a FQDN.\nRather, it resolves this to %s.\nFor more information, see the entry about self-resolving under\n'Most frequently' in the FAQ that you will find in the docs/ subdirectory.\n"),
            hostname, sh.host.name);
-      sl_strlcpy (sh.host.name, 
-                  inet_ntoa (*(struct in_addr *) he1->h_addr), 
-                  SH_PATHBUF);
+      sl_strlcpy (sh.host.name, numeric, SH_PATHBUF);
       SL_RET0(_("sh_unix_localhost"));
     } 
 
-  if (is_numeric(sh.host.name)) 
+  if (sh_ipvx_is_numeric(sh.host.name)) 
     {
       dlog(1, FIL__, __LINE__, 
@@ -1717 +1710 @@
   struct utsname   buf;
 #endif
-  struct hostent * he1;
   int              i;
   int              ddot;
   int              len;
   char             hostname[1024];
-
+  char             numeric[SH_IP_BUF];
+  char           * canonical;
 
   SL_ENTER(_("sh_unix_localhost"));
@@ -1737 +1730 @@
   hostname[1023] = '\0';
 
-  SH_MUTEX_LOCK(mutex_resolv);
-  he1 = sh_gethostbyname(hostname);
-
-  if (he1 != NULL)
-    {
-      sl_strlcpy (sh.host.name, sh_unix_h_name(he1), SH_PATHBUF);
+  canonical = sh_ipvx_canonical(hostname, numeric, sizeof(numeric));
+
+  if (canonical == NULL)
+    {
+      sl_strlcpy (sh.host.name, hostname, SH_PATHBUF);
       sh_tolower (sh.host.name);
     }
-  SH_MUTEX_UNLOCK(mutex_resolv);
-
-  if (he1 == NULL)
-    {
-      dlog(1, FIL__, __LINE__, 
-           _("According to gethostname, your nodename is %s, but your resolver\nlibrary cannot resolve this nodename to a FQDN.\nFor more information, see the entry about self-resolving under\n'Most frequently' in the FAQ that you will find in the docs/ subdirectory.\n"),
-           hostname);
-      sl_strlcpy (sh.host.name, _("localhost"), SH_PATHBUF);
-      SL_RET0(_("sh_unix_localhost"));
+  else
+    {
+      sl_strlcpy (sh.host.name, canonical,   SH_PATHBUF);
+      SH_FREE(canonical);
     }
 
@@ -1767 +1754 @@
            _("According to uname, your nodename is %s, but your resolver\nlibrary cannot resolve this nodename to a FQDN.\nRather, it resolves this to %s.\nFor more information, see the entry about self-resolving under\n'Most frequently' in the FAQ that you will find in the docs/ subdirectory.\n"),
            hostname, sh.host.name);
-      sl_strlcpy (sh.host.name, 
-                  inet_ntoa (*(struct in_addr *) he1->h_addr), 
-                  SH_PATHBUF);
+      sl_strlcpy (sh.host.name, numeric, SH_PATHBUF);
       SL_RET0(_("sh_unix_localhost"));
     }
 
-  if (is_numeric(sh.host.name)) 
+  if (sh_ipvx_is_numeric(sh.host.name)) 
     {
       dlog(1, FIL__, __LINE__,