-use the same hash function to map service name to hash, not once strlen and then strlen+1

9 files changed, 57 insertions, 21 deletions

diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index 743b5bf31..6afb38fd9 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -787,7 +787,7 @@ store_service (struct GNUNET_CONTAINER_MultiHashMap *service_map,
   char key[sizeof (struct GNUNET_HashCode) + sizeof (uint16_t)];
   struct GNUNET_HashCode desc;
 
-  GNUNET_CRYPTO_hash (name, strlen (name) + 1, &desc);
+  GNUNET_TUN_service_name_to_hash (name, &desc);
   service->name = GNUNET_strdup (name);
   memcpy (&key[0], &destination_port, sizeof (uint16_t));
   memcpy (&key[sizeof(uint16_t)], &desc, sizeof (struct GNUNET_HashCode));
@@ -3220,7 +3220,7 @@ add_services (int proto,
     if (NULL == (hostname = strstr (redirect, ":")))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "option `%s' for domain `%s' is not formatted correctly!\n",
+                  _("Option `%s' for domain `%s' is not formatted correctly!\n"),
                   redirect,
                   name);
       continue;
@@ -3230,7 +3230,7 @@ add_services (int proto,
     if (NULL == (hostport = strstr (hostname, ":")))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "option `%s' for domain `%s' is not formatted correctly!\n",
+                  _("Option `%s' for domain `%s' is not formatted correctly!\n"),
                   redirect,
                   name);
       continue;
@@ -3244,14 +3244,16 @@ add_services (int proto,
     if (!((local_port > 0) && (local_port < 65536)))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "`%s' is not a valid port number (for domain `%s')!", redirect,
+                  _("`%s' is not a valid port number (for domain `%s')!"),
+                  redirect,
                   name);
       continue;
     }
     if (!((remote_port > 0) && (remote_port < 65536)))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "`%s' is not a valid port number (for domain `%s')!", hostport,
+                  _("`%s' is not a valid port number (for domain `%s')!"),
+                  hostport,
                   name);
       continue;
     }
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 36d50ac2e..79f5c0513 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -190,6 +190,7 @@ gnunet_service_gns_LDADD = \
   $(top_builddir)/src/dns/libgnunetdnsparser.la \
   $(top_builddir)/src/dns/libgnunetdnsstub.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/tun/libgnunettun.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(USE_VPN) \
@@ -199,6 +200,7 @@ gnunet_service_gns_DEPENDENCIES = \
   $(top_builddir)/src/revocation/libgnunetrevocation.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/tun/libgnunettun.la \
   $(top_builddir)/src/dns/libgnunetdns.la \
   $(top_builddir)/src/dns/libgnunetdnsparser.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 14e714a85..f046702e3 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -41,6 +41,7 @@
 #include "gnunet_resolver_service.h"
 #include "gnunet_revocation_service.h"
 #include "gnunet_dnsparser_lib.h"
+#include "gnunet_tun_lib.h"
 #include "gnunet_gns_service.h"
 #include "gns.h"
 #include "gnunet-service-gns_resolver.h"
@@ -1413,9 +1414,8 @@ handle_gns_resolution_result (void *cls,
               GNS_resolver_lookup_cancel (rh);
               return;
             }
-            GNUNET_CRYPTO_hash (vname,
-                                strlen (vname), // FIXME: +1?
-                                &vhash);
+            GNUNET_TUN_service_name_to_hash (vname,
+                                             &vhash);
             GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                         "Attempting VPN allocation for %s-%s (AF: %d, proto %d)\n",
                         GNUNET_i2s (&vpn->peer),
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index 87b60a479..7d1e7cfed 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -887,4 +887,16 @@ char *
 GNUNET_TUN_ipv4policy2regex (const char *policy);
 
 
+/**
+ * Hash the service name of a hosted service to the
+ * hash code that is used to identify the service on
+ * the network.
+ *
+ * @param service_name a string
+ * @param hc corresponding hash
+ */
+void
+GNUNET_TUN_service_name_to_hash (const char *service_name,
+                                 struct GNUNET_HashCode *hc);
+
 #endif
diff --git a/src/regex/regex_api.c b/src/regex/regex_api.c
index 0da97d072..979f58d47 100644
--- a/src/regex/regex_api.c
+++ b/src/regex/regex_api.c
@@ -186,7 +186,7 @@ struct GNUNET_REGEX_Search
   GNUNET_REGEX_Found callback;
 
   /**
-   * Closure for 'callback'.
+   * Closure for @e callback.
    */
   void *callback_cls;
 
