diff options
author | ng0 <ng0@n0.is> | 2019-09-10 16:59:32 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-09-10 16:59:32 +0000 |
commit | 04b6df21cd281e8cd540139f8d9ae85defc1961c (patch) | |
tree | 6357199445df8d5c0c631bc8f10aef838b1f9f1e /src/pt | |
parent | 483b0139a218a5f8a8311bda3eb23bcd88f57688 (diff) | |
download | gnunet-04b6df21cd281e8cd540139f8d9ae85defc1961c.tar.gz gnunet-04b6df21cd281e8cd540139f8d9ae85defc1961c.zip |
remove CYGWIN codeblocks, drop vendored Windows openvpn, drop win32 specific files.
configures and builds okay.
testsuite wasn't checked, will be checked.
diff including the plibc removal is now around 14370 lines of code less.
Diffstat (limited to 'src/pt')
-rw-r--r-- | src/pt/Makefile.am | 18 | ||||
-rw-r--r-- | src/pt/test_gnunet_vpn.c | 3 |
2 files changed, 1 insertions, 20 deletions
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am index 1d94a3429..09a68b779 100644 --- a/src/pt/Makefile.am +++ b/src/pt/Makefile.am | |||
@@ -1,10 +1,6 @@ | |||
1 | # This Makefile.am is in the public domain | 1 | # This Makefile.am is in the public domain |
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | 2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include |
3 | 3 | ||
4 | if MINGW | ||
5 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | ||
6 | endif | ||
7 | |||
8 | if USE_COVERAGE | 4 | if USE_COVERAGE |
9 | AM_CFLAGS = --coverage -O0 | 5 | AM_CFLAGS = --coverage -O0 |
10 | endif | 6 | endif |
@@ -46,13 +42,6 @@ if LINUX | |||
46 | test_gnunet_vpn-4_over \ | 42 | test_gnunet_vpn-4_over \ |
47 | test_gns_vpn | 43 | test_gns_vpn |
48 | endif | 44 | endif |
49 | if MINGW | ||
50 | VPN_TEST = \ | ||
51 | test_gnunet_vpn-4_to_6 \ | ||
52 | test_gnunet_vpn-6_to_4 \ | ||
53 | test_gnunet_vpn-6_over \ | ||
54 | test_gnunet_vpn-4_over | ||
55 | endif | ||
56 | else | 45 | else |
57 | if HAVE_LIBCURL | 46 | if HAVE_LIBCURL |
58 | LIB_GNURL=@LIBCURL@ | 47 | LIB_GNURL=@LIBCURL@ |
@@ -65,13 +54,6 @@ if LINUX | |||
65 | test_gnunet_vpn-4_over \ | 54 | test_gnunet_vpn-4_over \ |
66 | test_gns_vpn | 55 | test_gns_vpn |
67 | endif | 56 | endif |
68 | if MINGW | ||
69 | VPN_TEST = \ | ||
70 | test_gnunet_vpn-4_to_6 \ | ||
71 | test_gnunet_vpn-6_to_4 \ | ||
72 | test_gnunet_vpn-6_over \ | ||
73 | test_gnunet_vpn-4_over | ||
74 | endif | ||
75 | endif | 57 | endif |
76 | endif | 58 | endif |
77 | 59 | ||
diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c index 60f4aad2a..c52c0c6c9 100644 --- a/src/pt/test_gnunet_vpn.c +++ b/src/pt/test_gnunet_vpn.c | |||
@@ -420,7 +420,6 @@ main(int argc, char *const *argv) | |||
420 | char *exit_binary; | 420 | char *exit_binary; |
421 | int ret = 0; | 421 | int ret = 0; |
422 | 422 | ||
423 | #ifndef MINGW | ||
424 | if (0 != access("/dev/net/tun", R_OK)) | 423 | if (0 != access("/dev/net/tun", R_OK)) |
425 | { | 424 | { |
426 | GNUNET_log_strerror_file(GNUNET_ERROR_TYPE_ERROR, | 425 | GNUNET_log_strerror_file(GNUNET_ERROR_TYPE_ERROR, |
@@ -430,7 +429,7 @@ main(int argc, char *const *argv) | |||
430 | "WARNING: System unable to run test, skipping.\n"); | 429 | "WARNING: System unable to run test, skipping.\n"); |
431 | return 77; | 430 | return 77; |
432 | } | 431 | } |
433 | #endif | 432 | |
434 | vpn_binary = GNUNET_OS_get_libexec_binary_path("gnunet-helper-vpn"); | 433 | vpn_binary = GNUNET_OS_get_libexec_binary_path("gnunet-helper-vpn"); |
435 | exit_binary = GNUNET_OS_get_libexec_binary_path("gnunet-helper-exit"); | 434 | exit_binary = GNUNET_OS_get_libexec_binary_path("gnunet-helper-exit"); |
436 | if ((GNUNET_YES != (ret = GNUNET_OS_check_helper_binary(vpn_binary, GNUNET_YES, "-d gnunet-vpn - - 169.1.3.3.7 255.255.255.0"))) || //ipv4 only please! | 435 | if ((GNUNET_YES != (ret = GNUNET_OS_check_helper_binary(vpn_binary, GNUNET_YES, "-d gnunet-vpn - - 169.1.3.3.7 255.255.255.0"))) || //ipv4 only please! |