[GNUnet-SVN] r24740 - in gnunet/src: . gns

[gnunet]

Author: grothoff
Date: 2012-11-05 15:03:17 +0100 (Mon, 05 Nov 2012)
New Revision: 24740

Modified:
   gnunet/src/Makefile.am
   gnunet/src/gns/Makefile.am
   gnunet/src/gns/gnunet-service-gns_resolver.c
Log:
-make gns independent of vpn on W32

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2012-11-05 13:58:41 UTC (rev 24739)
+++ gnunet/src/Makefile.am      2012-11-05 14:03:17 UTC (rev 24740)
@@ -11,7 +11,7 @@
  LINUX_DIR = dns exit vpn gns pt
 endif
 if MINGW
- MINGW_DIR = dns vpn gns
+ MINGW_DIR = dns gns
 endif
 
 if HAVE_MYSQL

Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am  2012-11-05 13:58:41 UTC (rev 24739)
+++ gnunet/src/gns/Makefile.am  2012-11-05 14:03:17 UTC (rev 24740)
@@ -21,6 +21,8 @@
   DO_W32_NSP = libw32nsp.la
   DO_W32_NSPTOOLS = w32nsp-install w32nsp-uninstall w32nsp-resolve
   DO_W32_HS_CONF = gns-helper-service-w32.conf
+else
+  USE_VPN = $(top_builddir)/src/vpn/libgnunetvpn.la
 endif
 
 if USE_COVERAGE
@@ -131,7 +133,7 @@
        $(top_builddir)/src/dns/libgnunetdnsparser.la \
        $(top_builddir)/src/dht/libgnunetdht.la \
        $(top_builddir)/src/namestore/libgnunetnamestore.la \
-       $(top_builddir)/src/vpn/libgnunetvpn.la \
+       $(USE_VPN) \
   $(GN_LIBINTL)
 gnunet_service_gns_DEPENDENCIES = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -141,7 +143,7 @@
        $(top_builddir)/src/dns/libgnunetdnsparser.la \
        $(top_builddir)/src/dht/libgnunetdht.la \
        $(top_builddir)/src/namestore/libgnunetnamestore.la \
-       $(top_builddir)/src/vpn/libgnunetvpn.la
+       $(USE_VPN)
 
 
 

Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c        2012-11-05 13:58:41 UTC 
(rev 24739)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c        2012-11-05 14:03:17 UTC 
(rev 24740)
@@ -29,7 +29,6 @@
 #include "gnunet_dns_service.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_namestore_service.h"
-#include "gnunet_vpn_service.h"
 #include "gnunet_dns_service.h"
 #include "gnunet_resolver_service.h"
 #include "gnunet_dnsparser_lib.h"
@@ -39,7 +38,11 @@
 #include "block_gns.h"
 #include "gns.h"
 #include "gnunet-service-gns_resolver.h"
+#ifndef WINDOWS
+#include "gnunet_vpn_service.h"
+#endif
 
+
 /**
  * Default DHT timeout
  */
@@ -56,10 +59,12 @@
  */
 static struct GNUNET_NAMESTORE_Handle *namestore_handle;
 
+#ifndef WINDOWS
 /**
  * Our handle to the vpn service
  */
 static struct GNUNET_VPN_Handle *vpn_handle;
+#endif
 
 /**
  * Resolver handle to the dht
@@ -1240,6 +1245,7 @@
 }
 
 
+#ifndef WINDOWS
 /**
  * VPN redirect result callback
  *
@@ -1305,6 +1311,7 @@
              rh->id);
   rh->proc (rh->proc_cls, rh, 0, NULL);
 }
+#endif
 
 
 /**
@@ -1804,6 +1811,7 @@
     af = AF_INET;
   else
     af = AF_INET6;
+#ifndef WINDOWS
   if (NULL == vpn_handle)
   {
     vpn_handle = GNUNET_VPN_connect (cfg);
@@ -1824,6 +1832,11 @@
                                                GNUNET_TIME_UNIT_FOREVER_ABS, 
//FIXME
                                                &process_record_result_vpn,
                                                rh);
+#else
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+             "Error connecting to VPN (not available on W32 yet)\n");
+  finish_lookup (rh, rh->proc_cls, 0, NULL);  
+#endif
 }