Merge branch 'dev/sebi/sbox'

6 files changed, 325 insertions, 26 deletions

diff --git a/contrib/gana b/contrib/gana
-Subproject f5577937ddfe880a49c8bcfce6e531959d62fdd
+Subproject cbc4ad2394fc4bc8adaad4897759dfc5b345c3e
diff --git a/src/cli/gns/test_gns_box_sbox.sh b/src/cli/gns/test_gns_box_sbox.sh
new file mode 100755
index 000000000..1f226dce9
--- /dev/null
+++ b/src/cli/gns/test_gns_box_sbox.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+# This file is in the public domain.
+trap "gnunet-arm -e -c test_gns_lookup.conf" INT
+
+LOCATION=$(which gnunet-config)
+if [ -z $LOCATION ]
+then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version 1> /dev/null
+if test $? != 0
+then
+        echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
+        exit 77
+fi
+
+rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
+TEST_B="TXT_record_in_BOX"
+TEST_S="TXT_record_in_SBOX"
+TEST_A="10.1.11.10"
+MY_EGO="myego"
+LABEL="testsbox"
+SERVICE="443"
+SERVICE_TEXT="_443"
+PROTOCOL="6"
+PROTOCOL_TEXT="_tcp"
+gnunet-arm -s -c test_gns_lookup.conf
+gnunet-identity -C $MY_EGO -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t SBOX -V "$SERVICE_TEXT.$PROTOCOL_TEXT 16 $TEST_S" -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t BOX -V "$PROTOCOL $SERVICE 16 $TEST_B" -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t SBOX -V "$SERVICE_TEXT.$PROTOCOL_TEXT 1 $TEST_A" -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t BOX -V "$PROTOCOL $SERVICE 1 $TEST_A" -e never -c test_gns_lookup.conf
+sleep 0.5
+RES_B_S=`$DO_TIMEOUT gnunet-gns --raw -u $SERVICE_TEXT.$PROTOCOL_TEXT.$LABEL.$MY_EGO -t TXT -c test_gns_lookup.conf`
+RES_A=`$DO_TIMEOUT gnunet-gns --raw -u $SERVICE_TEXT.$PROTOCOL_TEXT.$LABEL.$MY_EGO -t A -c test_gns_lookup.conf`
+gnunet-namestore -z $MY_EGO -d -n $LABEL -t SBOX -V "$SERVICE_TEXT.$PROTOCOL_TEXT 16 $TEST_S" -e never -c test_gns_lookup.conf
+gnunet-namestore -z $MY_EGO -d -n $LABEL -t BOX -V "$PROTOCOL $SERVICE 16 $TEST_B" -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -d -n $LABEL -t SBOX -V "$SERVICE_TEXT.$PROTOCOL_TEXT 1 $TEST_A" -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -d -n $LABEL -t BOX -V "$PROTOCOL $SERVICE 1 $TEST_A" -e never -c test_gns_lookup.conf
+gnunet-identity -D $MY_EGO -c test_gns_lookup.conf
+gnunet-arm -e -c test_gns_lookup.conf
+rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
+
+{ read RES_B; read RES_S;} <<< "${RES_B_S}"
+if [ "$RES_B" = "$RES_S" ]
+then
+  echo "Failed to resolve to diffrent TXT records, got '$RES_B' and '$RES_S'."
+  exit 1
+fi
+
+{ read RES_S_A; read RES_B_A;} <<< "${RES_A}"
+if [ "$RES_S_A" = "$TEST_A" ] && [ "$RES_B_A" = "$TEST_A" ]
+then
+  exit 0
+else
+  echo "Failed to resolve to proper A '$TEST_A', got '$RES_S_A' and '$RES_S_B'."
+  exit 1
+fi
diff --git a/src/cli/gns/test_gns_sbox.sh b/src/cli/gns/test_gns_sbox.sh
new file mode 100755
index 000000000..54e51fa2c
--- /dev/null
+++ b/src/cli/gns/test_gns_sbox.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+# This file is in the public domain.
+trap "gnunet-arm -e -c test_gns_lookup.conf" INT
+
+LOCATION=$(which gnunet-config)
+if [ -z $LOCATION ]
+then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version 1> /dev/null
+if test $? != 0
+then
+        echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
+        exit 77
+fi
+
+rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
+TEST_A="139.134.54.9"
+MY_EGO="myego"
+LABEL="testsbox"
+HASH="c93f1e400f26708f98cb19d936620da35eec8f72e57f9eec01c1afd6"
+PROTOCOL_TEXT="_smimecert"
+gnunet-arm -s -c test_gns_lookup.conf
+gnunet-identity -C $MY_EGO -c test_gns_lookup.conf
+gnunet-namestore -p -z $MY_EGO -a -n $LABEL -t SBOX -V "$HASH.$PROTOCOL_TEXT 1 $TEST_A" -e never -c test_gns_lookup.conf
+sleep 0.5
+RES_A=`$DO_TIMEOUT gnunet-gns --raw -u $HASH.$PROTOCOL_TEXT.$LABEL.$MY_EGO -t A -c test_gns_lookup.conf`
+gnunet-namestore -z $MY_EGO -d -n $LABEL -t SBOX -V "$HASH.$PROTOCOL_TEXT 1 $TEST_A" -e never -c test_gns_lookup.conf
+gnunet-identity -D $MY_EGO -c test_gns_lookup.conf
+gnunet-arm -e -c test_gns_lookup.conf
+rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
+
+if [ "$RES_A" = "$TEST_A" ]
+then
+  exit 0
+else
+  echo "Failed to resolve to proper A, got '$RES_A'."
+  exit 1
+fi
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h
index 813409340..b4e45727b 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -331,6 +331,31 @@ struct GNUNET_GNSRECORD_BoxRecord
   /* followed by the 'original' record */
 };
 