@@ -201,7 +201,7 @@ struct GNUNET_REGEX_Search
  * We got a response or disconnect after asking regex
  * to do the search.  Handle it.
  *
- * @param cls the 'struct GNUNET_REGEX_Search' to retry
+ * @param cls the `struct GNUNET_REGEX_Search` to retry
  * @param msg NULL on disconnect
  */
 static void
diff --git a/src/tun/regex.c b/src/tun/regex.c
index 056062e5f..f37c35122 100644
--- a/src/tun/regex.c
+++ b/src/tun/regex.c
@@ -460,4 +460,22 @@ GNUNET_TUN_ipv6policy2regex (const char *policy)
 }
 
 
+/**
+ * Hash the service name of a hosted service to the
+ * hash code that is used to identify the service on
+ * the network.
+ *
+ * @param service_name a string
+ * @param hc corresponding hash
+ */
+void
+GNUNET_TUN_service_name_to_hash (const char *service_name,
+                                 struct GNUNET_HashCode *hc)
+{
+  GNUNET_CRYPTO_hash (service_name,
+                      strlen (service_name),
+                      hc);
+}
+
+
 /* end of regex.c */
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index c4581df6f..e22c0e2c3 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -40,7 +40,7 @@ bin_PROGRAMS = \
 
 if MINGW
   gnunet_helper_vpn_LDFLAGS = \
-    -no-undefined -Wl,--export-all-symbols 
+    -no-undefined -Wl,--export-all-symbols
 
   gnunet_helper_vpn_LDADD = \
     -lsetupapi -lnewdev -lshell32 -liconv -lstdc++ \
@@ -53,7 +53,7 @@ else
         gnunet-helper-vpn.c
 endif
 gnunet_service_vpn_SOURCES = \
- gnunet-service-vpn.c 
+ gnunet-service-vpn.c
 gnunet_service_vpn_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/tun/libgnunettun.la \
@@ -68,6 +68,7 @@ gnunet_vpn_SOURCES = \
  gnunet-vpn.c
 gnunet_vpn_LDADD = \
   $(top_builddir)/src/vpn/libgnunetvpn.la \
+  $(top_builddir)/src/tun/libgnunettun.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 gnunet_vpn_DEPENDENCIES = \
diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c
index a68fdc45b..d2e5eec4e 100644
--- a/src/vpn/gnunet-vpn.c
+++ b/src/vpn/gnunet-vpn.c
@@ -26,6 +26,7 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
+#include "gnunet_tun_lib.h"
 #include "gnunet_vpn_service.h"
 
 
@@ -227,16 +228,16 @@ run (void *cls, char *const *args, const char *cfgfile,
       protocol = IPPROTO_UDP;
     if (GNUNET_OK !=
         GNUNET_CRYPTO_eddsa_public_key_from_string (peer_id,
-                                                       strlen (peer_id),
-                                                       &peer.public_key))
+                                                    strlen (peer_id),
+                                                    &peer.public_key))
     {
-      FPRINTF (stderr, _("`%s' is not a valid peer identifier.\n"),
+      FPRINTF (stderr,
+               _("`%s' is not a valid peer identifier.\n"),
                peer_id);
       goto error;
     }
-    GNUNET_CRYPTO_hash (service_name,
-                        strlen (service_name),
-                        &sd);
+    GNUNET_TUN_service_name_to_hash (service_name,
+                                     &sd);
     request = GNUNET_VPN_redirect_to_peer (handle,
                                            req_af,
                                            protocol,
diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c
index cf493cc52..95ef8c46d 100644
--- a/src/vpn/vpn_api.c
+++ b/src/vpn/vpn_api.c
@@ -120,7 +120,7 @@ struct GNUNET_VPN_RedirectionRequest
   /**
    * For service redirection, service descriptor.
    */
-  struct GNUNET_HashCode serv;          
+  struct GNUNET_HashCode serv;
 
   /**
    * At what time should the created service mapping expire?
@@ -162,7 +162,7 @@ reconnect (struct GNUNET_VPN_Handle *vh);
 /**
  * Function called when we receive a message from the VPN service.
  *
- * @param cls the 'struct GNUNET_VPN_Handle'
+ * @param cls the `struct GNUNET_VPN_Handle`
  * @param msg message received, NULL on timeout or fatal error
  */
 static void
@@ -475,7 +475,7 @@ GNUNET_VPN_redirect_to_peer (struct GNUNET_VPN_Handle *vh,
   return rr;
 }
 
-                
+
 /**
  * Tell the VPN that forwarding to the Internet via some exit node is
  * requested.  Note that both UDP and TCP traffic will be forwarded,