[GNUnet-SVN] r22310 - gnunet/src/vpn

[gnunet]

Author: schanzen
Date: 2012-06-26 19:40:39 +0200 (Tue, 26 Jun 2012)
New Revision: 22310

Modified:
   gnunet/src/vpn/Makefile.am
   gnunet/src/vpn/test_gns_vpn.c
Log:
-test now working

Modified: gnunet/src/vpn/Makefile.am
===================================================================
--- gnunet/src/vpn/Makefile.am  2012-06-26 17:39:38 UTC (rev 22309)
+++ gnunet/src/vpn/Makefile.am  2012-06-26 17:40:39 UTC (rev 22310)
@@ -25,8 +25,8 @@
  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_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

Modified: gnunet/src/vpn/test_gns_vpn.c
===================================================================
--- gnunet/src/vpn/test_gns_vpn.c       2012-06-26 17:39:38 UTC (rev 22309)
+++ gnunet/src/vpn/test_gns_vpn.c       2012-06-26 17:40:39 UTC (rev 22310)
@@ -366,8 +366,6 @@
                                             NULL);  
 }
 
-#include "../dns/dnsparser.h"
-
 static void
 run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
@@ -416,18 +414,13 @@
 
   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",