aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-06-25 19:52:15 +0200
committerChristian Grothoff <christian@grothoff.org>2018-06-25 19:52:15 +0200
commit4a1f21163c041e673604813a8c48c14bf9f20222 (patch)
treef8c74a2f6a88c51115447115a5bfe747e7647583
parenta4186fc2fd00b3fe2899bffcdbbbf8fead31115f (diff)
downloadgnunet-4a1f21163c041e673604813a8c48c14bf9f20222.tar.gz
gnunet-4a1f21163c041e673604813a8c48c14bf9f20222.zip
move dns ops again, 2nd try
-rw-r--r--configure.ac1
-rw-r--r--po/POTFILES.in132
-rw-r--r--src/Makefile.am1
-rw-r--r--src/dns/Makefile.am34
-rw-r--r--src/util/Makefile.am25
-rw-r--r--src/util/dnsparser.c (renamed from src/dns/dnsparser.c)0
-rw-r--r--src/util/dnsstub.c (renamed from src/dns/dnsstub.c)0
-rw-r--r--src/util/regex.c (renamed from src/tun/regex.c)0
-rw-r--r--src/util/test_regex.c (renamed from src/tun/test_regex.c)0
-rw-r--r--src/util/test_tun.c (renamed from src/tun/test_tun.c)0
-rw-r--r--src/util/tun.c (renamed from src/tun/tun.c)0
11 files changed, 89 insertions, 104 deletions
diff --git a/configure.ac b/configure.ac
index c8e316416..3d68ee9b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1722,7 +1722,6 @@ src/testing/Makefile
1722src/topology/Makefile 1722src/topology/Makefile
1723src/transport/Makefile 1723src/transport/Makefile
1724src/transport/transport.conf 1724src/transport/transport.conf
1725src/tun/Makefile
1726src/util/Makefile 1725src/util/Makefile
1727src/util/resolver.conf 1726src/util/resolver.conf
1728src/vpn/Makefile 1727src/vpn/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index de6bd90e4..38fa52508 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,21 +4,13 @@ src/arm/arm_monitor_api.c
4src/arm/gnunet-arm.c 4src/arm/gnunet-arm.c
5src/arm/gnunet-service-arm.c 5src/arm/gnunet-service-arm.c
6src/arm/mockup-service.c 6src/arm/mockup-service.c
7src/ats-tests/ats-testing-experiment.c
8src/ats-tests/ats-testing-log.c
9src/ats-tests/ats-testing-preferences.c
10src/ats-tests/ats-testing-traffic.c
11src/ats-tests/ats-testing.c
12src/ats-tests/gnunet-ats-sim.c
13src/ats-tests/gnunet-solver-eval.c
14src/ats-tool/gnunet-ats.c
15src/ats/ats_api_connectivity.c 7src/ats/ats_api_connectivity.c
16src/ats/ats_api_performance.c 8src/ats/ats_api_performance.c
17src/ats/ats_api_scanner.c 9src/ats/ats_api_scanner.c
18src/ats/ats_api_scheduling.c 10src/ats/ats_api_scheduling.c
19src/ats/gnunet-ats-solver-eval.c 11src/ats/gnunet-ats-solver-eval.c
20src/ats/gnunet-service-ats.c
21src/ats/gnunet-service-ats_addresses.c 12src/ats/gnunet-service-ats_addresses.c
13src/ats/gnunet-service-ats.c
22src/ats/gnunet-service-ats_connectivity.c 14src/ats/gnunet-service-ats_connectivity.c
23src/ats/gnunet-service-ats_normalization.c 15src/ats/gnunet-service-ats_normalization.c
24src/ats/gnunet-service-ats_performance.c 16src/ats/gnunet-service-ats_performance.c
@@ -29,6 +21,14 @@ src/ats/gnunet-service-ats_scheduling.c
29src/ats/plugin_ats_mlp.c 21src/ats/plugin_ats_mlp.c
30src/ats/plugin_ats_proportional.c 22src/ats/plugin_ats_proportional.c
31src/ats/plugin_ats_ril.c 23src/ats/plugin_ats_ril.c
24src/ats-tests/ats-testing.c
25src/ats-tests/ats-testing-experiment.c
26src/ats-tests/ats-testing-log.c
27src/ats-tests/ats-testing-preferences.c
28src/ats-tests/ats-testing-traffic.c
29src/ats-tests/gnunet-ats-sim.c
30src/ats-tests/gnunet-solver-eval.c
31src/ats-tool/gnunet-ats.c
32src/auction/gnunet-auction-create.c 32src/auction/gnunet-auction-create.c
33src/auction/gnunet-auction-info.c 33src/auction/gnunet-auction-info.c
34src/auction/gnunet-auction-join.c 34src/auction/gnunet-auction-join.c
@@ -40,8 +40,8 @@ src/block/plugin_block_test.c
40src/cadet/cadet_api.c 40src/cadet/cadet_api.c
41src/cadet/cadet_test_lib.c 41src/cadet/cadet_test_lib.c
42src/cadet/desirability_table.c 42src/cadet/desirability_table.c
43src/cadet/gnunet-cadet-profiler.c
44src/cadet/gnunet-cadet.c 43src/cadet/gnunet-cadet.c
44src/cadet/gnunet-cadet-profiler.c
45src/cadet/gnunet-service-cadet.c 45src/cadet/gnunet-service-cadet.c
46src/cadet/gnunet-service-cadet_channel.c 46src/cadet/gnunet-service-cadet_channel.c
47src/cadet/gnunet-service-cadet_connection.c 47src/cadet/gnunet-service-cadet_connection.c
@@ -57,15 +57,15 @@ src/consensus/gnunet-service-consensus.c
57src/consensus/plugin_block_consensus.c 57src/consensus/plugin_block_consensus.c
58src/conversation/conversation_api.c 58src/conversation/conversation_api.c
59src/conversation/conversation_api_call.c 59src/conversation/conversation_api_call.c
60src/conversation/gnunet-conversation-test.c
61src/conversation/gnunet-conversation.c 60src/conversation/gnunet-conversation.c
62src/conversation/gnunet-helper-audio-playback-gst.c 61src/conversation/gnunet-conversation-test.c
62src/conversation/gnunet_gst.c
63src/conversation/gnunet_gst_test.c
63src/conversation/gnunet-helper-audio-playback.c 64src/conversation/gnunet-helper-audio-playback.c
64src/conversation/gnunet-helper-audio-record-gst.c 65src/conversation/gnunet-helper-audio-playback-gst.c
65src/conversation/gnunet-helper-audio-record.c 66src/conversation/gnunet-helper-audio-record.c
67src/conversation/gnunet-helper-audio-record-gst.c
66src/conversation/gnunet-service-conversation.c 68src/conversation/gnunet-service-conversation.c
67src/conversation/gnunet_gst.c
68src/conversation/gnunet_gst_test.c
69src/conversation/microphone.c 69src/conversation/microphone.c
70src/conversation/plugin_gnsrecord_conversation.c 70src/conversation/plugin_gnsrecord_conversation.c
71src/conversation/speaker.c 71src/conversation/speaker.c
@@ -102,6 +102,7 @@ src/dht/dht_api.c
102src/dht/dht_test_lib.c 102src/dht/dht_test_lib.c
103src/dht/gnunet-dht-get.c 103src/dht/gnunet-dht-get.c
104src/dht/gnunet-dht-monitor.c 104src/dht/gnunet-dht-monitor.c
105src/dht/gnunet_dht_profiler.c
105src/dht/gnunet-dht-put.c 106src/dht/gnunet-dht-put.c
106src/dht/gnunet-service-dht.c 107src/dht/gnunet-service-dht.c
107src/dht/gnunet-service-dht_clients.c 108src/dht/gnunet-service-dht_clients.c
@@ -110,11 +111,8 @@ src/dht/gnunet-service-dht_hello.c
110src/dht/gnunet-service-dht_neighbours.c 111src/dht/gnunet-service-dht_neighbours.c
111src/dht/gnunet-service-dht_nse.c 112src/dht/gnunet-service-dht_nse.c
112src/dht/gnunet-service-dht_routing.c 113src/dht/gnunet-service-dht_routing.c
113src/dht/gnunet_dht_profiler.c
114src/dht/plugin_block_dht.c 114src/dht/plugin_block_dht.c
115src/dns/dns_api.c 115src/dns/dns_api.c
116src/dns/dnsparser.c
117src/dns/dnsstub.c
118src/dns/gnunet-dns-monitor.c 116src/dns/gnunet-dns-monitor.c
119src/dns/gnunet-dns-redirector.c 117src/dns/gnunet-dns-redirector.c
120src/dns/gnunet-helper-dns.c 118src/dns/gnunet-helper-dns.c
@@ -126,8 +124,8 @@ src/dv/gnunet-dv.c
126src/dv/gnunet-service-dv.c 124src/dv/gnunet-service-dv.c
127src/dv/plugin_transport_dv.c 125src/dv/plugin_transport_dv.c
128src/exit/gnunet-daemon-exit.c 126src/exit/gnunet-daemon-exit.c
129src/exit/gnunet-helper-exit-windows.c
130src/exit/gnunet-helper-exit.c 127src/exit/gnunet-helper-exit.c
128src/exit/gnunet-helper-exit-windows.c
131src/fragmentation/defragmentation.c 129src/fragmentation/defragmentation.c
132src/fragmentation/fragmentation.c 130src/fragmentation/fragmentation.c
133src/fs/fs_api.c 131src/fs/fs_api.c
@@ -152,8 +150,8 @@ src/fs/gnunet-auto-share.c
152src/fs/gnunet-daemon-fsprofiler.c 150src/fs/gnunet-daemon-fsprofiler.c
153src/fs/gnunet-directory.c 151src/fs/gnunet-directory.c
154src/fs/gnunet-download.c 152src/fs/gnunet-download.c
155src/fs/gnunet-fs-profiler.c
156src/fs/gnunet-fs.c 153src/fs/gnunet-fs.c
154src/fs/gnunet-fs-profiler.c
157src/fs/gnunet-helper-fs-publish.c 155src/fs/gnunet-helper-fs-publish.c
158src/fs/gnunet-publish.c 156src/fs/gnunet-publish.c
159src/fs/gnunet-search.c 157src/fs/gnunet-search.c
@@ -173,10 +171,10 @@ src/gns/gns_tld_api.c
173src/gns/gnunet-bcd.c 171src/gns/gnunet-bcd.c
174src/gns/gnunet-dns2gns.c 172src/gns/gnunet-dns2gns.c
175src/gns/gnunet-gns-benchmark.c 173src/gns/gnunet-gns-benchmark.c
174src/gns/gnunet-gns.c
176src/gns/gnunet-gns-helper-service-w32.c 175src/gns/gnunet-gns-helper-service-w32.c
177src/gns/gnunet-gns-import.c 176src/gns/gnunet-gns-import.c
178src/gns/gnunet-gns-proxy.c 177src/gns/gnunet-gns-proxy.c
179src/gns/gnunet-gns.c
180src/gns/gnunet-service-gns.c 178src/gns/gnunet-service-gns.c
181src/gns/gnunet-service-gns_interceptor.c 179src/gns/gnunet-service-gns_interceptor.c
182src/gns/gnunet-service-gns_resolver.c 180src/gns/gnunet-service-gns_resolver.c
@@ -185,15 +183,15 @@ src/gns/nss/nss_gns_query.c
185src/gns/plugin_block_gns.c 183src/gns/plugin_block_gns.c
186src/gns/plugin_gnsrecord_gns.c 184src/gns/plugin_gnsrecord_gns.c
187src/gns/plugin_rest_gns.c 185src/gns/plugin_rest_gns.c
188src/gns/w32nsp-install.c
189src/gns/w32nsp-resolve.c
190src/gns/w32nsp-uninstall.c
191src/gns/w32nsp.c
192src/gnsrecord/gnsrecord.c 186src/gnsrecord/gnsrecord.c
193src/gnsrecord/gnsrecord_crypto.c 187src/gnsrecord/gnsrecord_crypto.c
194src/gnsrecord/gnsrecord_misc.c 188src/gnsrecord/gnsrecord_misc.c
195src/gnsrecord/gnsrecord_serialization.c 189src/gnsrecord/gnsrecord_serialization.c
196src/gnsrecord/plugin_gnsrecord_dns.c 190src/gnsrecord/plugin_gnsrecord_dns.c
191src/gns/w32nsp.c
192src/gns/w32nsp-install.c
193src/gns/w32nsp-resolve.c
194src/gns/w32nsp-uninstall.c
197src/hello/address.c 195src/hello/address.c
198src/hello/gnunet-hello.c 196src/hello/gnunet-hello.c
199src/hello/hello.c 197src/hello/hello.c
@@ -202,6 +200,11 @@ src/hostlist/gnunet-daemon-hostlist_client.c
202src/hostlist/gnunet-daemon-hostlist_server.c 200src/hostlist/gnunet-daemon-hostlist_server.c
203src/identity-attribute/identity_attribute.c 201src/identity-attribute/identity_attribute.c
204src/identity-attribute/plugin_identity_attribute_gnuid.c 202src/identity-attribute/plugin_identity_attribute_gnuid.c
203src/identity/gnunet-identity.c
204src/identity/gnunet-service-identity.c
205src/identity/identity_api.c
206src/identity/identity_api_lookup.c
207src/identity/plugin_rest_identity.c
205src/identity-provider/gnunet-idp.c 208src/identity-provider/gnunet-idp.c
206src/identity-provider/gnunet-service-identity-provider.c 209src/identity-provider/gnunet-service-identity-provider.c
207src/identity-provider/identity_provider_api.c 210src/identity-provider/identity_provider_api.c
@@ -210,20 +213,15 @@ src/identity-provider/plugin_gnsrecord_identity_provider.c
210src/identity-provider/plugin_identity_provider_sqlite.c 213src/identity-provider/plugin_identity_provider_sqlite.c
211src/identity-provider/plugin_rest_identity_provider.c 214src/identity-provider/plugin_rest_identity_provider.c
212src/identity-provider/plugin_rest_openid_connect.c 215src/identity-provider/plugin_rest_openid_connect.c
213src/identity/gnunet-identity.c
214src/identity/gnunet-service-identity.c
215src/identity/identity_api.c
216src/identity/identity_api_lookup.c
217src/identity/plugin_rest_identity.c
218src/json/json.c
219src/json/json_generator.c
220src/json/json_helper.c
221src/json/json_mhd.c
222src/jsonapi/jsonapi.c 216src/jsonapi/jsonapi.c
223src/jsonapi/jsonapi_document.c 217src/jsonapi/jsonapi_document.c
224src/jsonapi/jsonapi_error.c 218src/jsonapi/jsonapi_error.c
225src/jsonapi/jsonapi_relationship.c 219src/jsonapi/jsonapi_relationship.c
226src/jsonapi/jsonapi_resource.c 220src/jsonapi/jsonapi_resource.c
221src/json/json.c
222src/json/json_generator.c
223src/json/json_helper.c
224src/json/json_mhd.c
227src/multicast/gnunet-multicast.c 225src/multicast/gnunet-multicast.c
228src/multicast/gnunet-service-multicast.c 226src/multicast/gnunet-service-multicast.c
229src/multicast/multicast_api.c 227src/multicast/multicast_api.c
@@ -237,8 +235,8 @@ src/namecache/namecache_api.c
237src/namecache/plugin_namecache_flat.c 235src/namecache/plugin_namecache_flat.c
238src/namecache/plugin_namecache_postgres.c 236src/namecache/plugin_namecache_postgres.c
239src/namecache/plugin_namecache_sqlite.c 237src/namecache/plugin_namecache_sqlite.c
240src/namestore/gnunet-namestore-fcfsd.c
241src/namestore/gnunet-namestore.c 238src/namestore/gnunet-namestore.c
239src/namestore/gnunet-namestore-fcfsd.c
242src/namestore/gnunet-service-namestore.c 240src/namestore/gnunet-service-namestore.c
243src/namestore/gnunet-zoneimport.c 241src/namestore/gnunet-zoneimport.c
244src/namestore/namestore_api.c 242src/namestore/namestore_api.c
@@ -254,10 +252,10 @@ src/nat-auto/gnunet-service-nat-auto.c
254src/nat-auto/gnunet-service-nat-auto_legacy.c 252src/nat-auto/gnunet-service-nat-auto_legacy.c
255src/nat-auto/nat_auto_api.c 253src/nat-auto/nat_auto_api.c
256src/nat-auto/nat_auto_api_test.c 254src/nat-auto/nat_auto_api_test.c
257src/nat/gnunet-helper-nat-client-windows.c
258src/nat/gnunet-helper-nat-client.c 255src/nat/gnunet-helper-nat-client.c
259src/nat/gnunet-helper-nat-server-windows.c 256src/nat/gnunet-helper-nat-client-windows.c
260src/nat/gnunet-helper-nat-server.c 257src/nat/gnunet-helper-nat-server.c
258src/nat/gnunet-helper-nat-server-windows.c
261src/nat/gnunet-nat.c 259src/nat/gnunet-nat.c
262src/nat/gnunet-service-nat.c 260src/nat/gnunet-service-nat.c
263src/nat/gnunet-service-nat_externalip.c 261src/nat/gnunet-service-nat_externalip.c
@@ -266,15 +264,15 @@ src/nat/gnunet-service-nat_mini.c
266src/nat/gnunet-service-nat_stun.c 264src/nat/gnunet-service-nat_stun.c
267src/nat/nat_api.c 265src/nat/nat_api.c
268src/nat/nat_api_stun.c 266src/nat/nat_api_stun.c
269src/nse/gnunet-nse-profiler.c
270src/nse/gnunet-nse.c 267src/nse/gnunet-nse.c
268src/nse/gnunet-nse-profiler.c
271src/nse/gnunet-service-nse.c 269src/nse/gnunet-service-nse.c
272src/nse/nse_api.c 270src/nse/nse_api.c
273src/peerinfo-tool/gnunet-peerinfo.c
274src/peerinfo-tool/gnunet-peerinfo_plugins.c
275src/peerinfo/gnunet-service-peerinfo.c 271src/peerinfo/gnunet-service-peerinfo.c
276src/peerinfo/peerinfo_api.c 272src/peerinfo/peerinfo_api.c
277src/peerinfo/peerinfo_api_notify.c 273src/peerinfo/peerinfo_api_notify.c
274src/peerinfo-tool/gnunet-peerinfo.c
275src/peerinfo-tool/gnunet-peerinfo_plugins.c
278src/peerstore/gnunet-peerstore.c 276src/peerstore/gnunet-peerstore.c
279src/peerstore/gnunet-service-peerstore.c 277src/peerstore/gnunet-service-peerstore.c
280src/peerstore/peerstore_api.c 278src/peerstore/peerstore_api.c
@@ -319,20 +317,20 @@ src/revocation/gnunet-revocation.c
319src/revocation/gnunet-service-revocation.c 317src/revocation/gnunet-service-revocation.c
320src/revocation/plugin_block_revocation.c 318src/revocation/plugin_block_revocation.c
321src/revocation/revocation_api.c 319src/revocation/revocation_api.c
322src/rps/gnunet-rps-profiler.c
323src/rps/gnunet-rps.c 320src/rps/gnunet-rps.c
321src/rps/gnunet-rps-profiler.c
324src/rps/gnunet-service-rps.c 322src/rps/gnunet-service-rps.c
325src/rps/gnunet-service-rps_custommap.c 323src/rps/gnunet-service-rps_custommap.c
326src/rps/gnunet-service-rps_sampler.c 324src/rps/gnunet-service-rps_sampler.c
327src/rps/gnunet-service-rps_sampler_elem.c 325src/rps/gnunet-service-rps_sampler_elem.c
328src/rps/gnunet-service-rps_view.c 326src/rps/gnunet-service-rps_view.c
329src/rps/rps-test_util.c
330src/rps/rps_api.c 327src/rps/rps_api.c
328src/rps/rps-test_util.c
331src/scalarproduct/gnunet-scalarproduct.c 329src/scalarproduct/gnunet-scalarproduct.c
332src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
333src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
334src/scalarproduct/gnunet-service-scalarproduct_alice.c 330src/scalarproduct/gnunet-service-scalarproduct_alice.c
335src/scalarproduct/gnunet-service-scalarproduct_bob.c 331src/scalarproduct/gnunet-service-scalarproduct_bob.c
332src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
333src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
336src/scalarproduct/scalarproduct_api.c 334src/scalarproduct/scalarproduct_api.c
337src/secretsharing/gnunet-secretsharing-profiler.c 335src/secretsharing/gnunet-secretsharing-profiler.c
338src/secretsharing/gnunet-service-secretsharing.c 336src/secretsharing/gnunet-service-secretsharing.c
@@ -361,16 +359,15 @@ src/statistics/gnunet-statistics.c
361src/statistics/statistics_api.c 359src/statistics/statistics_api.c
362src/template/gnunet-service-template.c 360src/template/gnunet-service-template.c
363src/template/gnunet-template.c 361src/template/gnunet-template.c
364src/testbed-logger/gnunet-service-testbed-logger.c
365src/testbed-logger/testbed_logger_api.c
366src/testbed/generate-underlay-topology.c 362src/testbed/generate-underlay-topology.c
367src/testbed/gnunet-daemon-latency-logger.c 363src/testbed/gnunet-daemon-latency-logger.c
368src/testbed/gnunet-daemon-testbed-blacklist.c 364src/testbed/gnunet-daemon-testbed-blacklist.c
369src/testbed/gnunet-daemon-testbed-underlay.c 365src/testbed/gnunet-daemon-testbed-underlay.c
370src/testbed/gnunet-helper-testbed.c 366src/testbed/gnunet-helper-testbed.c
367src/testbed/gnunet_mpi_test.c
371src/testbed/gnunet-service-test-barriers.c 368src/testbed/gnunet-service-test-barriers.c
372src/testbed/gnunet-service-testbed.c
373src/testbed/gnunet-service-testbed_barriers.c 369src/testbed/gnunet-service-testbed_barriers.c
370src/testbed/gnunet-service-testbed.c
374src/testbed/gnunet-service-testbed_cache.c 371src/testbed/gnunet-service-testbed_cache.c
375src/testbed/gnunet-service-testbed_connectionpool.c 372src/testbed/gnunet-service-testbed_connectionpool.c
376src/testbed/gnunet-service-testbed_cpustatus.c 373src/testbed/gnunet-service-testbed_cpustatus.c
@@ -378,19 +375,20 @@ src/testbed/gnunet-service-testbed_links.c
378src/testbed/gnunet-service-testbed_meminfo.c 375src/testbed/gnunet-service-testbed_meminfo.c
379src/testbed/gnunet-service-testbed_oc.c 376src/testbed/gnunet-service-testbed_oc.c
380src/testbed/gnunet-service-testbed_peers.c 377src/testbed/gnunet-service-testbed_peers.c
381src/testbed/gnunet-testbed-profiler.c
382src/testbed/gnunet_mpi_test.c
383src/testbed/gnunet_testbed_mpi_spawn.c 378src/testbed/gnunet_testbed_mpi_spawn.c
384src/testbed/testbed_api.c 379src/testbed/gnunet-testbed-profiler.c
380src/testbed-logger/gnunet-service-testbed-logger.c
381src/testbed-logger/testbed_logger_api.c
385src/testbed/testbed_api_barriers.c 382src/testbed/testbed_api_barriers.c
383src/testbed/testbed_api.c
386src/testbed/testbed_api_hosts.c 384src/testbed/testbed_api_hosts.c
387src/testbed/testbed_api_operations.c 385src/testbed/testbed_api_operations.c
388src/testbed/testbed_api_peers.c 386src/testbed/testbed_api_peers.c
389src/testbed/testbed_api_sd.c 387src/testbed/testbed_api_sd.c
390src/testbed/testbed_api_services.c 388src/testbed/testbed_api_services.c
391src/testbed/testbed_api_statistics.c 389src/testbed/testbed_api_statistics.c
392src/testbed/testbed_api_test.c
393src/testbed/testbed_api_testbed.c 390src/testbed/testbed_api_testbed.c
391src/testbed/testbed_api_test.c
394src/testbed/testbed_api_topology.c 392src/testbed/testbed_api_topology.c
395src/testbed/testbed_api_underlay.c 393src/testbed/testbed_api_underlay.c
396src/testing/gnunet-testing.c 394src/testing/gnunet-testing.c
@@ -399,28 +397,28 @@ src/testing/testing.c
399src/topology/friends.c 397src/topology/friends.c
400src/topology/gnunet-daemon-topology.c 398src/topology/gnunet-daemon-topology.c
401src/transport/gnunet-helper-transport-bluetooth.c 399src/transport/gnunet-helper-transport-bluetooth.c
402src/transport/gnunet-helper-transport-wlan-dummy.c
403src/transport/gnunet-helper-transport-wlan.c 400src/transport/gnunet-helper-transport-wlan.c
404src/transport/gnunet-service-transport.c 401src/transport/gnunet-helper-transport-wlan-dummy.c
405src/transport/gnunet-service-transport_ats.c 402src/transport/gnunet-service-transport_ats.c
403src/transport/gnunet-service-transport.c
406src/transport/gnunet-service-transport_hello.c 404src/transport/gnunet-service-transport_hello.c
407src/transport/gnunet-service-transport_manipulation.c 405src/transport/gnunet-service-transport_manipulation.c
408src/transport/gnunet-service-transport_neighbours.c 406src/transport/gnunet-service-transport_neighbours.c
409src/transport/gnunet-service-transport_plugins.c 407src/transport/gnunet-service-transport_plugins.c
410src/transport/gnunet-service-transport_validation.c 408src/transport/gnunet-service-transport_validation.c
409src/transport/gnunet-transport.c
411src/transport/gnunet-transport-certificate-creation.c 410src/transport/gnunet-transport-certificate-creation.c
412src/transport/gnunet-transport-profiler.c 411src/transport/gnunet-transport-profiler.c
413src/transport/gnunet-transport-wlan-receiver.c 412src/transport/gnunet-transport-wlan-receiver.c
414src/transport/gnunet-transport-wlan-sender.c 413src/transport/gnunet-transport-wlan-sender.c
415src/transport/gnunet-transport.c
416src/transport/plugin_transport_http_client.c 414src/transport/plugin_transport_http_client.c
417src/transport/plugin_transport_http_common.c 415src/transport/plugin_transport_http_common.c
418src/transport/plugin_transport_http_server.c 416src/transport/plugin_transport_http_server.c
419src/transport/plugin_transport_smtp.c 417src/transport/plugin_transport_smtp.c
420src/transport/plugin_transport_tcp.c 418src/transport/plugin_transport_tcp.c
421src/transport/plugin_transport_template.c 419src/transport/plugin_transport_template.c
422src/transport/plugin_transport_udp.c
423src/transport/plugin_transport_udp_broadcasting.c 420src/transport/plugin_transport_udp_broadcasting.c
421src/transport/plugin_transport_udp.c
424src/transport/plugin_transport_unix.c 422src/transport/plugin_transport_unix.c
425src/transport/plugin_transport_wlan.c 423src/transport/plugin_transport_wlan.c
426src/transport/plugin_transport_xt.c 424src/transport/plugin_transport_xt.c
@@ -429,11 +427,6 @@ src/transport/tcp_connection_legacy.c
429src/transport/tcp_server_legacy.c 427src/transport/tcp_server_legacy.c
430src/transport/tcp_server_mst_legacy.c 428src/transport/tcp_server_mst_legacy.c
431src/transport/tcp_service_legacy.c 429src/transport/tcp_service_legacy.c
432src/transport/transport-testing-filenames.c
433src/transport/transport-testing-loggers.c
434src/transport/transport-testing-main.c
435src/transport/transport-testing-send.c
436src/transport/transport-testing.c
437src/transport/transport_api_address_to_string.c 430src/transport/transport_api_address_to_string.c
438src/transport/transport_api_blacklist.c 431src/transport/transport_api_blacklist.c
439src/transport/transport_api_core.c 432src/transport/transport_api_core.c
@@ -442,8 +435,11 @@ src/transport/transport_api_manipulation.c
442src/transport/transport_api_monitor_peers.c 435src/transport/transport_api_monitor_peers.c
443src/transport/transport_api_monitor_plugins.c 436src/transport/transport_api_monitor_plugins.c
444src/transport/transport_api_offer_hello.c 437src/transport/transport_api_offer_hello.c
445src/tun/regex.c 438src/transport/transport-testing.c
446src/tun/tun.c 439src/transport/transport-testing-filenames.c
440src/transport/transport-testing-loggers.c
441src/transport/transport-testing-main.c
442src/transport/transport-testing-send.c
447src/util/bandwidth.c 443src/util/bandwidth.c
448src/util/bio.c 444src/util/bio.c
449src/util/client.c 445src/util/client.c
@@ -455,8 +451,8 @@ src/util/configuration_loader.c
455src/util/container_bloomfilter.c 451src/util/container_bloomfilter.c
456src/util/container_heap.c 452src/util/container_heap.c
457src/util/container_meta_data.c 453src/util/container_meta_data.c
458src/util/container_multihashmap.c
459src/util/container_multihashmap32.c 454src/util/container_multihashmap32.c
455src/util/container_multihashmap.c
460src/util/container_multipeermap.c 456src/util/container_multipeermap.c
461src/util/container_multishortmap.c 457src/util/container_multishortmap.c
462src/util/crypto_abe.c 458src/util/crypto_abe.c
@@ -474,10 +470,12 @@ src/util/crypto_random.c
474src/util/crypto_rsa.c 470src/util/crypto_rsa.c
475src/util/crypto_symmetric.c 471src/util/crypto_symmetric.c
476src/util/disk.c 472src/util/disk.c
473src/util/dnsparser.c
474src/util/dnsstub.c
477src/util/getopt.c 475src/util/getopt.c
478src/util/getopt_helpers.c 476src/util/getopt_helpers.c
479src/util/gnunet-config-diff.c
480src/util/gnunet-config.c 477src/util/gnunet-config.c
478src/util/gnunet-config-diff.c
481src/util/gnunet-ecc.c 479src/util/gnunet-ecc.c
482src/util/gnunet-helper-w32-console.c 480src/util/gnunet-helper-w32-console.c
483src/util/gnunet-resolver.c 481src/util/gnunet-resolver.c
@@ -497,6 +495,7 @@ src/util/os_priority.c
497src/util/peer.c 495src/util/peer.c
498src/util/plugin.c 496src/util/plugin.c
499src/util/program.c 497src/util/program.c
498src/util/regex.c
500src/util/resolver_api.c 499src/util/resolver_api.c
501src/util/scheduler.c 500src/util/scheduler.c
502src/util/service.c 501src/util/service.c
@@ -505,16 +504,17 @@ src/util/socks.c
505src/util/speedup.c 504src/util/speedup.c
506src/util/strings.c 505src/util/strings.c
507src/util/time.c 506src/util/time.c
507src/util/tun.c
508src/util/w32cat.c 508src/util/w32cat.c
509src/util/win.c 509src/util/win.c
510src/util/winproc.c 510src/util/winproc.c
511src/vpn/gnunet-helper-vpn-windows.c
512src/vpn/gnunet-helper-vpn.c 511src/vpn/gnunet-helper-vpn.c
512src/vpn/gnunet-helper-vpn-windows.c
513src/vpn/gnunet-service-vpn.c 513src/vpn/gnunet-service-vpn.c
514src/vpn/gnunet-vpn.c 514src/vpn/gnunet-vpn.c
515src/vpn/vpn_api.c 515src/vpn/vpn_api.c
516src/zonemaster/gnunet-service-zonemaster-monitor.c
517src/zonemaster/gnunet-service-zonemaster.c 516src/zonemaster/gnunet-service-zonemaster.c
517src/zonemaster/gnunet-service-zonemaster-monitor.c
518src/fs/fs_api.h 518src/fs/fs_api.h
519src/include/gnunet_common.h 519src/include/gnunet_common.h
520src/include/gnunet_mq_lib.h 520src/include/gnunet_mq_lib.h
diff --git a/src/Makefile.am b/src/Makefile.am
index d8d548706..00f30adc3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -83,7 +83,6 @@ SUBDIRS = \
83 $(REST_DIR) \ 83 $(REST_DIR) \
84 $(JSONAPI_DIR) \ 84 $(JSONAPI_DIR) \
85 hello \ 85 hello \
86 tun \
87 block \ 86 block \
88 statistics \ 87 statistics \
89 arm \ 88 arm \
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index 9a4ecdcfd..ca2685765 100644
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -27,8 +27,6 @@ install-exec-hook:
27endif 27endif
28 28
29lib_LTLIBRARIES = \ 29lib_LTLIBRARIES = \
30 libgnunetdnsparser.la \
31 libgnunetdnsstub.la \
32 libgnunetdns.la 30 libgnunetdns.la
33 31
34libexec_PROGRAMS = \ 32libexec_PROGRAMS = \
@@ -47,9 +45,6 @@ check_SCRIPTS = \
47 test_gnunet_dns.sh 45 test_gnunet_dns.sh
48endif 46endif
49 47
50check_PROGRAMS = \
51 test_hexcoder
52
53gnunet_helper_dns_SOURCES = \ 48gnunet_helper_dns_SOURCES = \
54 gnunet-helper-dns.c 49 gnunet-helper-dns.c
55 50
@@ -57,7 +52,6 @@ gnunet_helper_dns_SOURCES = \
57gnunet_dns_monitor_SOURCES = \ 52gnunet_dns_monitor_SOURCES = \
58 gnunet-dns-monitor.c 53 gnunet-dns-monitor.c
59gnunet_dns_monitor_LDADD = \ 54gnunet_dns_monitor_LDADD = \
60 libgnunetdnsparser.la \
61 libgnunetdns.la \ 55 libgnunetdns.la \
62 $(top_builddir)/src/util/libgnunetutil.la \ 56 $(top_builddir)/src/util/libgnunetutil.la \
63 $(GN_LIBINTL) 57 $(GN_LIBINTL)
@@ -65,15 +59,12 @@ gnunet_dns_monitor_LDADD = \
65gnunet_zonewalk_SOURCES = \ 59gnunet_zonewalk_SOURCES = \
66 gnunet-zonewalk.c 60 gnunet-zonewalk.c
67gnunet_zonewalk_LDADD = \ 61gnunet_zonewalk_LDADD = \
68 libgnunetdnsparser.la \
69 libgnunetdnsstub.la \
70 $(top_builddir)/src/util/libgnunetutil.la \ 62 $(top_builddir)/src/util/libgnunetutil.la \
71 $(GN_LIBINTL) 63 $(GN_LIBINTL)
72 64
73gnunet_dns_redirector_SOURCES = \ 65gnunet_dns_redirector_SOURCES = \
74 gnunet-dns-redirector.c 66 gnunet-dns-redirector.c
75gnunet_dns_redirector_LDADD = \ 67gnunet_dns_redirector_LDADD = \
76 libgnunetdnsparser.la \
77 libgnunetdns.la \ 68 libgnunetdns.la \
78 $(top_builddir)/src/util/libgnunetutil.la \ 69 $(top_builddir)/src/util/libgnunetutil.la \
79 $(GN_LIBINTL) 70 $(GN_LIBINTL)
@@ -81,30 +72,10 @@ gnunet_dns_redirector_LDADD = \
81gnunet_service_dns_SOURCES = \ 72gnunet_service_dns_SOURCES = \
82 gnunet-service-dns.c 73 gnunet-service-dns.c
83gnunet_service_dns_LDADD = \ 74gnunet_service_dns_LDADD = \
84 libgnunetdnsstub.la \
85 $(top_builddir)/src/tun/libgnunettun.la \
86 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 75 $(top_builddir)/src/statistics/libgnunetstatistics.la \
87 $(top_builddir)/src/util/libgnunetutil.la \ 76 $(top_builddir)/src/util/libgnunetutil.la \
88 $(GN_LIBINTL) 77 $(GN_LIBINTL)
89 78
90libgnunetdnsparser_la_SOURCES = \
91 dnsparser.c
92libgnunetdnsparser_la_LIBADD = \
93 $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
94 -lidn
95libgnunetdnsparser_la_LDFLAGS = \
96 $(GN_LIB_LDFLAGS) \
97 -version-info 1:0:1
98
99libgnunetdnsstub_la_SOURCES = \
100 dnsstub.c
101libgnunetdnsstub_la_LIBADD = \
102 $(top_builddir)/src/tun/libgnunettun.la \
103 $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
104libgnunetdnsstub_la_LDFLAGS = \
105 $(GN_LIB_LDFLAGS) \
106 -version-info 0:0:0
107
108libgnunetdns_la_SOURCES = \ 79libgnunetdns_la_SOURCES = \
109 dns_api.c dns.h 80 dns_api.c dns.h
110libgnunetdns_la_LIBADD = \ 81libgnunetdns_la_LIBADD = \
@@ -131,8 +102,3 @@ EXTRA_DIST = \
131 $(check_SCRIPTS) 102 $(check_SCRIPTS)
132 103
133 104
134test_hexcoder_SOURCES = \
135 test_hexcoder.c
136test_hexcoder_LDADD = \
137 libgnunetdnsparser.la \
138 $(top_builddir)/src/util/libgnunetutil.la
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 4296199db..ec7bcb016 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -89,6 +89,8 @@ libgnunetutil_la_SOURCES = \
89 crypto_rsa.c \ 89 crypto_rsa.c \
90 disk.c \ 90 disk.c \
91 disk.h \ 91 disk.h \
92 dnsparser.c \
93 dnsstub.c \
92 getopt.c \ 94 getopt.c \
93 getopt_helpers.c \ 95 getopt_helpers.c \
94 helper.c \ 96 helper.c \
@@ -104,12 +106,14 @@ libgnunetutil_la_SOURCES = \
104 peer.c \ 106 peer.c \
105 plugin.c \ 107 plugin.c \
106 program.c \ 108 program.c \
109 regex.c \
107 resolver_api.c resolver.h \ 110 resolver_api.c resolver.h \
108 scheduler.c \ 111 scheduler.c \
109 service.c \ 112 service.c \
110 signal.c \ 113 signal.c \
111 strings.c \ 114 strings.c \
112 time.c \ 115 time.c \
116 tun.c \
113 speedup.c speedup.h 117 speedup.c speedup.h
114 118
115libgnunetutil_la_LIBADD = \ 119libgnunetutil_la_LIBADD = \
@@ -117,7 +121,7 @@ libgnunetutil_la_LIBADD = \
117 $(LIBGCRYPT_LIBS) \ 121 $(LIBGCRYPT_LIBS) \
118 $(LTLIBICONV) \ 122 $(LTLIBICONV) \
119 $(LTLIBINTL) \ 123 $(LTLIBINTL) \
120 -lltdl $(Z_LIBS) -lunistring $(XLIB) 124 -lltdl -lidn $(Z_LIBS) -lunistring $(XLIB)
121 125
122libgnunetutil_la_LDFLAGS = \ 126libgnunetutil_la_LDFLAGS = \
123 $(GN_LIB_LDFLAGS) \ 127 $(GN_LIB_LDFLAGS) \
@@ -291,19 +295,22 @@ check_PROGRAMS = \
291 test_crypto_rsa \ 295 test_crypto_rsa \
292 test_disk \ 296 test_disk \
293 test_getopt \ 297 test_getopt \
298 test_hexcoder \
294 test_mq \ 299 test_mq \
295 test_os_network \ 300 test_os_network \
296 test_peer \ 301 test_peer \
297 test_plugin \ 302 test_plugin \
298 test_program \ 303 test_program \
304 test_regex \
299 test_resolver_api.nc \ 305 test_resolver_api.nc \
300 test_scheduler \ 306 test_scheduler \
301 test_scheduler_delay \ 307 test_scheduler_delay \
302 test_service \ 308 test_service \
303 test_strings \ 309 test_strings \
304 test_strings_to_data \ 310 test_strings_to_data \
305 test_time \
306 test_speedup \ 311 test_speedup \
312 test_time \
313 test_tun \
307 $(BENCHMARKS) \ 314 $(BENCHMARKS) \
308 test_os_start_process \ 315 test_os_start_process \
309 test_common_logging_runtime_loglevels 316 test_common_logging_runtime_loglevels
@@ -319,6 +326,20 @@ test_bio_SOURCES = \
319test_bio_LDADD = \ 326test_bio_LDADD = \
320 libgnunetutil.la 327 libgnunetutil.la
321 328
329test_hexcoder_SOURCES = \
330 test_hexcoder.c
331test_hexcoder_LDADD = \
332 libgnunetutil.la
333
334test_tun_SOURCES = \
335 test_tun.c
336test_tun_LDADD = \
337 libgnunetutil.la
338
339test_regex_SOURCES = \
340 test_regex.c
341test_regex_LDADD = \
342 libgnunetutil.la
322 343
323test_os_start_process_SOURCES = \ 344test_os_start_process_SOURCES = \
324 test_os_start_process.c 345 test_os_start_process.c
diff --git a/src/dns/dnsparser.c b/src/util/dnsparser.c
index 32ad7c0c2..32ad7c0c2 100644
--- a/src/dns/dnsparser.c
+++ b/src/util/dnsparser.c
diff --git a/src/dns/dnsstub.c b/src/util/dnsstub.c
index 969ff7beb..969ff7beb 100644
--- a/src/dns/dnsstub.c
+++ b/src/util/dnsstub.c
diff --git a/src/tun/regex.c b/src/util/regex.c
index 7565a9eac..7565a9eac 100644
--- a/src/tun/regex.c
+++ b/src/util/regex.c
diff --git a/src/tun/test_regex.c b/src/util/test_regex.c
index 2e7d52828..2e7d52828 100644
--- a/src/tun/test_regex.c
+++ b/src/util/test_regex.c
diff --git a/src/tun/test_tun.c b/src/util/test_tun.c
index edbd4c05d..edbd4c05d 100644
--- a/src/tun/test_tun.c
+++ b/src/util/test_tun.c
diff --git a/src/tun/tun.c b/src/util/tun.c
index f85f72209..f85f72209 100644
--- a/src/tun/tun.c
+++ b/src/util/tun.c