+
+/**
+ * Record type used to box up SMIMEA records.  For example, a
+ * SMIMEA record for "c93f1e400f26708f98cb19d936620da35eec8f72e57
+ * f9eec01c1afd6._smimecert.foo.gnu" will be stored under
+ * "foo.gnu" as a SBOX record with the local-path of the associated
+ * e-mails hash turnicated to 28 octets encoded as hex and protocol _smimecert
+ * and record_type "SMIMEA".  When a BOX record is received, GNS
+ * unboxes it if the name contained "hash._PROTO", otherwise GNS
+ * leaves it untouched.  This is done to ensure that SMIMEA
+ * records do not require a separate network request, thus making SMIMEA
+ * records inseparable from the "main" A/AAAA/VPN/etc. records.
+ */
+struct GNUNET_GNSRECORD_SBoxRecord
+{
+  /**
+   * GNS record type of the boxed record. In NBO.
+   */
+  uint32_t record_type GNUNET_PACKED;
+
+  /* followed by the zero terminated hostname prefix */
+  /* followed by the 'original' record */
+};
+
+
 /**
  * Record type used internally to keep track of reverse mappings into a
  * namespace.
@@ -836,9 +861,9 @@ GNUNET_GNSRECORD_label_check (const char*label, char **emsg);
 /**
  * Maximum length of a revocation
  */
