Changeset 295 for trunk/src/sh_mail.c

Timestamp:

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

Author:

katerina

Message:

Support for IPv6 (ticket #222).

File:

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

trunk/src/sh_mail.c

@@ -62 +62 @@
 #include "sh_mail_int.h"
 #include "sh_nmail.h"
+#include "sh_ipvx.h"
 
 #undef  FIL__
@@ -1113 +1114 @@
   (void) fflush(connFile);
 
-  if (0 != is_numeric(sh.host.name))
+  if (0 != sh_ipvx_is_numeric(sh.host.name))
     {
       sl_snprintf(error_msg, sizeof(error_msg), "HELO [%s]", 
@@ -1125 +1126 @@
   report_smtp(error_msg);
 
-  if (0 != is_numeric(sh.host.name))
+  if (0 != sh_ipvx_is_numeric(sh.host.name))
     fprintf(connFile, _("HELO [%s]%c%c"), sh.host.name, 13, 10);
   else
@@ -1150 +1151 @@
     {
       (void) sl_strlcat (this_address, "@", 256);
-      if (0 != is_numeric(sh.host.name))
+      if (0 != sh_ipvx_is_numeric(sh.host.name))
         (void) sl_strlcat (this_address, _("example.com"), 256);
       else
@@ -1866 +1867 @@
   mx     * result;
   dnsrep * retval;
+  char   * address = NULL;
   char     errmsg[128];
-  size_t   len;
 
   SL_ENTER(_("return_mx"));
@@ -1884 +1885 @@
   else
     {
+      char numeric[SH_IP_BUF];
+
       if (domain != NULL)
         {
@@ -1904 +1907 @@
         }
 
-      SH_MUTEX_LOCK(mutex_resolv);
-
+      retval = NULL;
       host   = NULL;
-      retval = NULL;
 
       if (domain != NULL)
-        host = /*@-unrecog@*/sh_gethostbyname (domain)/*@+unrecog@*/;
-
-      if (host)
+        address = sh_ipvx_canonical(domain, numeric, sizeof(numeric));
+
+      if (address)
         {
           result       = SH_ALLOC (sizeof (mx));
@@ -1919 +1920 @@
           retval->count = 1;
           result->pref  = 0;
-          /*@-type@*/
-          len = strlen (host->h_name) + 1;
-          result->address = SH_ALLOC (len);
-          sl_strlcpy (result->address, host->h_name, len);
-          /*@+type@*/
-        }
-      SH_MUTEX_UNLOCK(mutex_resolv);
-
-      if (!host)
+
+          result->address = address;
+        }
+      else
         {
 #ifdef FIL__