-introduce #define for + in GADS

[oweals/gnunet.git] / src / gns / gnunet-dns2gns.c

diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 918cc9c6ae3a99c326631004f083121c78e5ef70..5329e491748b53d75f5e1844b30c408350ab9ab8 100644 (file)
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -120,12 +120,12 @@ static GNUNET_SCHEDULER_TaskIdentifier t4;
 static GNUNET_SCHEDULER_TaskIdentifier t6;
 
 /**
- * DNS suffix
+ * DNS suffix, suffix of this gateway in DNS; defaults to '.zkey.eu'
  */
 static char *dns_suffix;
 
 /**
- * FCFS suffix
+ * FCFS suffix, suffix of FCFS-authority in DNS; defaults to 'fcfs.zkey.eu'.
  */
 static char *fcfs_suffix;
 
@@ -217,9 +217,12 @@ do_timeout (void *cls,
     GNUNET_DNSPARSER_free_packet (request->packet);
   if (NULL != request->lookup)
     GNUNET_GNS_cancel_lookup_request (request->lookup);
+  if (NULL != request->dns_lookup)
+    GNUNET_DNSSTUB_resolve_cancel (request->dns_lookup);
   GNUNET_free (request);
 }
 
+
 /**
  * Iterator called on obtained result for a DNS
  * lookup
@@ -236,10 +239,12 @@ dns_result_processor (void *cls,
                   size_t r)
 {
   struct Request *request = cls;
+
   request->packet = GNUNET_DNSPARSER_parse ((char*)dns, r);
   send_response (request);
 }
 
+
 /**
  * Iterator called on obtained result for a GNS
  * lookup
@@ -342,9 +347,12 @@ handle_request (struct GNUNET_NETWORK_Handle *lsock,
   struct Request *request;
   struct GNUNET_DNSPARSER_Packet *packet;
   char *name;
+  char *dot;
+  char *nname;
   size_t name_len;
   enum GNUNET_GNS_RecordType type;
   int use_gns;
+  struct GNUNET_CRYPTO_ShortHashCode zone;
 
   packet = GNUNET_DNSPARSER_parse (udp_msg, udp_msg_size);
   if (NULL == packet)
@@ -355,7 +363,8 @@ handle_request (struct GNUNET_NETWORK_Handle *lsock,
       return;
     }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Received request with flags %u, #answers %d, #auth %d, #additional %d\n",
+             "Received request for `%s' with flags %u, #answers %d, #auth %d, #additional %d\n",
+             packet->queries[0].name,
              (unsigned int) packet->flags.query_or_response,
              (int) packet->num_answers,
              (int) packet->num_authority_records,
@@ -394,21 +403,34 @@ handle_request (struct GNUNET_NETWORK_Handle *lsock,
        (0 == strcasecmp (dns_suffix,
                         &name[name_len - strlen (dns_suffix)])) )
     {
-      if ( (name_len >= strlen (fcfs_suffix)) &&
-          (0 == strcasecmp (fcfs_suffix,
-                            &name[name_len - strlen (fcfs_suffix)])) )
+      /* Test if '.zkey' was requested */
+      name[name_len - strlen (dns_suffix)] = '\0';
+      dot = strrchr (name, (int) '.');
+      if ( (NULL != dot) &&
+          (GNUNET_OK ==
+           GNUNET_CRYPTO_short_hash_from_string (dot + 1, &zone)) )
       {
-        name[name_len - strlen (fcfs_suffix) + 1] = '\0';
-        strcat (name, GNUNET_GNS_TLD);
+       /* valid '.zkey' name */
+       GNUNET_asprintf (&nname, 
+                        "%s.%s", 
+                        name, 
+                        GNUNET_GNS_TLD_ZKEY);
+       GNUNET_free (name);
+       name = nname;
       }
       else
-      {
-        name[name_len - strlen (dns_suffix) + 1] = '\0';
-        strcat (name, GNUNET_GNS_TLD_ZKEY);
+      {        
+       /* try '.gads' name */
+       GNUNET_asprintf (&nname, 
+                        "%s.%s", 
+                        name, 
+                        GNUNET_GNS_TLD);
+       GNUNET_free (name);
+       name = nname;
       }
       name_len = strlen (name);
     }
-  if ( (name_len > strlen ((GNUNET_GNS_TLD) + 1)) &&
+  if ( (name_len >= strlen ((GNUNET_GNS_TLD))) &&
        (0 == strcasecmp (GNUNET_GNS_TLD,
                          &name[name_len - strlen (GNUNET_GNS_TLD)])) )
     use_gns = GNUNET_YES;
@@ -433,20 +455,15 @@ handle_request (struct GNUNET_NETWORK_Handle *lsock,
     }
   else
     {
-      /* FIXME: do traditional *DNS* lookup; note that
-        gnunet-service-dns already has code to do this;
-        factor into library to share! Why not use GNUNET_RESOLVER here?*/
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Calling DNS at %s\n", dns_ip);
       GNUNET_DNSPARSER_free_packet (request->packet);
+      request->packet = NULL;
       request->dns_lookup = GNUNET_DNSSTUB_resolve2 (dns_stub,
                                                      udp_msg,
                                                      udp_msg_size,
                                                      &dns_result_processor,
                                                      request);
-
-
-
     }
   GNUNET_free (name);
 }
@@ -652,13 +669,13 @@ main (int argc,
       char *const *argv)
 {
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
-    {'d', "dns", NULL,
-      gettext_noop ("IP of recursive dns resolver to use (required)"), 1,
+    {'d', "dns", "IP",
+      gettext_noop ("IP of recursive DNS resolver to use (required)"), 1,
       &GNUNET_GETOPT_set_string, &dns_ip},
-    {'s', "suffix", NULL,
+    {'s', "suffix", "SUFFIX",
       gettext_noop ("Authoritative DNS suffix to use (optional); default: zkey.eu"), 1,
       &GNUNET_GETOPT_set_string, &dns_suffix},
-    {'f', "fcfs", NULL,
+    {'f', "fcfs", "NAME",
       gettext_noop ("Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"), 1,
       &GNUNET_GETOPT_set_string, &fcfs_suffix},
     GNUNET_GETOPT_OPTION_END
@@ -675,7 +692,7 @@ main (int argc,
                            _("GNUnet DNS-to-GNS proxy (a DNS server)"), 
                           options,
                            &run, NULL)) ? 0 : 1;
-
+  GNUNET_free ((void*) argv);
   return ret;
 }