-#define GNUNET_MAX_POW_SIZE sizeof(struct GNUNET_GNSRECORD_PowP) +\
-                                         sizeof(struct GNUNET_CRYPTO_PublicKey) +\
-                                         1024 //FIXME max sig_len
+#define GNUNET_MAX_POW_SIZE sizeof(struct GNUNET_GNSRECORD_PowP)  \
+  + sizeof(struct GNUNET_CRYPTO_PublicKey)  \
+  + 1024                                      // FIXME max sig_len
 
 /**
  * The proof-of-work narrowing factor.
@@ -910,8 +935,8 @@ struct GNUNET_GNSRECORD_PowCalculationHandle;
  */
 enum GNUNET_GenericReturnValue
 GNUNET_GNSRECORD_check_pow (const struct GNUNET_GNSRECORD_PowP *pow,
-                             unsigned int matching_bits,
-                             struct GNUNET_TIME_Relative epoch_duration);
+                            unsigned int matching_bits,
+                            struct GNUNET_TIME_Relative epoch_duration);
 
 
 /**
@@ -922,7 +947,7 @@ GNUNET_GNSRECORD_check_pow (const struct GNUNET_GNSRECORD_PowP *pow,
  */
 void
 GNUNET_GNSRECORD_pow_init (const struct GNUNET_CRYPTO_PrivateKey *key,
-                            struct GNUNET_GNSRECORD_PowP *pow);
+                           struct GNUNET_GNSRECORD_PowP *pow);
 
 
 /**
@@ -936,8 +961,8 @@ GNUNET_GNSRECORD_pow_init (const struct GNUNET_CRYPTO_PrivateKey *key,
  */
 struct GNUNET_GNSRECORD_PowCalculationHandle*
 GNUNET_GNSRECORD_pow_start (struct GNUNET_GNSRECORD_PowP *pow,
-                             int epochs,
-                             unsigned int difficulty);
+                            int epochs,
+                            unsigned int difficulty);
 
 
 /**
diff --git a/src/plugin/gns/plugin_gnsrecord_gns.c b/src/plugin/gns/plugin_gnsrecord_gns.c
index 65587172d..2803d32a4 100644
--- a/src/plugin/gns/plugin_gnsrecord_gns.c
+++ b/src/plugin/gns/plugin_gnsrecord_gns.c
@@ -132,6 +132,36 @@ gns_value_to_string (void *cls,
       GNUNET_free (ival);
       return box_str;
     }
+  case GNUNET_GNSRECORD_TYPE_SBOX: {
+      struct GNUNET_GNSRECORD_SBoxRecord box;
+      uint32_t rt;
+      char *box_str;
+      char *ival;
+      char *prefix;
+
+      cdata = data;
+      if (data_size < sizeof(struct GNUNET_GNSRECORD_SBoxRecord))
+        return NULL; /* malformed */
+      GNUNET_memcpy (&box, data, sizeof(box));
+      rt = ntohl (box.record_type);
+
+      prefix = GNUNET_strdup (&cdata[sizeof(box)]);
+      ival = GNUNET_GNSRECORD_value_to_string (rt, &cdata[sizeof(box)
+                                                          + strlen (prefix)
+                                                          + 1],
+                                               data_size - sizeof(box)
+                                               - strlen (prefix) - 1);
+      if (NULL == ival)
+        return NULL; /* malformed */
+      GNUNET_asprintf (&box_str,
+                       "%s %u %s",
+                       prefix,
+                       (unsigned int) rt,
+                       ival);
+      GNUNET_free (prefix);
+      GNUNET_free (ival);
+      return box_str;
+    }
   case GNUNET_GNSRECORD_TYPE_TOMBSTONE: {
       return GNUNET_strdup (_ (
                               "This is a memento of an older block for internal maintenance."));
@@ -302,6 +332,76 @@ gns_string_to_value (void *cls,
       GNUNET_free (bval);
       return GNUNET_OK;
     }
+  case GNUNET_GNSRECORD_TYPE_SBOX: {
+      struct GNUNET_GNSRECORD_SBoxRecord *box;
+      size_t rest;
+      char *prefix;
+      unsigned int protocol;
+      unsigned int record_type;
+      void *bval;
+      size_t bval_size;
+      prefix = GNUNET_malloc (strlen (s)); // TODO The allocated memory is bigger than needed
+      size_t prefix_size;
+      if (2 != sscanf (s, "%s %u ", prefix, &record_type))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _ ("Unable to parse SBOX record string `%s'\n"),
+                    s);
+        return GNUNET_SYSERR;
+      }
+      if (prefix == NULL)
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _ (
+                      "Unable to parse SBOX record string `%s', no prefix found\n"),
+                    s);
+        return GNUNET_SYSERR;
+      }
+      char *last_underscore = strrchr (prefix, (int) '_');
+      if (last_underscore == NULL)
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _ (
+                      "Unable to parse SBOX record string `%s', no underscore fund\n"),
+                    prefix);
+        return GNUNET_SYSERR;
+      }
+      char *dot_in_last_prefix = strchr (last_underscore, '.');
+      if (dot_in_last_prefix != NULL)
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _ (
+                      "Unable to parse SBOX record string `%s', the last label does not have an underscore\n"),
+                    prefix);
+        return GNUNET_SYSERR;
+      }
+      if (prefix < last_underscore && last_underscore[-1] != '.')
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _ (
+                      "Unable to parse SBOX record string `%s', the last label does not start with an underscore\n"),
+                    prefix);
+        return GNUNET_SYSERR;
+      }
+      rest = snprintf (NULL, 0, "%s %u ", prefix, record_type);
+      if (GNUNET_OK != GNUNET_GNSRECORD_string_to_value (record_type,
+                                                         &s[rest],
+                                                         &bval,
+                                                         &bval_size))
+        return GNUNET_SYSERR;
+      prefix_size = strlen (prefix) + 1; // with NULL terminator
+      *data_size = sizeof(struct GNUNET_GNSRECORD_SBoxRecord) + prefix_size
+                   + bval_size;
+      void *p = *data = box = GNUNET_malloc (*data_size);
+      box->record_type = htonl (record_type);
+      p += sizeof(struct GNUNET_GNSRECORD_SBoxRecord);
+      GNUNET_memcpy (p, prefix, prefix_size);
+      p += prefix_size;
+      GNUNET_memcpy (p, bval, bval_size);
+      GNUNET_free (bval);
+      GNUNET_free (prefix);
+      return GNUNET_OK;
+    }
   case GNUNET_GNSRECORD_TYPE_TOMBSTONE: {
       *data_size = 0;
       *data = NULL;
@@ -330,6 +430,7 @@ static struct
   { "VPN", GNUNET_GNSRECORD_TYPE_VPN },
   { "GNS2DNS", GNUNET_GNSRECORD_TYPE_GNS2DNS },
   { "BOX", GNUNET_GNSRECORD_TYPE_BOX },
+  { "SBOX", GNUNET_GNSRECORD_TYPE_SBOX },
   { "REDIRECT", GNUNET_GNSRECORD_TYPE_REDIRECT },
   /* Tombstones should never be added manually
                     * so this makes sense, kind of */
diff --git a/src/service/gns/gnunet-service-gns_resolver.c b/src/service/gns/gnunet-service-gns_resolver.c
index 445ae3346..906bb6aba 100644
--- a/src/service/gns/gnunet-service-gns_resolver.c
+++ b/src/service/gns/gnunet-service-gns_resolver.c
@@ -369,6 +369,12 @@ struct GNS_ResolverHandle
   int service;
 
   /**
+   * For SMIMEA,OPENPGPKEY... records. NULL if no _ prefix was given.
+   */
+  char *prefix;
+
+
+  /**
    * Desired type for the resolution.
    */
   int record_type;
@@ -620,15 +626,16 @@ resolver_getservbyname (const char *name, const char *proto)
  * Get the next, rightmost label from the name that we are trying to resolve,
  * and update the resolution position accordingly.  Labels usually consist
  * of up to 63 characters without a period ("."); however, we use a special
- * convention to support SRV and TLSA records where the domain name
- * includes an encoding for a service and protocol in the name.  The
- * syntax (see RFC 2782) here is "_Service._Proto.Name" and in this
- * special case we include the "_Service._Proto" in the rightmost label.
+ * convention to support resource records where the domain name
+ * includes a label starting with '_'. The syntax (see RFC 8552) here is
+ * "someLabel._Label.Name" and in this special case we include the "someLabel._Label" in the rightmost label.
  * Thus, for "_443._tcp.foo.bar" we first return the label "bar" and then
  * the label "_443._tcp.foo".  The special case is detected by the
- * presence of labels beginning with an underscore.  Whenever a label
- * begins with an underscore, it is combined with the label to its right
- * (and the "." is preserved).
+ * presence of one label beginning with an underscore.  The rightmost label
+ * beginning with an underscore, is combined with the label to its right
+ * (and the "." is preserved). If the label is in the syntax of
+ * "_PORT._PROTOCOL" (e.g. "_443._tcp") we also extract the port and protocol.
+ * In this implementation, the more specific case is handled first.
  *
  * @param rh handle to the resolution operation to get the next label from
  * @return NULL if there are no more labels
@@ -657,14 +664,13 @@ resolver_lookup_get_next_label (struct GNS_ResolverHandle *rh)
     rp = rh->name;
     rh->name_resolution_pos = 0;
   }
