aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/nat/gnunet-nat-client-script.sh (renamed from src/transport/gnunet-nat-client-script.sh)0
-rw-r--r--src/nat/gnunet-nat-client-windows.c (renamed from src/transport/gnunet-nat-client-windows.c)0
-rw-r--r--src/nat/gnunet-nat-client.c (renamed from src/transport/gnunet-nat-client.c)0
-rwxr-xr-xsrc/nat/gnunet-nat-server-script.sh (renamed from src/transport/gnunet-nat-server-script.sh)0
-rw-r--r--src/nat/gnunet-nat-server-windows.c (renamed from src/transport/gnunet-nat-server-windows.c)0
-rw-r--r--src/nat/gnunet-nat-server.c (renamed from src/transport/gnunet-nat-server.c)0
-rw-r--r--src/transport/Makefile.am31
7 files changed, 4 insertions, 27 deletions
diff --git a/src/transport/gnunet-nat-client-script.sh b/src/nat/gnunet-nat-client-script.sh
index 4e4ccafad..4e4ccafad 100755
--- a/src/transport/gnunet-nat-client-script.sh
+++ b/src/nat/gnunet-nat-client-script.sh
diff --git a/src/transport/gnunet-nat-client-windows.c b/src/nat/gnunet-nat-client-windows.c
index 2e7c8a86e..2e7c8a86e 100644
--- a/src/transport/gnunet-nat-client-windows.c
+++ b/src/nat/gnunet-nat-client-windows.c
diff --git a/src/transport/gnunet-nat-client.c b/src/nat/gnunet-nat-client.c
index 3e35aa8f4..3e35aa8f4 100644
--- a/src/transport/gnunet-nat-client.c
+++ b/src/nat/gnunet-nat-client.c
diff --git a/src/transport/gnunet-nat-server-script.sh b/src/nat/gnunet-nat-server-script.sh
index 42a8e639a..42a8e639a 100755
--- a/src/transport/gnunet-nat-server-script.sh
+++ b/src/nat/gnunet-nat-server-script.sh
diff --git a/src/transport/gnunet-nat-server-windows.c b/src/nat/gnunet-nat-server-windows.c
index 8cfad2ff2..8cfad2ff2 100644
--- a/src/transport/gnunet-nat-server-windows.c
+++ b/src/nat/gnunet-nat-server-windows.c
diff --git a/src/transport/gnunet-nat-server.c b/src/nat/gnunet-nat-server.c
index ab99b5f28..ab99b5f28 100644
--- a/src/transport/gnunet-nat-server.c
+++ b/src/nat/gnunet-nat-server.c
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index e8ed46aad..97c17d615 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -2,15 +2,6 @@ INCLUDES = -I$(top_srcdir)/src/include
2 2
3plugindir = $(libdir)/gnunet 3plugindir = $(libdir)/gnunet
4 4
5if MINGW
6 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
7 NATBIN = gnunet-nat-server gnunet-nat-client
8 NATSERVER = gnunet-nat-server-windows.c
9 NATCLIENT = gnunet-nat-client-windows.c
10else
11 NATSERVER = gnunet-nat-server.c
12 NATCLIENT = gnunet-nat-client.c
13endif
14 5
15if HAVE_MHD 6if HAVE_MHD
16if HAVE_EXPERIMENTAL 7if HAVE_EXPERIMENTAL
@@ -53,15 +44,6 @@ UNIX_QUOTA_TEST = test_quota_compliance_unix \
53 test_quota_compliance_unix_asymmetric_recv_constant 44 test_quota_compliance_unix_asymmetric_recv_constant
54endif 45endif
55 46
56if LINUX
57NATBIN = gnunet-nat-server gnunet-nat-client
58install-exec-hook:
59 chown root:root $(bindir)/gnunet-nat-server $(bindir)/gnunet-nat-client $(bindir)/gnunet-transport-wlan-helper || true
60 chmod u+s $(bindir)/gnunet-nat-server $(bindir)/gnunet-nat-client $(bindir)/gnunet-transport-wlan-helper || true
61else
62install-exec-hook:
63endif
64
65#noinst_PROGRAMS = ${check_PROGRAMS} 47#noinst_PROGRAMS = ${check_PROGRAMS}
66 48
67lib_LTLIBRARIES = \ 49lib_LTLIBRARIES = \
@@ -96,15 +78,12 @@ libgnunettransport_la_LDFLAGS = \
96bin_PROGRAMS = \ 78bin_PROGRAMS = \
97 gnunet-transport \ 79 gnunet-transport \
98 $(WLAN_BIN) \ 80 $(WLAN_BIN) \
99 gnunet-service-transport $(NATBIN) \ 81 gnunet-service-transport \
100 $(WLAN_BIN_DUMMY) 82 $(WLAN_BIN_DUMMY)
101 83
102bin_SCRIPTS = \ 84bin_SCRIPTS = \
103 gnunet-transport-certificate-creation 85 gnunet-transport-certificate-creation
104 86
105gnunet_nat_server_SOURCES = \
106 $(NATSERVER)
107
108 87
109gnunet_transport_wlan_helper_SOURCES = \ 88gnunet_transport_wlan_helper_SOURCES = \
110 wlan/byteorder.h \ 89 wlan/byteorder.h \
@@ -127,9 +106,6 @@ gnunet_transport_wlan_helper_LDADD = \
127gnunet_transport_wlan_helper_dummy_LDADD = \ 106gnunet_transport_wlan_helper_dummy_LDADD = \
128 $(top_builddir)/src/util/libgnunetutil.la 107 $(top_builddir)/src/util/libgnunetutil.la
129 108
130gnunet_nat_client_SOURCES = \
131 $(NATCLIENT)
132
133gnunet_transport_SOURCES = \ 109gnunet_transport_SOURCES = \
134 gnunet-transport.c 110 gnunet-transport.c
135gnunet_transport_LDADD = \ 111gnunet_transport_LDADD = \
@@ -161,7 +137,6 @@ plugin_LTLIBRARIES = \
161 $(HTTPS_PLUGIN_LA) \ 137 $(HTTPS_PLUGIN_LA) \
162 $(WLAN_PLUGIN_LA) \ 138 $(WLAN_PLUGIN_LA) \
163 libgnunet_plugin_transport_template.la 139 libgnunet_plugin_transport_template.la
164# TODO: add nat, etc.
165 140
166libgnunet_plugin_transport_tcp_la_SOURCES = \ 141libgnunet_plugin_transport_tcp_la_SOURCES = \
167 plugin_transport_tcp.c 142 plugin_transport_tcp.c
@@ -197,6 +172,7 @@ libgnunet_plugin_transport_udp_la_LIBADD = \
197 $(top_builddir)/src/hello/libgnunethello.la \ 172 $(top_builddir)/src/hello/libgnunethello.la \
198 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 173 $(top_builddir)/src/statistics/libgnunetstatistics.la \
199 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ 174 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
175 $(top_builddir)/src/nat/libgnunetnat.la \
200 $(top_builddir)/src/util/libgnunetutil.la 176 $(top_builddir)/src/util/libgnunetutil.la
201libgnunet_plugin_transport_udp_la_LDFLAGS = \ 177libgnunet_plugin_transport_udp_la_LDFLAGS = \
202 $(GN_PLUGIN_LDFLAGS) 178 $(GN_PLUGIN_LDFLAGS)
@@ -218,6 +194,7 @@ libgnunet_plugin_transport_http_la_LIBADD = \
218 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 194 $(top_builddir)/src/statistics/libgnunetstatistics.la \
219 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ 195 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
220 @LIBCURL@ \ 196 @LIBCURL@ \
197 $(top_builddir)/src/nat/libgnunetnat.la \
221 $(top_builddir)/src/util/libgnunetutil.la 198 $(top_builddir)/src/util/libgnunetutil.la
222libgnunet_plugin_transport_http_la_LDFLAGS = \ 199libgnunet_plugin_transport_http_la_LDFLAGS = \
223 $(GN_LIBMHD) \ 200 $(GN_LIBMHD) \
@@ -234,6 +211,7 @@ libgnunet_plugin_transport_https_la_LIBADD = \
234 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 211 $(top_builddir)/src/statistics/libgnunetstatistics.la \
235 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ 212 $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
236 @LIBCURL@ \ 213 @LIBCURL@ \
214 $(top_builddir)/src/nat/libgnunetnat.la \
237 $(top_builddir)/src/util/libgnunetutil.la 215 $(top_builddir)/src/util/libgnunetutil.la
238libgnunet_plugin_transport_https_la_LDFLAGS = \ 216libgnunet_plugin_transport_https_la_LDFLAGS = \
239 $(GN_LIBMHD) \ 217 $(GN_LIBMHD) \
@@ -277,7 +255,6 @@ check_PROGRAMS = \
277 $(WLAN_API_TEST) \ 255 $(WLAN_API_TEST) \
278 $(WLAN_REL_TEST) \ 256 $(WLAN_REL_TEST) \
279 $(WLAN_UREL_TEST) 257 $(WLAN_UREL_TEST)
280# TODO: add tests for nat, etc.
281 258
282if ENABLE_TEST_RUN 259if ENABLE_TEST_RUN
283TESTS = \ 260TESTS = \