1 files changed, 16 insertions, 166 deletions

diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 73af0e693..5146eb0d7 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -480,12 +480,7 @@ struct Socks5Request
   /**
    * Handle to GNS lookup, during #SOCKS5_RESOLVING phase.
    */
-  struct GNUNET_GNS_LookupRequest *gns_lookup;
-
-  /**
-   * Handle to Ego lookup, during #SOCKS5_RESOLVING phase.
-   */
-  struct GNUNET_IDENTITY_EgoLookup *el;
+  struct GNUNET_GNS_LookupWithTldRequest *gns_lookup;
 
   /**
    * Client socket read task
@@ -533,11 +528,6 @@ struct Socks5Request
   char *domain;
 
   /**
-   * the tld
-   */
-  const char *tld;
-
-  /**
    * DNS Legacy Host Name as given by GNS, NULL if not given.
    */
   char *leho;
@@ -775,7 +765,7 @@ cleanup_s5r (struct Socks5Request *s5r)
   if (NULL != s5r->wtask)
     GNUNET_SCHEDULER_cancel (s5r->wtask);
   if (NULL != s5r->gns_lookup)
-    GNUNET_GNS_lookup_cancel (s5r->gns_lookup);
+    GNUNET_GNS_lookup_with_tld_cancel (s5r->gns_lookup);
   if (NULL != s5r->sock)
   {
     if (SOCKS5_SOCKET_WITH_MHD <= s5r->state)
@@ -1098,18 +1088,16 @@ curl_check_hdr (void *buffer, size_t size, size_t nmemb, void *cls)
           if (0 == strcasecmp (cookie_domain, s5r->leho + delta_cdomain))
           {
             offset += sprintf (new_cookie_hdr + offset,
-                               " domain=%s.%s;",
-                               s5r->domain,
-                               s5r->tld);
+                               " domain=%s;",
+                               s5r->domain);
             continue;
           }
         }
         else if (0 == strcmp (cookie_domain, s5r->leho))
         {
           offset += sprintf (new_cookie_hdr + offset,
-                             " domain=%s.%s;",
-                             s5r->domain,
-                             s5r->tld);
+                             " domain=%s;",
+                             s5r->domain);
           continue;
         }
         GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -1138,12 +1126,11 @@ curl_check_hdr (void *buffer, size_t size, size_t nmemb, void *cls)
                       strlen (leho_host)))
     {
       GNUNET_asprintf (&new_location,
-                       "%s%s.%s%s",
+                       "%s%s%s",
                        (HTTPS_PORT != s5r->port)
                        ? "http://"
                        : "https://",
                        s5r->domain,
-                       s5r->tld,
                        hdr_val + strlen (leho_host));
       hdr_val = new_location;
     }