-  else if (('_' == dot[1]) &&
-           ('_' == rh->name[0]) &&
-           (dot == memchr (rh->name, (int) '.', rh->name_resolution_pos)))
+  else if ('_' == dot[1])
   {
     /**
      * Do not advance a label. This seems to be a name only consisting
-     * of a BOX indicator (_443,_tcp).
-     * Which means, it is a BOX under the empty label.
+     * of a prefix. Indicating a BOX record (_443,_tcp)
+     * Or some version of an SBOX record (HEX,_smimeacert)
+     * Which means, it is a BOX/SBOX under the empty label.
      * leaving name_resolution_pos as is and returning empty label.
      */
     rp = GNUNET_GNS_EMPTY_LABEL_AT;
@@ -679,8 +685,9 @@ resolver_lookup_get_next_label (struct GNS_ResolverHandle *rh)
   }
   rh->protocol = 0;
   rh->service = 0;
+  rh->prefix = NULL;
   ret = GNUNET_strndup (rp, len);
-  /* If we have labels starting with underscore with label on
+  /** If we have labels starting with underscore with label on
    * the right (SRV/DANE/BOX case), determine port/protocol;
    * The format of `rh->name` must be "_PORT._PROTOCOL".
    */
@@ -703,10 +710,12 @@ resolver_lookup_get_next_label (struct GNS_ResolverHandle *rh)
     if (0 == protocol)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  _ ("Protocol `%s' unknown, skipping labels.\n"),
