diff options
-rw-r--r-- | po/POTFILES.in | 96 | ||||
-rw-r--r-- | src/gns/Makefile.am | 11 | ||||
-rw-r--r-- | src/gns/gnunet-gns.c | 66 | ||||
-rw-r--r-- | src/gns/nss/nss_gns_query.c | 3 |
4 files changed, 121 insertions, 55 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index ac81d134a..45cabc7cd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -10,13 +10,21 @@ src/arm/arm_monitor_api.c | |||
10 | src/arm/gnunet-arm.c | 10 | src/arm/gnunet-arm.c |
11 | src/arm/gnunet-service-arm.c | 11 | src/arm/gnunet-service-arm.c |
12 | src/arm/mockup-service.c | 12 | src/arm/mockup-service.c |
13 | src/ats-tests/ats-testing-experiment.c | ||
14 | src/ats-tests/ats-testing-log.c | ||
15 | src/ats-tests/ats-testing-preferences.c | ||
16 | src/ats-tests/ats-testing-traffic.c | ||
17 | src/ats-tests/ats-testing.c | ||
18 | src/ats-tests/gnunet-ats-sim.c | ||
19 | src/ats-tests/gnunet-solver-eval.c | ||
20 | src/ats-tool/gnunet-ats.c | ||
13 | src/ats/ats_api_connectivity.c | 21 | src/ats/ats_api_connectivity.c |
14 | src/ats/ats_api_performance.c | 22 | src/ats/ats_api_performance.c |
15 | src/ats/ats_api_scanner.c | 23 | src/ats/ats_api_scanner.c |
16 | src/ats/ats_api_scheduling.c | 24 | src/ats/ats_api_scheduling.c |
17 | src/ats/gnunet-ats-solver-eval.c | 25 | src/ats/gnunet-ats-solver-eval.c |
18 | src/ats/gnunet-service-ats_addresses.c | ||
19 | src/ats/gnunet-service-ats.c | 26 | src/ats/gnunet-service-ats.c |
27 | src/ats/gnunet-service-ats_addresses.c | ||
20 | src/ats/gnunet-service-ats_connectivity.c | 28 | src/ats/gnunet-service-ats_connectivity.c |
21 | src/ats/gnunet-service-ats_normalization.c | 29 | src/ats/gnunet-service-ats_normalization.c |
22 | src/ats/gnunet-service-ats_performance.c | 30 | src/ats/gnunet-service-ats_performance.c |
@@ -25,14 +33,6 @@ src/ats/gnunet-service-ats_preferences.c | |||
25 | src/ats/gnunet-service-ats_reservations.c | 33 | src/ats/gnunet-service-ats_reservations.c |
26 | src/ats/gnunet-service-ats_scheduling.c | 34 | src/ats/gnunet-service-ats_scheduling.c |
27 | src/ats/plugin_ats_proportional.c | 35 | src/ats/plugin_ats_proportional.c |
28 | src/ats-tests/ats-testing.c | ||
29 | src/ats-tests/ats-testing-experiment.c | ||
30 | src/ats-tests/ats-testing-log.c | ||
31 | src/ats-tests/ats-testing-preferences.c | ||
32 | src/ats-tests/ats-testing-traffic.c | ||
33 | src/ats-tests/gnunet-ats-sim.c | ||
34 | src/ats-tests/gnunet-solver-eval.c | ||
35 | src/ats-tool/gnunet-ats.c | ||
36 | src/auction/gnunet-auction-create.c | 36 | src/auction/gnunet-auction-create.c |
37 | src/auction/gnunet-auction-info.c | 37 | src/auction/gnunet-auction-info.c |
38 | src/auction/gnunet-auction-join.c | 38 | src/auction/gnunet-auction-join.c |
@@ -49,8 +49,8 @@ src/cadet/cadet_api_list_peers.c | |||
49 | src/cadet/cadet_api_list_tunnels.c | 49 | src/cadet/cadet_api_list_tunnels.c |
50 | src/cadet/cadet_test_lib.c | 50 | src/cadet/cadet_test_lib.c |
51 | src/cadet/desirability_table.c | 51 | src/cadet/desirability_table.c |
52 | src/cadet/gnunet-cadet.c | ||
53 | src/cadet/gnunet-cadet-profiler.c | 52 | src/cadet/gnunet-cadet-profiler.c |
53 | src/cadet/gnunet-cadet.c | ||
54 | src/cadet/gnunet-service-cadet.c | 54 | src/cadet/gnunet-service-cadet.c |
55 | src/cadet/gnunet-service-cadet_channel.c | 55 | src/cadet/gnunet-service-cadet_channel.c |
56 | src/cadet/gnunet-service-cadet_connection.c | 56 | src/cadet/gnunet-service-cadet_connection.c |
@@ -66,15 +66,15 @@ src/consensus/gnunet-service-consensus.c | |||
66 | src/consensus/plugin_block_consensus.c | 66 | src/consensus/plugin_block_consensus.c |
67 | src/conversation/conversation_api.c | 67 | src/conversation/conversation_api.c |
68 | src/conversation/conversation_api_call.c | 68 | src/conversation/conversation_api_call.c |
69 | src/conversation/gnunet-conversation.c | ||
70 | src/conversation/gnunet-conversation-test.c | 69 | src/conversation/gnunet-conversation-test.c |
71 | src/conversation/gnunet_gst.c | 70 | src/conversation/gnunet-conversation.c |
72 | src/conversation/gnunet_gst_test.c | ||
73 | src/conversation/gnunet-helper-audio-playback.c | ||
74 | src/conversation/gnunet-helper-audio-playback-gst.c | 71 | src/conversation/gnunet-helper-audio-playback-gst.c |
75 | src/conversation/gnunet-helper-audio-record.c | 72 | src/conversation/gnunet-helper-audio-playback.c |
76 | src/conversation/gnunet-helper-audio-record-gst.c | 73 | src/conversation/gnunet-helper-audio-record-gst.c |
74 | src/conversation/gnunet-helper-audio-record.c | ||
77 | src/conversation/gnunet-service-conversation.c | 75 | src/conversation/gnunet-service-conversation.c |
76 | src/conversation/gnunet_gst.c | ||
77 | src/conversation/gnunet_gst_test.c | ||
78 | src/conversation/microphone.c | 78 | src/conversation/microphone.c |
79 | src/conversation/plugin_gnsrecord_conversation.c | 79 | src/conversation/plugin_gnsrecord_conversation.c |
80 | src/conversation/speaker.c | 80 | src/conversation/speaker.c |
@@ -104,7 +104,6 @@ src/dht/dht_api.c | |||
104 | src/dht/dht_test_lib.c | 104 | src/dht/dht_test_lib.c |
105 | src/dht/gnunet-dht-get.c | 105 | src/dht/gnunet-dht-get.c |
106 | src/dht/gnunet-dht-monitor.c | 106 | src/dht/gnunet-dht-monitor.c |
107 | src/dht/gnunet_dht_profiler.c | ||
108 | src/dht/gnunet-dht-put.c | 107 | src/dht/gnunet-dht-put.c |
109 | src/dht/gnunet-service-dht.c | 108 | src/dht/gnunet-service-dht.c |
110 | src/dht/gnunet-service-dht_clients.c | 109 | src/dht/gnunet-service-dht_clients.c |
@@ -113,6 +112,7 @@ src/dht/gnunet-service-dht_hello.c | |||
113 | src/dht/gnunet-service-dht_neighbours.c | 112 | src/dht/gnunet-service-dht_neighbours.c |
114 | src/dht/gnunet-service-dht_nse.c | 113 | src/dht/gnunet-service-dht_nse.c |
115 | src/dht/gnunet-service-dht_routing.c | 114 | src/dht/gnunet-service-dht_routing.c |
115 | src/dht/gnunet_dht_profiler.c | ||
116 | src/dht/plugin_block_dht.c | 116 | src/dht/plugin_block_dht.c |
117 | src/dns/dns_api.c | 117 | src/dns/dns_api.c |
118 | src/dns/gnunet-dns-monitor.c | 118 | src/dns/gnunet-dns-monitor.c |
@@ -147,8 +147,8 @@ src/fs/gnunet-auto-share.c | |||
147 | src/fs/gnunet-daemon-fsprofiler.c | 147 | src/fs/gnunet-daemon-fsprofiler.c |
148 | src/fs/gnunet-directory.c | 148 | src/fs/gnunet-directory.c |
149 | src/fs/gnunet-download.c | 149 | src/fs/gnunet-download.c |
150 | src/fs/gnunet-fs.c | ||
151 | src/fs/gnunet-fs-profiler.c | 150 | src/fs/gnunet-fs-profiler.c |
151 | src/fs/gnunet-fs.c | ||
152 | src/fs/gnunet-helper-fs-publish.c | 152 | src/fs/gnunet-helper-fs-publish.c |
153 | src/fs/gnunet-publish.c | 153 | src/fs/gnunet-publish.c |
154 | src/fs/gnunet-search.c | 154 | src/fs/gnunet-search.c |
@@ -168,9 +168,9 @@ src/gns/gns_tld_api.c | |||
168 | src/gns/gnunet-bcd.c | 168 | src/gns/gnunet-bcd.c |
169 | src/gns/gnunet-dns2gns.c | 169 | src/gns/gnunet-dns2gns.c |
170 | src/gns/gnunet-gns-benchmark.c | 170 | src/gns/gnunet-gns-benchmark.c |
171 | src/gns/gnunet-gns.c | ||
172 | src/gns/gnunet-gns-import.c | 171 | src/gns/gnunet-gns-import.c |
173 | src/gns/gnunet-gns-proxy.c | 172 | src/gns/gnunet-gns-proxy.c |
173 | src/gns/gnunet-gns.c | ||
174 | src/gns/gnunet-service-gns.c | 174 | src/gns/gnunet-service-gns.c |
175 | src/gns/gnunet-service-gns_interceptor.c | 175 | src/gns/gnunet-service-gns_interceptor.c |
176 | src/gns/gnunet-service-gns_resolver.c | 176 | src/gns/gnunet-service-gns_resolver.c |
@@ -186,8 +186,8 @@ src/gnsrecord/gnsrecord_serialization.c | |||
186 | src/gnsrecord/plugin_gnsrecord_dns.c | 186 | src/gnsrecord/plugin_gnsrecord_dns.c |
187 | src/hello/address.c | 187 | src/hello/address.c |
188 | src/hello/gnunet-hello.c | 188 | src/hello/gnunet-hello.c |
189 | src/hello/hello.c | ||
190 | src/hello/hello-ng.c | 189 | src/hello/hello-ng.c |
190 | src/hello/hello.c | ||
191 | src/hostlist/gnunet-daemon-hostlist.c | 191 | src/hostlist/gnunet-daemon-hostlist.c |
192 | src/hostlist/gnunet-daemon-hostlist_client.c | 192 | src/hostlist/gnunet-daemon-hostlist_client.c |
193 | src/hostlist/gnunet-daemon-hostlist_server.c | 193 | src/hostlist/gnunet-daemon-hostlist_server.c |
@@ -212,8 +212,8 @@ src/namecache/namecache_api.c | |||
212 | src/namecache/plugin_namecache_flat.c | 212 | src/namecache/plugin_namecache_flat.c |
213 | src/namecache/plugin_namecache_postgres.c | 213 | src/namecache/plugin_namecache_postgres.c |
214 | src/namecache/plugin_namecache_sqlite.c | 214 | src/namecache/plugin_namecache_sqlite.c |
215 | src/namestore/gnunet-namestore.c | ||
216 | src/namestore/gnunet-namestore-fcfsd.c | 215 | src/namestore/gnunet-namestore-fcfsd.c |
216 | src/namestore/gnunet-namestore.c | ||
217 | src/namestore/gnunet-service-namestore.c | 217 | src/namestore/gnunet-service-namestore.c |
218 | src/namestore/gnunet-zoneimport.c | 218 | src/namestore/gnunet-zoneimport.c |
219 | src/namestore/namestore_api.c | 219 | src/namestore/namestore_api.c |
@@ -239,17 +239,17 @@ src/nat/gnunet-service-nat_mini.c | |||
239 | src/nat/gnunet-service-nat_stun.c | 239 | src/nat/gnunet-service-nat_stun.c |
240 | src/nat/nat_api.c | 240 | src/nat/nat_api.c |
241 | src/nat/nat_api_stun.c | 241 | src/nat/nat_api_stun.c |
242 | src/nse/gnunet-nse.c | ||
243 | src/nse/gnunet-nse-profiler.c | 242 | src/nse/gnunet-nse-profiler.c |
243 | src/nse/gnunet-nse.c | ||
244 | src/nse/gnunet-service-nse.c | 244 | src/nse/gnunet-service-nse.c |
245 | src/nse/nse_api.c | 245 | src/nse/nse_api.c |
246 | src/nt/nt.c | 246 | src/nt/nt.c |
247 | src/peerinfo/gnunet-service-peerinfo.c | ||
248 | src/peerinfo/peerinfo_api.c | ||
249 | src/peerinfo/peerinfo_api_notify.c | ||
250 | src/peerinfo-tool/gnunet-peerinfo.c | 247 | src/peerinfo-tool/gnunet-peerinfo.c |
251 | src/peerinfo-tool/gnunet-peerinfo_plugins.c | 248 | src/peerinfo-tool/gnunet-peerinfo_plugins.c |
252 | src/peerinfo-tool/plugin_rest_peerinfo.c | 249 | src/peerinfo-tool/plugin_rest_peerinfo.c |
250 | src/peerinfo/gnunet-service-peerinfo.c | ||
251 | src/peerinfo/peerinfo_api.c | ||
252 | src/peerinfo/peerinfo_api_notify.c | ||
253 | src/peerstore/gnunet-peerstore.c | 253 | src/peerstore/gnunet-peerstore.c |
254 | src/peerstore/gnunet-service-peerstore.c | 254 | src/peerstore/gnunet-service-peerstore.c |
255 | src/peerstore/peerstore_api.c | 255 | src/peerstore/peerstore_api.c |
@@ -297,22 +297,22 @@ src/revocation/gnunet-revocation.c | |||
297 | src/revocation/gnunet-service-revocation.c | 297 | src/revocation/gnunet-service-revocation.c |
298 | src/revocation/plugin_block_revocation.c | 298 | src/revocation/plugin_block_revocation.c |
299 | src/revocation/revocation_api.c | 299 | src/revocation/revocation_api.c |
300 | src/rps/gnunet-rps.c | ||
301 | src/rps/gnunet-rps-profiler.c | 300 | src/rps/gnunet-rps-profiler.c |
301 | src/rps/gnunet-rps.c | ||
302 | src/rps/gnunet-service-rps.c | 302 | src/rps/gnunet-service-rps.c |
303 | src/rps/gnunet-service-rps_custommap.c | 303 | src/rps/gnunet-service-rps_custommap.c |
304 | src/rps/gnunet-service-rps_sampler.c | 304 | src/rps/gnunet-service-rps_sampler.c |
305 | src/rps/gnunet-service-rps_sampler_elem.c | 305 | src/rps/gnunet-service-rps_sampler_elem.c |
306 | src/rps/gnunet-service-rps_view.c | 306 | src/rps/gnunet-service-rps_view.c |
307 | src/rps/rps_api.c | ||
308 | src/rps/rps-sampler_client.c | 307 | src/rps/rps-sampler_client.c |
309 | src/rps/rps-sampler_common.c | 308 | src/rps/rps-sampler_common.c |
310 | src/rps/rps-test_util.c | 309 | src/rps/rps-test_util.c |
310 | src/rps/rps_api.c | ||
311 | src/scalarproduct/gnunet-scalarproduct.c | 311 | src/scalarproduct/gnunet-scalarproduct.c |
312 | src/scalarproduct/gnunet-service-scalarproduct_alice.c | ||
313 | src/scalarproduct/gnunet-service-scalarproduct_bob.c | ||
314 | src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c | 312 | src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c |
315 | src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c | 313 | src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c |
314 | src/scalarproduct/gnunet-service-scalarproduct_alice.c | ||
315 | src/scalarproduct/gnunet-service-scalarproduct_bob.c | ||
316 | src/scalarproduct/scalarproduct_api.c | 316 | src/scalarproduct/scalarproduct_api.c |
317 | src/secretsharing/gnunet-secretsharing-profiler.c | 317 | src/secretsharing/gnunet-secretsharing-profiler.c |
318 | src/secretsharing/gnunet-service-secretsharing.c | 318 | src/secretsharing/gnunet-service-secretsharing.c |
@@ -338,15 +338,16 @@ src/statistics/gnunet-statistics.c | |||
338 | src/statistics/statistics_api.c | 338 | src/statistics/statistics_api.c |
339 | src/template/gnunet-service-template.c | 339 | src/template/gnunet-service-template.c |
340 | src/template/gnunet-template.c | 340 | src/template/gnunet-template.c |
341 | src/testbed-logger/gnunet-service-testbed-logger.c | ||
342 | src/testbed-logger/testbed_logger_api.c | ||
341 | src/testbed/generate-underlay-topology.c | 343 | src/testbed/generate-underlay-topology.c |
342 | src/testbed/gnunet-daemon-latency-logger.c | 344 | src/testbed/gnunet-daemon-latency-logger.c |
343 | src/testbed/gnunet-daemon-testbed-blacklist.c | 345 | src/testbed/gnunet-daemon-testbed-blacklist.c |
344 | src/testbed/gnunet-daemon-testbed-underlay.c | 346 | src/testbed/gnunet-daemon-testbed-underlay.c |
345 | src/testbed/gnunet-helper-testbed.c | 347 | src/testbed/gnunet-helper-testbed.c |
346 | src/testbed/gnunet_mpi_test.c | ||
347 | src/testbed/gnunet-service-test-barriers.c | 348 | src/testbed/gnunet-service-test-barriers.c |
348 | src/testbed/gnunet-service-testbed_barriers.c | ||
349 | src/testbed/gnunet-service-testbed.c | 349 | src/testbed/gnunet-service-testbed.c |
350 | src/testbed/gnunet-service-testbed_barriers.c | ||
350 | src/testbed/gnunet-service-testbed_cache.c | 351 | src/testbed/gnunet-service-testbed_cache.c |
351 | src/testbed/gnunet-service-testbed_connectionpool.c | 352 | src/testbed/gnunet-service-testbed_connectionpool.c |
352 | src/testbed/gnunet-service-testbed_cpustatus.c | 353 | src/testbed/gnunet-service-testbed_cpustatus.c |
@@ -354,20 +355,19 @@ src/testbed/gnunet-service-testbed_links.c | |||
354 | src/testbed/gnunet-service-testbed_meminfo.c | 355 | src/testbed/gnunet-service-testbed_meminfo.c |
355 | src/testbed/gnunet-service-testbed_oc.c | 356 | src/testbed/gnunet-service-testbed_oc.c |
356 | src/testbed/gnunet-service-testbed_peers.c | 357 | src/testbed/gnunet-service-testbed_peers.c |
357 | src/testbed/gnunet_testbed_mpi_spawn.c | ||
358 | src/testbed/gnunet-testbed-profiler.c | 358 | src/testbed/gnunet-testbed-profiler.c |
359 | src/testbed-logger/gnunet-service-testbed-logger.c | 359 | src/testbed/gnunet_mpi_test.c |
360 | src/testbed-logger/testbed_logger_api.c | 360 | src/testbed/gnunet_testbed_mpi_spawn.c |
361 | src/testbed/testbed_api_barriers.c | ||
362 | src/testbed/testbed_api.c | 361 | src/testbed/testbed_api.c |
362 | src/testbed/testbed_api_barriers.c | ||
363 | src/testbed/testbed_api_hosts.c | 363 | src/testbed/testbed_api_hosts.c |
364 | src/testbed/testbed_api_operations.c | 364 | src/testbed/testbed_api_operations.c |
365 | src/testbed/testbed_api_peers.c | 365 | src/testbed/testbed_api_peers.c |
366 | src/testbed/testbed_api_sd.c | 366 | src/testbed/testbed_api_sd.c |
367 | src/testbed/testbed_api_services.c | 367 | src/testbed/testbed_api_services.c |
368 | src/testbed/testbed_api_statistics.c | 368 | src/testbed/testbed_api_statistics.c |
369 | src/testbed/testbed_api_testbed.c | ||
370 | src/testbed/testbed_api_test.c | 369 | src/testbed/testbed_api_test.c |
370 | src/testbed/testbed_api_testbed.c | ||
371 | src/testbed/testbed_api_topology.c | 371 | src/testbed/testbed_api_topology.c |
372 | src/testbed/testbed_api_underlay.c | 372 | src/testbed/testbed_api_underlay.c |
373 | src/testing/gnunet-testing.c | 373 | src/testing/gnunet-testing.c |
@@ -379,34 +379,40 @@ src/transport/gnunet-communicator-tcp.c | |||
379 | src/transport/gnunet-communicator-udp.c | 379 | src/transport/gnunet-communicator-udp.c |
380 | src/transport/gnunet-communicator-unix.c | 380 | src/transport/gnunet-communicator-unix.c |
381 | src/transport/gnunet-helper-transport-bluetooth.c | 381 | src/transport/gnunet-helper-transport-bluetooth.c |
382 | src/transport/gnunet-helper-transport-wlan.c | ||
383 | src/transport/gnunet-helper-transport-wlan-dummy.c | 382 | src/transport/gnunet-helper-transport-wlan-dummy.c |
383 | src/transport/gnunet-helper-transport-wlan.c | ||
384 | src/transport/gnunet-service-tng.c | 384 | src/transport/gnunet-service-tng.c |
385 | src/transport/gnunet-service-transport_ats.c | ||
386 | src/transport/gnunet-service-transport.c | 385 | src/transport/gnunet-service-transport.c |
386 | src/transport/gnunet-service-transport_ats.c | ||
387 | src/transport/gnunet-service-transport_hello.c | 387 | src/transport/gnunet-service-transport_hello.c |
388 | src/transport/gnunet-service-transport_manipulation.c | 388 | src/transport/gnunet-service-transport_manipulation.c |
389 | src/transport/gnunet-service-transport_neighbours.c | 389 | src/transport/gnunet-service-transport_neighbours.c |
390 | src/transport/gnunet-service-transport_plugins.c | 390 | src/transport/gnunet-service-transport_plugins.c |
391 | src/transport/gnunet-service-transport_validation.c | 391 | src/transport/gnunet-service-transport_validation.c |
392 | src/transport/gnunet-transport.c | ||
393 | src/transport/gnunet-transport-profiler.c | 392 | src/transport/gnunet-transport-profiler.c |
394 | src/transport/gnunet-transport-wlan-receiver.c | 393 | src/transport/gnunet-transport-wlan-receiver.c |
395 | src/transport/gnunet-transport-wlan-sender.c | 394 | src/transport/gnunet-transport-wlan-sender.c |
395 | src/transport/gnunet-transport.c | ||
396 | src/transport/plugin_transport_http_client.c | 396 | src/transport/plugin_transport_http_client.c |
397 | src/transport/plugin_transport_http_common.c | 397 | src/transport/plugin_transport_http_common.c |
398 | src/transport/plugin_transport_http_server.c | 398 | src/transport/plugin_transport_http_server.c |
399 | src/transport/plugin_transport_smtp.c | 399 | src/transport/plugin_transport_smtp.c |
400 | src/transport/plugin_transport_tcp.c | 400 | src/transport/plugin_transport_tcp.c |
401 | src/transport/plugin_transport_template.c | 401 | src/transport/plugin_transport_template.c |
402 | src/transport/plugin_transport_udp_broadcasting.c | ||
403 | src/transport/plugin_transport_udp.c | 402 | src/transport/plugin_transport_udp.c |
403 | src/transport/plugin_transport_udp_broadcasting.c | ||
404 | src/transport/plugin_transport_unix.c | 404 | src/transport/plugin_transport_unix.c |
405 | src/transport/plugin_transport_wlan.c | 405 | src/transport/plugin_transport_wlan.c |
406 | src/transport/tcp_connection_legacy.c | 406 | src/transport/tcp_connection_legacy.c |
407 | src/transport/tcp_server_legacy.c | 407 | src/transport/tcp_server_legacy.c |
408 | src/transport/tcp_server_mst_legacy.c | 408 | src/transport/tcp_server_mst_legacy.c |
409 | src/transport/tcp_service_legacy.c | 409 | src/transport/tcp_service_legacy.c |
410 | src/transport/transport-testing-filenames.c | ||
411 | src/transport/transport-testing-loggers.c | ||
412 | src/transport/transport-testing-main.c | ||
413 | src/transport/transport-testing-send.c | ||
414 | src/transport/transport-testing.c | ||
415 | src/transport/transport-testing2.c | ||
410 | src/transport/transport_api2_application.c | 416 | src/transport/transport_api2_application.c |
411 | src/transport/transport_api2_communication.c | 417 | src/transport/transport_api2_communication.c |
412 | src/transport/transport_api2_core.c | 418 | src/transport/transport_api2_core.c |
@@ -419,12 +425,6 @@ src/transport/transport_api_manipulation.c | |||
419 | src/transport/transport_api_monitor_peers.c | 425 | src/transport/transport_api_monitor_peers.c |
420 | src/transport/transport_api_monitor_plugins.c | 426 | src/transport/transport_api_monitor_plugins.c |
421 | src/transport/transport_api_offer_hello.c | 427 | src/transport/transport_api_offer_hello.c |
422 | src/transport/transport-testing2.c | ||
423 | src/transport/transport-testing.c | ||
424 | src/transport/transport-testing-filenames.c | ||
425 | src/transport/transport-testing-loggers.c | ||
426 | src/transport/transport-testing-main.c | ||
427 | src/transport/transport-testing-send.c | ||
428 | src/util/bandwidth.c | 428 | src/util/bandwidth.c |
429 | src/util/benchmark.c | 429 | src/util/benchmark.c |
430 | src/util/bio.c | 430 | src/util/bio.c |
@@ -437,8 +437,8 @@ src/util/configuration_loader.c | |||
437 | src/util/container_bloomfilter.c | 437 | src/util/container_bloomfilter.c |
438 | src/util/container_heap.c | 438 | src/util/container_heap.c |
439 | src/util/container_meta_data.c | 439 | src/util/container_meta_data.c |
440 | src/util/container_multihashmap32.c | ||
441 | src/util/container_multihashmap.c | 440 | src/util/container_multihashmap.c |
441 | src/util/container_multihashmap32.c | ||
442 | src/util/container_multipeermap.c | 442 | src/util/container_multipeermap.c |
443 | src/util/container_multishortmap.c | 443 | src/util/container_multishortmap.c |
444 | src/util/container_multiuuidmap.c | 444 | src/util/container_multiuuidmap.c |
@@ -461,8 +461,8 @@ src/util/dnsparser.c | |||
461 | src/util/dnsstub.c | 461 | src/util/dnsstub.c |
462 | src/util/getopt.c | 462 | src/util/getopt.c |
463 | src/util/getopt_helpers.c | 463 | src/util/getopt_helpers.c |
464 | src/util/gnunet-config.c | ||
465 | src/util/gnunet-config-diff.c | 464 | src/util/gnunet-config-diff.c |
465 | src/util/gnunet-config.c | ||
466 | src/util/gnunet-ecc.c | 466 | src/util/gnunet-ecc.c |
467 | src/util/gnunet-qr.c | 467 | src/util/gnunet-qr.c |
468 | src/util/gnunet-resolver.c | 468 | src/util/gnunet-resolver.c |
@@ -499,8 +499,8 @@ src/vpn/gnunet-helper-vpn.c | |||
499 | src/vpn/gnunet-service-vpn.c | 499 | src/vpn/gnunet-service-vpn.c |
500 | src/vpn/gnunet-vpn.c | 500 | src/vpn/gnunet-vpn.c |
501 | src/vpn/vpn_api.c | 501 | src/vpn/vpn_api.c |
502 | src/zonemaster/gnunet-service-zonemaster.c | ||
503 | src/zonemaster/gnunet-service-zonemaster-monitor.c | 502 | src/zonemaster/gnunet-service-zonemaster-monitor.c |
503 | src/zonemaster/gnunet-service-zonemaster.c | ||
504 | src/fs/fs_api.h | 504 | src/fs/fs_api.h |
505 | src/testbed/testbed_api.h | 505 | src/testbed/testbed_api.h |
506 | src/testbed/testbed_api_operations.h | 506 | src/testbed/testbed_api_operations.h |
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 846507b6f..bb319ce6e 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -10,7 +10,17 @@ SUBDIRS = . $(NSS_SUBDIR) | |||
10 | pkgdata_DATA = \ | 10 | pkgdata_DATA = \ |
11 | gnunet-gns-proxy-ca.template | 11 | gnunet-gns-proxy-ca.template |
12 | 12 | ||
13 | if HAVE_LIBIDN | ||
14 | LIBIDN= -lidn | ||
15 | else | ||
16 | LIBIDN= | ||
17 | endif | ||
13 | 18 | ||
19 | if HAVE_LIBIDN2 | ||
20 | LIBIDN2= -lidn2 | ||
21 | else | ||
22 | LIBIDN2= | ||
23 | endif | ||
14 | 24 | ||
15 | EXTRA_DIST = \ | 25 | EXTRA_DIST = \ |
16 | test_gns_defaults.conf \ | 26 | test_gns_defaults.conf \ |
@@ -139,6 +149,7 @@ gnunet_gns_LDADD = \ | |||
139 | libgnunetgns.la \ | 149 | libgnunetgns.la \ |
140 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 150 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
141 | $(top_builddir)/src/util/libgnunetutil.la \ | 151 | $(top_builddir)/src/util/libgnunetutil.la \ |
152 | $(LIBIDN) $(LIBIDN2) \ | ||
142 | $(GN_LIBINTL) | 153 | $(GN_LIBINTL) |
143 | 154 | ||
144 | gnunet_gns_benchmark_SOURCES = \ | 155 | gnunet_gns_benchmark_SOURCES = \ |
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c index c3ba0a1f8..fe51013ed 100644 --- a/src/gns/gnunet-gns.c +++ b/src/gns/gnunet-gns.c | |||
@@ -23,12 +23,26 @@ | |||
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include "platform.h" | 25 | #include "platform.h" |
26 | #if HAVE_LIBIDN2 | ||
27 | #if HAVE_IDN2_H | ||
28 | #include <idn2.h> | ||
29 | #elif HAVE_IDN2_IDN2_H | ||
30 | #include <idn2/idn2.h> | ||
31 | #endif | ||
32 | #elif HAVE_LIBIDN | ||
33 | #if HAVE_IDNA_H | ||
34 | #include <idna.h> | ||
35 | #elif HAVE_IDN_IDNA_H | ||
36 | #include <idn/idna.h> | ||
37 | #endif | ||
38 | #endif | ||
26 | #include <gnunet_util_lib.h> | 39 | #include <gnunet_util_lib.h> |
27 | #include <gnunet_dnsparser_lib.h> | 40 | #include <gnunet_dnsparser_lib.h> |
28 | #include <gnunet_gnsrecord_lib.h> | 41 | #include <gnunet_gnsrecord_lib.h> |
29 | #include <gnunet_namestore_service.h> | 42 | #include <gnunet_namestore_service.h> |
30 | #include <gnunet_gns_service.h> | 43 | #include <gnunet_gns_service.h> |
31 | 44 | ||
45 | |||
32 | /** | 46 | /** |
33 | * Configuration we are using. | 47 | * Configuration we are using. |
34 | */ | 48 | */ |
@@ -45,6 +59,16 @@ static struct GNUNET_GNS_Handle *gns; | |||
45 | static char *lookup_name; | 59 | static char *lookup_name; |
46 | 60 | ||
47 | /** | 61 | /** |
62 | * DNS IDNA name to lookup. (set if -d option is set) | ||
63 | */ | ||
64 | char *idna_name; | ||
65 | |||
66 | /** | ||
67 | * DNS compatibility (name is given as DNS name, possible IDNA). | ||
68 | */ | ||
69 | static int dns_compat; | ||
70 | |||
71 | /** | ||
48 | * record type to look up (-t option) | 72 | * record type to look up (-t option) |
49 | */ | 73 | */ |
50 | static char *lookup_type; | 74 | static char *lookup_type; |
@@ -108,6 +132,11 @@ do_shutdown (void *cls) | |||
108 | GNUNET_GNS_disconnect (gns); | 132 | GNUNET_GNS_disconnect (gns); |
109 | gns = NULL; | 133 | gns = NULL; |
110 | } | 134 | } |
135 | if (NULL != idna_name) | ||
136 | { | ||
137 | GNUNET_free (idna_name); | ||
138 | idna_name = NULL; | ||
139 | } | ||
111 | } | 140 | } |
112 | 141 | ||
113 | 142 | ||
@@ -200,6 +229,7 @@ run (void *cls, | |||
200 | (void) cls; | 229 | (void) cls; |
201 | (void) args; | 230 | (void) args; |
202 | (void) cfgfile; | 231 | (void) cfgfile; |
232 | Idna_rc rc; | ||
203 | 233 | ||
204 | cfg = c; | 234 | cfg = c; |
205 | to_task = NULL; | 235 | to_task = NULL; |
@@ -209,13 +239,32 @@ run (void *cls, | |||
209 | if (NULL != (colon = strchr (lookup_name, ':'))) | 239 | if (NULL != (colon = strchr (lookup_name, ':'))) |
210 | *colon = '\0'; | 240 | *colon = '\0'; |
211 | } | 241 | } |
212 | if (GNUNET_OK != GNUNET_DNSPARSER_check_name (lookup_name)) | 242 | /** |
243 | * If DNS compatibility is requested, we first verify that the | ||
244 | * lookup_name is in a DNS format. If yes, we convert it to UTF-8. | ||
245 | */ | ||
246 | if (GNUNET_YES == dns_compat) | ||
213 | { | 247 | { |
214 | fprintf (stderr, | 248 | if (GNUNET_OK != GNUNET_DNSPARSER_check_name (lookup_name)) |
215 | _ ("`%s' is not a valid domain name\n"), | 249 | { |
216 | lookup_name); | 250 | fprintf (stderr, |
217 | global_ret = 3; | 251 | _ ("`%s' is not a valid DNS domain name\n"), |
218 | return; | 252 | lookup_name); |
253 | global_ret = 3; | ||
254 | return; | ||
255 | } | ||
256 | if (IDNA_SUCCESS != | ||
257 | (rc = idna_to_unicode_8z8z (lookup_name, &idna_name, | ||
258 | IDNA_ALLOW_UNASSIGNED))) | ||
259 | { | ||
260 | fprintf (stderr, | ||
261 | _ ("Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"), | ||
262 | lookup_name, | ||
263 | idna_strerror (rc)); | ||
264 | global_ret = 3; | ||
265 | return; | ||
266 | } | ||
267 | lookup_name = idna_name; | ||
219 | } | 268 | } |
220 | if (GNUNET_YES != | 269 | if (GNUNET_YES != |
221 | GNUNET_CLIENT_test (cfg, | 270 | GNUNET_CLIENT_test (cfg, |
@@ -299,6 +348,11 @@ main (int argc, char *const *argv) | |||
299 | "raw", | 348 | "raw", |
300 | gettext_noop ("No unneeded output"), | 349 | gettext_noop ("No unneeded output"), |
301 | &raw), | 350 | &raw), |
351 | GNUNET_GETOPT_option_flag ('d', | ||
352 | "dns", | ||
353 | gettext_noop ( | ||
354 | "DNS Compatibility: Name is passed in IDNA instead of UTF-8"), | ||
355 | &dns_compat), | ||
302 | GNUNET_GETOPT_OPTION_END }; | 356 | GNUNET_GETOPT_OPTION_END }; |
303 | int ret; | 357 | int ret; |
304 | 358 | ||
diff --git a/src/gns/nss/nss_gns_query.c b/src/gns/nss/nss_gns_query.c index 9ebdcb31f..c79ae61f7 100644 --- a/src/gns/nss/nss_gns_query.c +++ b/src/gns/nss/nss_gns_query.c | |||
@@ -71,7 +71,8 @@ gns_resolve_name (int af, const char *name, struct userdata *u) | |||
71 | if (0 == pid) | 71 | if (0 == pid) |
72 | { | 72 | { |
73 | char *argv[] = { "gnunet-gns", | 73 | char *argv[] = { "gnunet-gns", |
74 | "-r", | 74 | "-r", //Raw output for easier parsing |
75 | "-d", //DNS compatibility (allow IDNA names, no UTF-8) | ||
75 | "-t", | 76 | "-t", |
76 | (AF_INET6 == af) ? "AAAA" : "A", | 77 | (AF_INET6 == af) ? "AAAA" : "A", |
77 | "-u", | 78 | "-u", |