From: Martin Schanzenbach <mschanzenbach@posteo.de>
Date: Tue, 26 Jun 2012 17:40:39 +0000 (+0000)
Subject: -test now working
X-Git-Tag: initial-import-from-subversion-38251~12802
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=142c6d9fcf13d947b9fa51b2434e6d0f9cdc5cf2;p=oweals%2Fgnunet.git

-test now working
---

diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 91cb95640..c079f3711 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -25,8 +25,8 @@ if HAVE_MHD
  test_gnunet_vpn-4_to_6 \
  test_gnunet_vpn-6_to_4 \
  test_gnunet_vpn-6_over \
- test_gnunet_vpn-4_over
- #test_gns_vpn
+ test_gnunet_vpn-4_over \
+ test_gns_vpn
 endif
 else
 install-exec-hook:
@@ -82,14 +82,14 @@ libgnunetvpn_la_LIBADD = \
 libgnunetvpn_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
-#test_gns_vpn_SOURCES = \
-# test_gns_vpn.c
-#test_gns_vpn_LDADD = -lmicrohttpd @LIBCURL@ \
-# $(top_builddir)/src/namestore/libgnunetnamestore.la \
-# $(top_builddir)/src/testing/libgnunettesting.la \
-# $(top_builddir)/src/util/libgnunetutil.la
-#test_gnunet_vpn_4_over_CPPFLAGS = \
-# @LIBCURL_CPPFLAGS@
+test_gns_vpn_SOURCES = \
+ test_gns_vpn.c
+test_gns_vpn_LDADD = -lmicrohttpd @LIBCURL@ \
+ $(top_builddir)/src/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+test_gnunet_vpn_4_over_CPPFLAGS = \
+ @LIBCURL_CPPFLAGS@
 
 test_gnunet_vpn_4_over_SOURCES = \
  test_gnunet_vpn.c
diff --git a/src/vpn/test_gns_vpn.c b/src/vpn/test_gns_vpn.c
index fb498cd83..f1295903d 100644
--- a/src/vpn/test_gns_vpn.c
+++ b/src/vpn/test_gns_vpn.c
@@ -366,8 +366,6 @@ mhd_main ()
 					     NULL);  
 }
 
-#include "../dns/dnsparser.h"
-
 static void
 run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
@@ -416,18 +414,13 @@ run (void *cls,
 
   host_key = GNUNET_CRYPTO_rsa_key_create_from_file (zone_keyfile);
   rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value;
-  GNUNET_asprintf (&rd_string, "6 %s %s", (char*)&peername, "localhost4");
+  GNUNET_asprintf (&rd_string, "6 %s %s", (char*)&peername, "www.gnunet.");
   GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_string_to_value (GNUNET_GNS_RECORD_VPN,
                                                                rd_string,
                                                                (void**)&rd.data,
                                                                &rd.data_size));
   rd.record_type = GNUNET_GNS_RECORD_VPN;
 
-  struct vpn_data* vpn = (struct vpn_data*)rd.data;
-
-  printf ("%hu %s %s\n", ntohs (vpn->proto), GNUNET_h2s (&vpn->peer),
-          (char*)&vpn[1]);
-
   GNUNET_NAMESTORE_record_create (namestore,
                                   host_key,
                                   "www",