+                  _ (
+                    "Protocol `%s' unknown, skipping labels as BOX retain as SBOX.\n"),
                   proto_name);
       GNUNET_free (proto_name);
       GNUNET_free (srv_name);
+      rh->prefix = GNUNET_strndup (rh->name, strlen (rh->name) - len - 1);
       return ret;
     }
     service = resolver_getservbyname (srv_name,
@@ -721,10 +730,12 @@ resolver_lookup_get_next_label (struct GNS_ResolverHandle *rh)
       if (1 != sscanf (srv_name, "%u", &rh->service))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                    _ ("Service `%s' not a port, skipping service labels.\n"),
+                    _ (
+                      "Service `%s' not a port, skipping service labels as BOX retain as SBOX.\n"),
                     srv_name);
         GNUNET_free (proto_name);
         GNUNET_free (srv_name);
+        rh->prefix = GNUNET_strndup (rh->name, strlen (rh->name) - len - 1);
         return ret;
       }
     }
@@ -736,6 +747,20 @@ resolver_lookup_get_next_label (struct GNS_ResolverHandle *rh)
     GNUNET_free (proto_name);
     GNUNET_free (srv_name);
   }
+  /**
+  * If we have labels starting with underscore with label on
+  * the right, copy prefix to rh->prefix;
+  * The format of `rh->name` must be "*._label",
+  * where label is a string without '.'.
+  */
+  if ((NULL != (dot = memrchr (rh->name,
+                               (int) '.',
+                               rh->name_resolution_pos)) && '_' == dot[1]) ||
+      '_' == rh->name[0])
+  {
+    rh->name_resolution_pos = 0;
+    rh->prefix = GNUNET_strndup (rh->name, strlen (rh->name) - len - 1);
+  }
   return ret;
 }
 
