aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac5
-rw-r--r--po/POTFILES.in8
-rw-r--r--src/Makefile.am1
-rw-r--r--src/cli/Makefile.am1
-rw-r--r--src/cli/vpn/.gitignore1
-rw-r--r--src/cli/vpn/Makefile.am22
-rw-r--r--src/cli/vpn/gnunet-vpn.c (renamed from src/vpn/gnunet-vpn.c)0
-rw-r--r--src/gns/Makefile.am2
-rw-r--r--src/pt/Makefile.am10
-rw-r--r--src/service/Makefile.am3
-rw-r--r--src/service/vpn/.gitignore (renamed from src/vpn/.gitignore)0
-rw-r--r--src/service/vpn/Makefile.am (renamed from src/vpn/Makefile.am)10
-rw-r--r--src/service/vpn/gnunet-helper-vpn.c (renamed from src/vpn/gnunet-helper-vpn.c)0
-rw-r--r--src/service/vpn/gnunet-service-vpn.c (renamed from src/vpn/gnunet-service-vpn.c)0
-rw-r--r--src/service/vpn/meson.build (renamed from src/vpn/meson.build)0
-rw-r--r--src/service/vpn/tests/expected (renamed from src/vpn/tests/expected)bin112 -> 112 bytes
-rw-r--r--src/service/vpn/tests/ping (renamed from src/vpn/tests/ping)bin112 -> 112 bytes
-rwxr-xr-xsrc/service/vpn/tests/test-helper-icmp.sh (renamed from src/vpn/tests/test-helper-icmp.sh)0
-rwxr-xr-xsrc/service/vpn/tests/test-helper-ifaddr.sh (renamed from src/vpn/tests/test-helper-ifaddr.sh)0
-rw-r--r--src/service/vpn/vpn.conf.in (renamed from src/vpn/vpn.conf.in)0
-rw-r--r--src/service/vpn/vpn.h (renamed from src/vpn/vpn.h)0
-rw-r--r--src/service/vpn/vpn_api.c (renamed from src/vpn/vpn_api.c)0
22 files changed, 39 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac
index b89275e87..2d4d8cff3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1289,6 +1289,8 @@ src/service/topology/Makefile
1289src/service/transport/Makefile 1289src/service/transport/Makefile
1290src/service/transport/transport.conf 1290src/service/transport/transport.conf
1291src/service/util/Makefile 1291src/service/util/Makefile
1292src/service/vpn/Makefile
1293src/service/vpn/vpn.conf
1292src/rest-plugin/Makefile 1294src/rest-plugin/Makefile
1293src/rest-plugin/identity/Makefile 1295src/rest-plugin/identity/Makefile
1294src/rest-plugin/rest/Makefile 1296src/rest-plugin/rest/Makefile
@@ -1306,6 +1308,7 @@ src/cli/nse/Makefile
1306src/cli/revocation/Makefile 1308src/cli/revocation/Makefile
1307src/cli/statistics/Makefile 1309src/cli/statistics/Makefile
1308src/cli/util/Makefile 1310src/cli/util/Makefile
1311src/cli/vpn/Makefile
1309src/contrib/Makefile 1312src/contrib/Makefile
1310src/contrib/service/Makefile 1313src/contrib/service/Makefile
1311src/contrib/service/abd/Makefile 1314src/contrib/service/abd/Makefile
@@ -1335,8 +1338,6 @@ src/lib/hello/Makefile
1335src/include/Makefile 1338src/include/Makefile
1336src/include/gnunet_config.h 1339src/include/gnunet_config.h
1337src/pt/Makefile 1340src/pt/Makefile
1338src/vpn/Makefile
1339src/vpn/vpn.conf
1340src/zonemaster/Makefile 1341src/zonemaster/Makefile
1341src/zonemaster/zonemaster.conf 1342src/zonemaster/zonemaster.conf
1342src/reclaim/Makefile 1343src/reclaim/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f3b42e0dd..9f189a096 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,6 +29,7 @@ src/cli/util/gnunet-resolver.c
29src/cli/util/gnunet-scrypt.c 29src/cli/util/gnunet-scrypt.c
30src/cli/util/gnunet-timeout.c 30src/cli/util/gnunet-timeout.c
31src/cli/util/gnunet-uri.c 31src/cli/util/gnunet-uri.c
32src/cli/vpn/gnunet-vpn.c
32src/contrib/cli/template/gnunet-template.c 33src/contrib/cli/template/gnunet-template.c
33src/contrib/service/abd/abd_api.c 34src/contrib/service/abd/abd_api.c
34src/contrib/service/abd/abd_serialization.c 35src/contrib/service/abd/abd_serialization.c
@@ -491,10 +492,9 @@ src/service/transport/transport_api_cmd_start_peer.c
491src/service/transport/transport_api_cmd_stop_peer.c 492src/service/transport/transport_api_cmd_stop_peer.c
492src/service/transport/transport_api_traits.c 493src/service/transport/transport_api_traits.c
493src/service/util/gnunet-service-resolver.c 494src/service/util/gnunet-service-resolver.c
494src/vpn/gnunet-helper-vpn.c 495src/service/vpn/gnunet-helper-vpn.c
495src/vpn/gnunet-service-vpn.c 496src/service/vpn/gnunet-service-vpn.c
496src/vpn/gnunet-vpn.c 497src/service/vpn/vpn_api.c
497src/vpn/vpn_api.c
498src/zonemaster/gnunet-service-zonemaster.c 498src/zonemaster/gnunet-service-zonemaster.c
499src/fs/fs_api.h 499src/fs/fs_api.h
500src/include/gnunet_json_lib.h 500src/include/gnunet_json_lib.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 8bf3b72a3..f55c535bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,6 @@ SUBDIRS = \
17 rest-plugin \ 17 rest-plugin \
18 cli \ 18 cli \
19 contrib \ 19 contrib \
20 vpn \
21 gns \ 20 gns \
22 zonemaster \ 21 zonemaster \
23 $(CONVERSATION_DIR) \ 22 $(CONVERSATION_DIR) \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index b06927edc..c7682bb36 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -11,4 +11,5 @@ SUBDIRS = \
11 namecache \ 11 namecache \
12 namestore \ 12 namestore \
13 revocation \ 13 revocation \
14 vpn \
14 cadet 15 cadet
diff --git a/src/cli/vpn/.gitignore b/src/cli/vpn/.gitignore
new file mode 100644
index 000000000..dbd75eb25
--- /dev/null
+++ b/src/cli/vpn/.gitignore
@@ -0,0 +1 @@
gnunet-vpn
diff --git a/src/cli/vpn/Makefile.am b/src/cli/vpn/Makefile.am
new file mode 100644
index 000000000..0c7c459ef
--- /dev/null
+++ b/src/cli/vpn/Makefile.am
@@ -0,0 +1,22 @@
1# This Makefile.am is in the public domain
2AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
3
4if USE_COVERAGE
5 AM_CFLAGS = --coverage -O0
6endif
7
8pkgcfgdir= $(pkgdatadir)/config.d/
9
10libexecdir= $(pkglibdir)/libexec/
11
12plugindir = $(libdir)/gnunet
13
14bin_PROGRAMS = \
15 gnunet-vpn
16
17gnunet_vpn_SOURCES = \
18 gnunet-vpn.c
19gnunet_vpn_LDADD = \
20 $(top_builddir)/src/service/vpn/libgnunetvpn.la \
21 $(top_builddir)/src/lib/util/libgnunetutil.la \
22 $(GN_LIBINTL)
diff --git a/src/vpn/gnunet-vpn.c b/src/cli/vpn/gnunet-vpn.c
index a67e17016..a67e17016 100644
--- a/src/vpn/gnunet-vpn.c
+++ b/src/cli/vpn/gnunet-vpn.c
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index c5d81ca76..6907df0ed 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -22,7 +22,7 @@ else
22 LIBIDN2= 22 LIBIDN2=
23endif 23endif
24 24
25USE_VPN = $(top_builddir)/src/vpn/libgnunetvpn.la 25USE_VPN = $(top_builddir)/src/service/vpn/libgnunetvpn.la
26 26
27if USE_COVERAGE 27if USE_COVERAGE
28 AM_CFLAGS = --coverage -O0 28 AM_CFLAGS = --coverage -O0
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 5ecaaa10c..7622f2c1a 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -20,7 +20,7 @@ libexec_PROGRAMS = \
20gnunet_daemon_pt_SOURCES = \ 20gnunet_daemon_pt_SOURCES = \
21 gnunet-daemon-pt.c 21 gnunet-daemon-pt.c
22gnunet_daemon_pt_LDADD = \ 22gnunet_daemon_pt_LDADD = \
23 $(top_builddir)/src/vpn/libgnunetvpn.la \ 23 $(top_builddir)/src/service/vpn/libgnunetvpn.la \
24 $(top_builddir)/src/service/cadet/libgnunetcadet.la \ 24 $(top_builddir)/src/service/cadet/libgnunetcadet.la \
25 $(top_builddir)/src/service/dht/libgnunetdht.la \ 25 $(top_builddir)/src/service/dht/libgnunetdht.la \
26 $(top_builddir)/src/service/dns/libgnunetdns.la \ 26 $(top_builddir)/src/service/dns/libgnunetdns.la \
@@ -63,7 +63,7 @@ test_gns_vpn_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
63test_gnunet_vpn_4_over_SOURCES = \ 63test_gnunet_vpn_4_over_SOURCES = \
64 test_gnunet_vpn.c 64 test_gnunet_vpn.c
65test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) @LIBCURL@ \ 65test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
66 $(top_builddir)/src/vpn/libgnunetvpn.la \ 66 $(top_builddir)/src/service/vpn/libgnunetvpn.la \
67 $(top_builddir)/src/service/testing/libgnunettesting.la \ 67 $(top_builddir)/src/service/testing/libgnunettesting.la \
68 $(top_builddir)/src/lib/util/libgnunetutil.la 68 $(top_builddir)/src/lib/util/libgnunetutil.la
69test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) 69test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -71,7 +71,7 @@ test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
71test_gnunet_vpn_6_over_SOURCES = \ 71test_gnunet_vpn_6_over_SOURCES = \
72 test_gnunet_vpn.c 72 test_gnunet_vpn.c
73test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) @LIBCURL@ \ 73test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
74 $(top_builddir)/src/vpn/libgnunetvpn.la \ 74 $(top_builddir)/src/service/vpn/libgnunetvpn.la \
75 $(top_builddir)/src/service/testing/libgnunettesting.la \ 75 $(top_builddir)/src/service/testing/libgnunettesting.la \
76 $(top_builddir)/src/lib/util/libgnunetutil.la 76 $(top_builddir)/src/lib/util/libgnunetutil.la
77test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) 77test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -79,7 +79,7 @@ test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
79test_gnunet_vpn_4_to_6_SOURCES = \ 79test_gnunet_vpn_4_to_6_SOURCES = \
80 test_gnunet_vpn.c 80 test_gnunet_vpn.c
81test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) @LIBCURL@ \ 81test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) @LIBCURL@ \
82 $(top_builddir)/src/vpn/libgnunetvpn.la \ 82 $(top_builddir)/src/service/vpn/libgnunetvpn.la \
83 $(top_builddir)/src/service/testing/libgnunettesting.la \ 83 $(top_builddir)/src/service/testing/libgnunettesting.la \
84 $(top_builddir)/src/lib/util/libgnunetutil.la 84 $(top_builddir)/src/lib/util/libgnunetutil.la
85test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) 85test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -87,7 +87,7 @@ test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
87test_gnunet_vpn_6_to_4_SOURCES = \ 87test_gnunet_vpn_6_to_4_SOURCES = \
88 test_gnunet_vpn.c 88 test_gnunet_vpn.c
89test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) @LIBCURL@ \ 89test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) @LIBCURL@ \
90 $(top_builddir)/src/vpn/libgnunetvpn.la \ 90 $(top_builddir)/src/service/vpn/libgnunetvpn.la \
91 $(top_builddir)/src/service/testing/libgnunettesting.la \ 91 $(top_builddir)/src/service/testing/libgnunettesting.la \
92 $(top_builddir)/src/lib/util/libgnunetutil.la 92 $(top_builddir)/src/lib/util/libgnunetutil.la
93test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) 93test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 52dec5726..a8738997f 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -23,5 +23,6 @@ SUBDIRS = \
23 seti \ 23 seti \
24 setu \ 24 setu \
25 regex \ 25 regex \
26 revocation 26 revocation \
27 vpn
27 28
diff --git a/src/vpn/.gitignore b/src/service/vpn/.gitignore
index b76ea0f93..b76ea0f93 100644
--- a/src/vpn/.gitignore
+++ b/src/service/vpn/.gitignore
diff --git a/src/vpn/Makefile.am b/src/service/vpn/Makefile.am
index 6fc1bff20..123ec77de 100644
--- a/src/vpn/Makefile.am
+++ b/src/service/vpn/Makefile.am
@@ -27,9 +27,6 @@ libexec_PROGRAMS = \
27 $(VPNBIN) \ 27 $(VPNBIN) \
28 gnunet-service-vpn 28 gnunet-service-vpn
29 29
30bin_PROGRAMS = \
31 gnunet-vpn
32
33gnunet_helper_vpn_SOURCES = \ 30gnunet_helper_vpn_SOURCES = \
34 gnunet-helper-vpn.c 31 gnunet-helper-vpn.c
35gnunet_helper_vpn_LDADD = \ 32gnunet_helper_vpn_LDADD = \
@@ -47,13 +44,6 @@ gnunet_service_vpn_LDADD = \
47gnunet_service_vpn_CFLAGS = \ 44gnunet_service_vpn_CFLAGS = \
48 -I$(top_srcdir)/src/exit $(CFLAGS) 45 -I$(top_srcdir)/src/exit $(CFLAGS)
49 46
50gnunet_vpn_SOURCES = \
51 gnunet-vpn.c
52gnunet_vpn_LDADD = \
53 libgnunetvpn.la \
54 $(top_builddir)/src/lib/util/libgnunetutil.la \
55 $(GN_LIBINTL)
56
57libgnunetvpn_la_SOURCES = \ 47libgnunetvpn_la_SOURCES = \
58 vpn_api.c vpn.h 48 vpn_api.c vpn.h
59libgnunetvpn_la_LIBADD = \ 49libgnunetvpn_la_LIBADD = \
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/service/vpn/gnunet-helper-vpn.c
index 30901da45..30901da45 100644
--- a/src/vpn/gnunet-helper-vpn.c
+++ b/src/service/vpn/gnunet-helper-vpn.c
diff --git a/src/vpn/gnunet-service-vpn.c b/src/service/vpn/gnunet-service-vpn.c
index aa3f6ffe3..aa3f6ffe3 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/service/vpn/gnunet-service-vpn.c
diff --git a/src/vpn/meson.build b/src/service/vpn/meson.build
index e77b88432..e77b88432 100644
--- a/src/vpn/meson.build
+++ b/src/service/vpn/meson.build
diff --git a/src/vpn/tests/expected b/src/service/vpn/tests/expected
index 26ed82af9..26ed82af9 100644
--- a/src/vpn/tests/expected
+++ b/src/service/vpn/tests/expected
Binary files differ
diff --git a/src/vpn/tests/ping b/src/service/vpn/tests/ping
index ccc855538..ccc855538 100644
--- a/src/vpn/tests/ping
+++ b/src/service/vpn/tests/ping
Binary files differ
diff --git a/src/vpn/tests/test-helper-icmp.sh b/src/service/vpn/tests/test-helper-icmp.sh
index 2d0c8425a..2d0c8425a 100755
--- a/src/vpn/tests/test-helper-icmp.sh
+++ b/src/service/vpn/tests/test-helper-icmp.sh
diff --git a/src/vpn/tests/test-helper-ifaddr.sh b/src/service/vpn/tests/test-helper-ifaddr.sh
index b8fde999d..b8fde999d 100755
--- a/src/vpn/tests/test-helper-ifaddr.sh
+++ b/src/service/vpn/tests/test-helper-ifaddr.sh
diff --git a/src/vpn/vpn.conf.in b/src/service/vpn/vpn.conf.in
index c0f4c59ed..c0f4c59ed 100644
--- a/src/vpn/vpn.conf.in
+++ b/src/service/vpn/vpn.conf.in
diff --git a/src/vpn/vpn.h b/src/service/vpn/vpn.h
index 77cfd34e6..77cfd34e6 100644
--- a/src/vpn/vpn.h
+++ b/src/service/vpn/vpn.h
diff --git a/src/vpn/vpn_api.c b/src/service/vpn/vpn_api.c
index 8a3464786..8a3464786 100644
--- a/src/vpn/vpn_api.c
+++ b/src/service/vpn/vpn_api.c
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-26 14:27:06 +0000