commit df59c19d712a4339f7c75c76942c1a4f86bf2e5b parent 4e28833d9ecb6bbd933b770eae2b712fc0d80286 Author: Martin Schanzenbach <schanzen@gnunet.org> Date: Thu, 19 Oct 2023 10:26:16 +0200 BUILD: Move vpn to service Diffstat:
23 files changed, 92 insertions(+), 77 deletions(-)
diff --git a/configure.ac b/configure.ac @@ -1289,6 +1289,8 @@ src/service/topology/Makefile src/service/transport/Makefile src/service/transport/transport.conf src/service/util/Makefile +src/service/vpn/Makefile +src/service/vpn/vpn.conf src/rest-plugin/Makefile src/rest-plugin/identity/Makefile src/rest-plugin/rest/Makefile @@ -1306,6 +1308,7 @@ src/cli/nse/Makefile src/cli/revocation/Makefile src/cli/statistics/Makefile src/cli/util/Makefile +src/cli/vpn/Makefile src/contrib/Makefile src/contrib/service/Makefile src/contrib/service/abd/Makefile @@ -1335,8 +1338,6 @@ src/lib/hello/Makefile src/include/Makefile src/include/gnunet_config.h src/pt/Makefile -src/vpn/Makefile -src/vpn/vpn.conf src/zonemaster/Makefile src/zonemaster/zonemaster.conf src/reclaim/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in @@ -29,6 +29,7 @@ src/cli/util/gnunet-resolver.c src/cli/util/gnunet-scrypt.c src/cli/util/gnunet-timeout.c src/cli/util/gnunet-uri.c +src/cli/vpn/gnunet-vpn.c src/contrib/cli/template/gnunet-template.c src/contrib/service/abd/abd_api.c src/contrib/service/abd/abd_serialization.c @@ -491,10 +492,9 @@ src/service/transport/transport_api_cmd_start_peer.c src/service/transport/transport_api_cmd_stop_peer.c src/service/transport/transport_api_traits.c src/service/util/gnunet-service-resolver.c -src/vpn/gnunet-helper-vpn.c -src/vpn/gnunet-service-vpn.c -src/vpn/gnunet-vpn.c -src/vpn/vpn_api.c +src/service/vpn/gnunet-helper-vpn.c +src/service/vpn/gnunet-service-vpn.c +src/service/vpn/vpn_api.c src/zonemaster/gnunet-service-zonemaster.c src/fs/fs_api.h src/include/gnunet_json_lib.h diff --git a/src/Makefile.am b/src/Makefile.am @@ -17,7 +17,6 @@ SUBDIRS = \ rest-plugin \ cli \ contrib \ - vpn \ gns \ zonemaster \ $(CONVERSATION_DIR) \ diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am @@ -11,4 +11,5 @@ SUBDIRS = \ namecache \ namestore \ revocation \ + vpn \ cadet diff --git a/src/cli/vpn/.gitignore b/src/cli/vpn/.gitignore @@ -0,0 +1 @@ +gnunet-vpn diff --git a/src/cli/vpn/Makefile.am b/src/cli/vpn/Makefile.am @@ -0,0 +1,22 @@ +# This Makefile.am is in the public domain +AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include + +if USE_COVERAGE + AM_CFLAGS = --coverage -O0 +endif + +pkgcfgdir= $(pkgdatadir)/config.d/ + +libexecdir= $(pkglibdir)/libexec/ + +plugindir = $(libdir)/gnunet + +bin_PROGRAMS = \ + gnunet-vpn + +gnunet_vpn_SOURCES = \ + gnunet-vpn.c +gnunet_vpn_LDADD = \ + $(top_builddir)/src/service/vpn/libgnunetvpn.la \ + $(top_builddir)/src/lib/util/libgnunetutil.la \ + $(GN_LIBINTL) diff --git 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 @@ -22,7 +22,7 @@ else LIBIDN2= endif -USE_VPN = $(top_builddir)/src/vpn/libgnunetvpn.la +USE_VPN = $(top_builddir)/src/service/vpn/libgnunetvpn.la if USE_COVERAGE AM_CFLAGS = --coverage -O0 diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am @@ -20,7 +20,7 @@ libexec_PROGRAMS = \ gnunet_daemon_pt_SOURCES = \ gnunet-daemon-pt.c gnunet_daemon_pt_LDADD = \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ + $(top_builddir)/src/service/vpn/libgnunetvpn.la \ $(top_builddir)/src/service/cadet/libgnunetcadet.la \ $(top_builddir)/src/service/dht/libgnunetdht.la \ $(top_builddir)/src/service/dns/libgnunetdns.la \ @@ -63,7 +63,7 @@ test_gns_vpn_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) test_gnunet_vpn_4_over_SOURCES = \ test_gnunet_vpn.c test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) @LIBCURL@ \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ + $(top_builddir)/src/service/vpn/libgnunetvpn.la \ $(top_builddir)/src/service/testing/libgnunettesting.la \ $(top_builddir)/src/lib/util/libgnunetutil.la test_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) test_gnunet_vpn_6_over_SOURCES = \ test_gnunet_vpn.c test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) @LIBCURL@ \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ + $(top_builddir)/src/service/vpn/libgnunetvpn.la \ $(top_builddir)/src/service/testing/libgnunettesting.la \ $(top_builddir)/src/lib/util/libgnunetutil.la test_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) test_gnunet_vpn_4_to_6_SOURCES = \ test_gnunet_vpn.c test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) @LIBCURL@ \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ + $(top_builddir)/src/service/vpn/libgnunetvpn.la \ $(top_builddir)/src/service/testing/libgnunettesting.la \ $(top_builddir)/src/lib/util/libgnunetutil.la test_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) test_gnunet_vpn_6_to_4_SOURCES = \ test_gnunet_vpn.c test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) @LIBCURL@ \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ + $(top_builddir)/src/service/vpn/libgnunetvpn.la \ $(top_builddir)/src/service/testing/libgnunettesting.la \ $(top_builddir)/src/lib/util/libgnunetutil.la test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) diff --git a/src/service/Makefile.am b/src/service/Makefile.am @@ -23,5 +23,6 @@ SUBDIRS = \ seti \ setu \ regex \ - revocation + revocation \ + vpn diff --git a/src/vpn/.gitignore b/src/service/vpn/.gitignore diff --git a/src/service/vpn/Makefile.am b/src/service/vpn/Makefile.am @@ -0,0 +1,53 @@ +# This Makefile.am is in the public domain +AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include + +if USE_COVERAGE + AM_CFLAGS = --coverage -O0 +endif + +pkgcfgdir= $(pkgdatadir)/config.d/ + +libexecdir= $(pkglibdir)/libexec/ + +plugindir = $(libdir)/gnunet + +pkgcfg_DATA = \ + vpn.conf + +if LINUX +VPNBIN = gnunet-helper-vpn +endif + + +lib_LTLIBRARIES = \ + libgnunetvpn.la + + +libexec_PROGRAMS = \ + $(VPNBIN) \ + gnunet-service-vpn + +gnunet_helper_vpn_SOURCES = \ + gnunet-helper-vpn.c +gnunet_helper_vpn_LDADD = \ + $(top_builddir)/src/lib/util/libgnunetutil.la \ + $(GN_LIBINTL) + +gnunet_service_vpn_SOURCES = \ + gnunet-service-vpn.c +gnunet_service_vpn_LDADD = \ + $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/lib/util/libgnunetutil.la \ + $(top_builddir)/src/service/cadet/libgnunetcadet.la \ + $(top_builddir)/src/service/regex/libgnunetregex.la \ + $(GN_LIBINTL) +gnunet_service_vpn_CFLAGS = \ + -I$(top_srcdir)/src/exit $(CFLAGS) + +libgnunetvpn_la_SOURCES = \ + vpn_api.c vpn.h +libgnunetvpn_la_LIBADD = \ + $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB) +libgnunetvpn_la_LDFLAGS = \ + $(GN_LIBINTL) \ + $(GN_LIB_LDFLAGS) diff --git 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 diff --git a/src/vpn/meson.build b/src/service/vpn/meson.build diff --git 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 Binary files differ. diff --git 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 diff --git 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 diff --git a/src/vpn/vpn_api.c b/src/service/vpn/vpn_api.c diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am @@ -1,63 +0,0 @@ -# This Makefile.am is in the public domain -AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include - -if USE_COVERAGE - AM_CFLAGS = --coverage -O0 -endif - -pkgcfgdir= $(pkgdatadir)/config.d/ - -libexecdir= $(pkglibdir)/libexec/ - -plugindir = $(libdir)/gnunet - -pkgcfg_DATA = \ - vpn.conf - -if LINUX -VPNBIN = gnunet-helper-vpn -endif - - -lib_LTLIBRARIES = \ - libgnunetvpn.la - - -libexec_PROGRAMS = \ - $(VPNBIN) \ - gnunet-service-vpn - -bin_PROGRAMS = \ - gnunet-vpn - -gnunet_helper_vpn_SOURCES = \ - gnunet-helper-vpn.c -gnunet_helper_vpn_LDADD = \ - $(top_builddir)/src/lib/util/libgnunetutil.la \ - $(GN_LIBINTL) - -gnunet_service_vpn_SOURCES = \ - gnunet-service-vpn.c -gnunet_service_vpn_LDADD = \ - $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/lib/util/libgnunetutil.la \ - $(top_builddir)/src/service/cadet/libgnunetcadet.la \ - $(top_builddir)/src/service/regex/libgnunetregex.la \ - $(GN_LIBINTL) -gnunet_service_vpn_CFLAGS = \ - -I$(top_srcdir)/src/exit $(CFLAGS) - -gnunet_vpn_SOURCES = \ - gnunet-vpn.c -gnunet_vpn_LDADD = \ - libgnunetvpn.la \ - $(top_builddir)/src/lib/util/libgnunetutil.la \ - $(GN_LIBINTL) - -libgnunetvpn_la_SOURCES = \ - vpn_api.c vpn.h -libgnunetvpn_la_LIBADD = \ - $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB) -libgnunetvpn_la_LDFLAGS = \ - $(GN_LIBINTL) \ - $(GN_LIB_LDFLAGS)