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

2 files changed, 5 insertions, 3 deletions

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),