aboutsummaryrefslogtreecommitdiff
path: root/src/exit
diff options
context:
space:
mode:
authorChristian Fuchs <christian.fuchs@cfuchs.net>2013-03-22 17:02:09 +0000
committerChristian Fuchs <christian.fuchs@cfuchs.net>2013-03-22 17:02:09 +0000
commitd1bebde16276dfde094f9ff6c010ee1a84379940 (patch)
treeddfe70fd48406f81e337d1c1f231a116a0cd0ab6 /src/exit
parent14e5afbe063678ae6b8337c68394bd3aa30b37b4 (diff)
downloadgnunet-d1bebde16276dfde094f9ff6c010ee1a84379940.tar.gz
gnunet-d1bebde16276dfde094f9ff6c010ee1a84379940.zip
* 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
Diffstat (limited to 'src/exit')
-rw-r--r--src/exit/Makefile.am2
-rw-r--r--src/exit/gnunet-helper-exit-windows.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am
index eb2a7a9aa..d350d86e2 100644
--- a/src/exit/Makefile.am
+++ b/src/exit/Makefile.am
@@ -1,7 +1,7 @@
1INCLUDES = -I$(top_srcdir)/src/include 1INCLUDES = -I$(top_srcdir)/src/include
2 2
3if MINGW 3if MINGW
4 WINFLAGS = -Wl,--no-undefined, --export-all-symbols 4 WINFLAGS = -Wl,--no-undefined,--export-all-symbols
5 EXITBIN = gnunet-helper-exit 5 EXITBIN = gnunet-helper-exit
6endif 6endif
7 7
diff --git a/src/exit/gnunet-helper-exit-windows.c b/src/exit/gnunet-helper-exit-windows.c
index 6b80d83d4..a2235bf38 100644
--- a/src/exit/gnunet-helper-exit-windows.c
+++ b/src/exit/gnunet-helper-exit-windows.c
@@ -71,13 +71,13 @@
71 * Name or Path+Name of our win32 driver. 71 * Name or Path+Name of our win32 driver.
72 * The .sys and .cat files HAVE to be in the same location as this file! 72 * The .sys and .cat files HAVE to be in the same location as this file!
73 */ 73 */
74#define INF_FILE "share/gnunet/tapw32/OemWin2k.inf" 74#define INF_FILE "share/gnunet/openvpn-tap32/tapw32/OemWin2k.inf"
75 75
76/** 76/**
77 * Name or Path+Name of our win64 driver. 77 * Name or Path+Name of our win64 driver.
78 * The .sys and .cat files HAVE to be in the same location as this file! 78 * The .sys and .cat files HAVE to be in the same location as this file!
79 */ 79 */
80#define INF_FILE64 "share/gnunet/tapw64/OemWin2k.inf" 80#define INF_FILE64 "share/gnunet/openvpn-tap32/tapw64/OemWin2k.inf"
81 81
82/** 82/**
83 * Hardware ID used in the inf-file. 83 * Hardware ID used in the inf-file.
@@ -1466,7 +1466,7 @@ main (int argc, char **argv)
1466 1466
1467 if (6 != argc) 1467 if (6 != argc)
1468 { 1468 {
1469 fprintf (stderr, "FATAL: must supply 5 arguments\nUsage:\ngnunet-helper-vpn <if name prefix> <address6 or \"-\"> <netbits6> <address4 or \"-\"> <netmask4>\n", argv[0]); 1469 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]);
1470 return 1; 1470 return 1;
1471 } 1471 }
1472 1472