@@ -2040,9 +2065,10 @@ handle_gns_resolution_result (void *cls,
     for (unsigned int i = 0; i < rd_count; i++)
     {
       GNUNET_assert (rd_off <= i);
-      if ((0 != rh->protocol) &&
-          (0 != rh->service) &&
-          (GNUNET_GNSRECORD_TYPE_BOX != rd[i].record_type))
+      if ((((0 != rh->protocol) &&
+            (0 != rh->service)) || (NULL != rh->prefix)) &&
+          (GNUNET_GNSRECORD_TYPE_BOX != rd[i].record_type &&
+           GNUNET_GNSRECORD_TYPE_SBOX != rd[i].record_type))
         if (GNUNET_GNSRECORD_TYPE_PKEY != rd[i].record_type &&
             GNUNET_GNSRECORD_TYPE_EDKEY != rd[i].record_type)
           continue;
@@ -2357,13 +2383,56 @@ handle_gns_resolution_result (void *cls,
           }
           break;
         }
+      case GNUNET_GNSRECORD_TYPE_SBOX:
+        {
+          /* unbox SBOX records if a specific one was requested */
+          if ((rh->prefix != NULL) &&
+              (rd[i].data_size >= sizeof(struct GNUNET_GNSRECORD_SBoxRecord)))
+          {
+            const struct GNUNET_GNSRECORD_SBoxRecord *box;
 
+            box = rd[i].data;
+            char *prefix = GNUNET_strdup (&box[1]);
+            size_t prefix_len = strlen (prefix) + 1;
+            GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                        "Got SBOX record, checking if prefixes match... %s vs %s\n",
+                        prefix, rh->prefix);
+            if (strcmp (rh->prefix, prefix) == 0)
+            {
+              /* Box matches, unbox! */
+              GNUNET_assert (rd_off < rd_count);
+              rd_new[rd_off].record_type = ntohl (box->record_type);
+              rd_new[rd_off].data_size -= sizeof(struct
+                                                 GNUNET_GNSRECORD_SBoxRecord)
+                                          + prefix_len;
+              rd_new[rd_off].data = &rd[i].data[sizeof(struct
+                                                       GNUNET_GNSRECORD_SBoxRecord)
+                                                + prefix_len];
+              rd_off++;
+            }
+            GNUNET_free (prefix);
+          }
+          else
+          {
+            GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                        _ (
+                          "GNS no specific protocol/service specified, preserve all SBOX `%s')\n"),
+                        rh->name);
+            /* no specific protocol/service specified, preserve all SBOX
+               records (for modern, GNS-enabled applications) */
+            rd_off++;
+          }
+          break;
+        }
       default:
         rd_off++;
         break;
       }       /* end: switch */
     }     /* end: for rd_count */
 
+    GNUNET_free (rh->prefix);
+    rh->prefix = NULL;
+
     /* yes, we are done, return result */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Returning GNS response for `%s' with %u answers\n",
@@ -3014,6 +3083,11 @@ GNS_resolver_lookup_cancel (struct GNS_ResolverHandle *rh)
                                  dr);
     GNUNET_free (dr);
   }
+  if (NULL != rh->prefix)
+  {
+    GNUNET_free (rh->prefix);
+    rh->prefix = NULL;
+  }
   GNUNET_free (rh->leho);
   GNUNET_free (rh->name);
   GNUNET_free (rh);