@@ -2389,9 +2376,8 @@ setup_data_transfer (struct Socks5Request *s5r)
   {
     case HTTPS_PORT:
       GNUNET_asprintf (&domain,
-                       "%s.%s",
-                       s5r->domain,
-                       s5r->tld);
+                       "%s",
+                       s5r->domain);
       hd = lookup_ssl_httpd (domain);
       if (NULL == hd)
       {
@@ -2556,6 +2542,7 @@ signal_socks_success (struct Socks5Request *s5r)
  */
 static void
 handle_gns_result (void *cls,
+                   int tld,
                    uint32_t rd_count,
                    const struct GNUNET_GNSRECORD_Data *rd)
 {
@@ -2691,82 +2678,6 @@ clear_from_s5r_rbuf (struct Socks5Request *s5r,
 
 
 /**
- * Method called to with the ego we are to use for the lookup,
- * when the ego is determined by a name.
- *
- * @param cls closure (NULL, unused)
- * @param ego ego handle, NULL if not found
- */
-static void
-identity_zone_cb (void *cls,
-                  const struct GNUNET_IDENTITY_Ego *ego)
-{
-  struct Socks5Request *s5r = cls;
-  struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
-
-  s5r->el = NULL;
-  if (NULL == ego)
-  {
-    signal_socks_failure (s5r,
-                          SOCKS5_STATUS_GENERAL_FAILURE);
-    return;
-
-  }
-  GNUNET_IDENTITY_ego_get_public_key (ego,
-                                      &pkey);
-  s5r->gns_lookup = GNUNET_GNS_lookup (gns_handle,
-                                       s5r->domain,
-                                       &pkey,
-                                       GNUNET_DNSPARSER_TYPE_A,
-                                       GNUNET_NO /* only cached */,
-                                       &handle_gns_result,
-                                       s5r);
-
-
-}
-
-/**
- * Obtain TLD from @a name
- *
- * @param name a name
- * @return the part of @a name after the last ".",
- *         or @a name if @a name does not contain a "."
- */
-static const char *
-get_tld (const char *name)
-{
-  const char *tld;
-
-  tld = strrchr (name,
-                 (unsigned char) '.');
-  if (NULL == tld)
-    tld = name;
-  else
-    tld++; /* skip the '.' */
-  return tld;
-}
-
-/**
- * Eat the TLD of the given @a name.
- *
- * @param name a name
- */
-static void
-eat_tld (char *name)
-{
-  char *tld;
-
-  GNUNET_assert (0 < strlen (name));
-  tld = strrchr (name,
-                 (unsigned char) '.');
-  if (NULL == tld)
-    strcpy (name,
-            GNUNET_GNS_MASTERZONE_STR);
-  else
-    *tld = '\0';
-}
-
-/**
  * Read data from incoming Socks5 connection
  *
  * @param cls the closure with the `struct Socks5Request`
@@ -2781,9 +2692,6 @@ do_s5r_read (void *cls)
   ssize_t rlen;
   size_t alen;
   const struct GNUNET_SCHEDULER_TaskContext *tc;
-  char *zonestr;
-  char *dot_tld;
-  struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
 
   s5r->rtask = NULL;
   tc = GNUNET_SCHEDULER_get_task_context ();
@@ -2934,70 +2842,12 @@ do_s5r_read (void *cls)
                         ntohs (*port));
             s5r->state = SOCKS5_RESOLVING;
             s5r->port = ntohs (*port);
-            /* TLD is zkey */
-            s5r->tld = get_tld (s5r->domain);
-            if (GNUNET_OK ==
-                GNUNET_CRYPTO_ecdsa_public_key_from_string (s5r->tld,
-                                                            strlen (s5r->tld),
-                                                            &pkey))
-            {
-              eat_tld (s5r->domain);
-              s5r->gns_lookup = GNUNET_GNS_lookup (gns_handle,
-                                                   s5r->domain,
-                                                   &pkey,
-                                                   GNUNET_DNSPARSER_TYPE_A,
-                                                   GNUNET_NO /* only cached */,
-                                                   &handle_gns_result,
-                                                   s5r);
-
-              break;
-            }
-            /* TLD is mapped in our config */
-            GNUNET_asprintf (&dot_tld,
-                             ".%s",
-                             s5r->tld);
-            if (GNUNET_OK ==
-                GNUNET_CONFIGURATION_get_value_string (cfg,
-                                                       "gns",
-                                                       dot_tld,
-                                                       &zonestr))
-            {
-              if (GNUNET_OK !=
-                  GNUNET_CRYPTO_ecdsa_public_key_from_string (zonestr,
-                                                              strlen (zonestr),
-                                                              &pkey))
-              {
-                GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                                           "gns",
-                                           dot_tld,
-                                           _("Expected a base32-encoded public zone key\n"));
-                GNUNET_free (zonestr);
-                GNUNET_free (dot_tld);
-                signal_socks_failure (s5r,
-                                      SOCKS5_STATUS_GENERAL_FAILURE);
-                return;
-
-              }
-              GNUNET_free (zonestr);
-              GNUNET_free (dot_tld);
-              eat_tld (s5r->domain);
-              s5r->gns_lookup = GNUNET_GNS_lookup (gns_handle,
-                                                   s5r->domain,
-                                                   &pkey,
-                                                   GNUNET_DNSPARSER_TYPE_A,
-                                                   GNUNET_NO /* only cached */,
-                                                   &handle_gns_result,
-                                                   s5r);
-              break;
-            }
-
-            /* TLD matches against ego */
-            eat_tld (s5r->domain);
-
-            s5r->el = GNUNET_IDENTITY_ego_lookup (cfg,
-                                                  s5r->tld,
-                                                  &identity_zone_cb,
-                                                  s5r);
+            s5r->gns_lookup = GNUNET_GNS_lookup_with_tld (gns_handle,
+                                                          s5r->domain,
+                                                          GNUNET_DNSPARSER_TYPE_A,
+                                                          GNUNET_NO /* only cached */,
+                                                          &handle_gns_result,
+                                                          s5r);
             break;
           }
         default: