[GNUnet-SVN] r26577 - in gnunet/src: . exit vpn

[gnunet]

Author: cfuchs
Date: 2013-03-22 18:02:09 +0100 (Fri, 22 Mar 2013)
New Revision: 26577

Modified:
   gnunet/src/Makefile.am
   gnunet/src/exit/Makefile.am
   gnunet/src/exit/gnunet-helper-exit-windows.c
   gnunet/src/vpn/gnunet-helper-vpn-windows.c
Log:
* added vpn and exit to the default build options for mingw/windows builds. 
This code is considered experimental 
and has not yet undergone intensive testing. Use it at your own peril, but we 
would still be really glad for 
feedback and bug reports! (thanks!)
* fixed a typo in the exit-makefile (buildflags)
* adjusted output of gnunet-helper-exit-windows to properly identify itself
* updated driver-paths for looking for tap32/tap64



Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2013-03-22 15:59:32 UTC (rev 26576)
+++ gnunet/src/Makefile.am      2013-03-22 17:02:09 UTC (rev 26577)
@@ -11,7 +11,7 @@
  LINUX_DIR = dns exit vpn gns pt
 endif
 if MINGW
- MINGW_DIR = dns gns
+ MINGW_DIR = dns gns vpn exit
 endif
 
 if HAVE_MYSQL

Modified: gnunet/src/exit/Makefile.am
===================================================================
--- gnunet/src/exit/Makefile.am 2013-03-22 15:59:32 UTC (rev 26576)
+++ gnunet/src/exit/Makefile.am 2013-03-22 17:02:09 UTC (rev 26577)
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
 if MINGW
-  WINFLAGS = -Wl,--no-undefined, --export-all-symbols
+  WINFLAGS = -Wl,--no-undefined,--export-all-symbols
   EXITBIN = gnunet-helper-exit
 endif
 

Modified: gnunet/src/exit/gnunet-helper-exit-windows.c
===================================================================
--- gnunet/src/exit/gnunet-helper-exit-windows.c        2013-03-22 15:59:32 UTC 
(rev 26576)
+++ gnunet/src/exit/gnunet-helper-exit-windows.c        2013-03-22 17:02:09 UTC 
(rev 26577)
@@ -71,13 +71,13 @@
  * Name or Path+Name of our win32 driver.
  * The .sys and .cat files HAVE to be in the same location as this file!
  */
-#define INF_FILE "share/gnunet/tapw32/OemWin2k.inf"
+#define INF_FILE "share/gnunet/openvpn-tap32/tapw32/OemWin2k.inf"
 
 /**
  * Name or Path+Name of our win64 driver.
  * The .sys and .cat files HAVE to be in the same location as this file!
  */
-#define INF_FILE64 "share/gnunet/tapw64/OemWin2k.inf"
+#define INF_FILE64 "share/gnunet/openvpn-tap32/tapw64/OemWin2k.inf"
 
 /**
  * Hardware ID used in the inf-file. 
@@ -1466,7 +1466,7 @@
 
   if (6 != argc)
     {
-      fprintf (stderr, "FATAL: must supply 5 
arguments\nUsage:\ngnunet-helper-vpn <if name prefix> <address6 or \"-\"> 
<netbits6> <address4 or \"-\"> <netmask4>\n", argv[0]);
+      fprintf (stderr, "FATAL: must supply 6 
arguments\nUsage:\ngnunet-helper-exit <if name prefix> <uplink-interface name> 
<address6 or \"-\"> <netbits6> <address4 or \"-\"> <netmask4>\n", argv[0]);
       return 1;
     }
 

Modified: gnunet/src/vpn/gnunet-helper-vpn-windows.c
===================================================================
--- gnunet/src/vpn/gnunet-helper-vpn-windows.c  2013-03-22 15:59:32 UTC (rev 
26576)
+++ gnunet/src/vpn/gnunet-helper-vpn-windows.c  2013-03-22 17:02:09 UTC (rev 
26577)
@@ -73,13 +73,13 @@
  * Name or Path+Name of our win32 driver.
  * The .sys and .cat files HAVE to be in the same location as this file!
  */
-#define INF_FILE "share/gnunet/tapw32/OemWin2k.inf"
+#define INF_FILE "share/gnunet/openvpn-tap32/tapw32/OemWin2k.inf"
 
 /**
  * Name or Path+Name of our win64 driver.
  * The .sys and .cat files HAVE to be in the same location as this file!
  */
-#define INF_FILE64 "share/gnunet/tapw64/OemWin2k.inf"
+#define INF_FILE64 "share/gnunet/openvpn-tap32/tapw64/OemWin2k.inf"
 
 /**
  * Hardware ID used in the inf-file.