Changeset 699

Timestamp:

15/09/08 13:53:50 (4 months ago)

Author:

smoku

Message:

Merged IDNA domains resolution support patch by Norman Rasmussen

Files:

• trunk/s2s/out.c (modified) (3 diffs)

trunk/s2s/out.c

@@ -20 +20 @@
 
 #include "s2s.h"
+
+#include <idna.h>
 
 /*
@@ -1027 +1029 @@
         xhash_free(query->hosts);
         query->hosts = NULL;
-        out_resolve(query->s2s, query->name, query->results, query->expiry);
+        char *domain;
+        if (idna_to_unicode_8z8z(query->name, &domain, 0) != IDNA_SUCCESS)
+        {
+            log_write(query->s2s->log, LOG_ERR, "idna dns decode for %s failed", query->name);
+            /* TODO: Is it better to shortcut resolution failure here? */
+            domain = strdup(query->name);
+        }
+        out_resolve(query->s2s, domain, query->results, query->expiry);
+        free(domain);
         free(query->name);
         free(query);
@@ -1037 +1047 @@
 
     query->s2s = s2s;
-    query->name = strdup(dns->name);
+    if (idna_to_ascii_8z(dns->name, &query->name, 0) != IDNA_SUCCESS)
+    {
+        log_write(s2s->log, LOG_ERR, "idna dns encode for %s failed", dns->name);
+        /* TODO: Is it better to shortcut resolution failure here? */
+        query->name = strdup(dns->name);
+    }
     query->srv_i = -1;
     query->hosts = xhash_new(71);