diff options
-rw-r--r-- | doc/man/gnunet-namestore.1 | 8 | ||||
-rw-r--r-- | po/POTFILES.in | 110 | ||||
-rw-r--r-- | src/namestore/gnunet-namestore.c | 117 | ||||
-rw-r--r-- | src/namestore/test_namestore_put_multiple.sh | 1 |
4 files changed, 140 insertions, 96 deletions
diff --git a/doc/man/gnunet-namestore.1 b/doc/man/gnunet-namestore.1 index 10577a0d9..9f4b4d2d6 100644 --- a/doc/man/gnunet-namestore.1 +++ b/doc/man/gnunet-namestore.1 | |||
@@ -61,6 +61,14 @@ label) | |||
61 | Determine our GNS name for the given public key (reverse lookup of the | 61 | Determine our GNS name for the given public key (reverse lookup of the |
62 | PKEY) in the given zone. | 62 | PKEY) in the given zone. |
63 | .B | 63 | .B |
64 | .IP "\-R RECORDLINE, \-\-replace=RECORDLINE" | ||
65 | Sets record set to values given in RECORDLINE. This option can be specified multiple | ||
66 | times to provide multiple records for the record set. Existing records under the | ||
67 | same label will be deleted. The format for the RECORDLINE is | ||
68 | "TTL TYPE FLAGS VALUE" where TTL is the time to live in seconds, TYPE is the | ||
69 | DNS/GNS record type, FLAGS is "(N)ORMAL", "(S)HADOW" or "(P)UBLIC". The VALUE | ||
70 | follows the usual human-readable value format(s) of DNS/GNS. | ||
71 | .B | ||
64 | .IP "\-s, \-\-shadow" | 72 | .IP "\-s, \-\-shadow" |
65 | Create a record that is a shadow record. Shadow records are only used | 73 | Create a record that is a shadow record. Shadow records are only used |
66 | once all other records of the same type under the same label have | 74 | once all other records of the same type under the same label have |
diff --git a/po/POTFILES.in b/po/POTFILES.in index 5f4c5ee7f..54fe7b4e7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -4,21 +4,13 @@ src/arm/arm_monitor_api.c | |||
4 | src/arm/gnunet-arm.c | 4 | src/arm/gnunet-arm.c |
5 | src/arm/gnunet-service-arm.c | 5 | src/arm/gnunet-service-arm.c |
6 | src/arm/mockup-service.c | 6 | src/arm/mockup-service.c |
7 | src/ats-tests/ats-testing-experiment.c | ||
8 | src/ats-tests/ats-testing-log.c | ||
9 | src/ats-tests/ats-testing-preferences.c | ||
10 | src/ats-tests/ats-testing-traffic.c | ||
11 | src/ats-tests/ats-testing.c | ||
12 | src/ats-tests/gnunet-ats-sim.c | ||
13 | src/ats-tests/gnunet-solver-eval.c | ||
14 | src/ats-tool/gnunet-ats.c | ||
15 | src/ats/ats_api_connectivity.c | 7 | src/ats/ats_api_connectivity.c |
16 | src/ats/ats_api_performance.c | 8 | src/ats/ats_api_performance.c |
17 | src/ats/ats_api_scanner.c | 9 | src/ats/ats_api_scanner.c |
18 | src/ats/ats_api_scheduling.c | 10 | src/ats/ats_api_scheduling.c |
19 | src/ats/gnunet-ats-solver-eval.c | 11 | src/ats/gnunet-ats-solver-eval.c |
20 | src/ats/gnunet-service-ats.c | ||
21 | src/ats/gnunet-service-ats_addresses.c | 12 | src/ats/gnunet-service-ats_addresses.c |
13 | src/ats/gnunet-service-ats.c | ||
22 | src/ats/gnunet-service-ats_connectivity.c | 14 | src/ats/gnunet-service-ats_connectivity.c |
23 | src/ats/gnunet-service-ats_normalization.c | 15 | src/ats/gnunet-service-ats_normalization.c |
24 | src/ats/gnunet-service-ats_performance.c | 16 | src/ats/gnunet-service-ats_performance.c |
@@ -29,6 +21,14 @@ src/ats/gnunet-service-ats_scheduling.c | |||
29 | src/ats/plugin_ats_mlp.c | 21 | src/ats/plugin_ats_mlp.c |
30 | src/ats/plugin_ats_proportional.c | 22 | src/ats/plugin_ats_proportional.c |
31 | src/ats/plugin_ats_ril.c | 23 | src/ats/plugin_ats_ril.c |
24 | src/ats-tests/ats-testing.c | ||
25 | src/ats-tests/ats-testing-experiment.c | ||
26 | src/ats-tests/ats-testing-log.c | ||
27 | src/ats-tests/ats-testing-preferences.c | ||
28 | src/ats-tests/ats-testing-traffic.c | ||
29 | src/ats-tests/gnunet-ats-sim.c | ||
30 | src/ats-tests/gnunet-solver-eval.c | ||
31 | src/ats-tool/gnunet-ats.c | ||
32 | src/auction/gnunet-auction-create.c | 32 | src/auction/gnunet-auction-create.c |
33 | src/auction/gnunet-auction-info.c | 33 | src/auction/gnunet-auction-info.c |
34 | src/auction/gnunet-auction-join.c | 34 | src/auction/gnunet-auction-join.c |
@@ -40,8 +40,8 @@ src/block/plugin_block_test.c | |||
40 | src/cadet/cadet_api.c | 40 | src/cadet/cadet_api.c |
41 | src/cadet/cadet_test_lib.c | 41 | src/cadet/cadet_test_lib.c |
42 | src/cadet/desirability_table.c | 42 | src/cadet/desirability_table.c |
43 | src/cadet/gnunet-cadet-profiler.c | ||
44 | src/cadet/gnunet-cadet.c | 43 | src/cadet/gnunet-cadet.c |
44 | src/cadet/gnunet-cadet-profiler.c | ||
45 | src/cadet/gnunet-service-cadet.c | 45 | src/cadet/gnunet-service-cadet.c |
46 | src/cadet/gnunet-service-cadet_channel.c | 46 | src/cadet/gnunet-service-cadet_channel.c |
47 | src/cadet/gnunet-service-cadet_connection.c | 47 | src/cadet/gnunet-service-cadet_connection.c |
@@ -57,15 +57,15 @@ src/consensus/gnunet-service-consensus.c | |||
57 | src/consensus/plugin_block_consensus.c | 57 | src/consensus/plugin_block_consensus.c |
58 | src/conversation/conversation_api.c | 58 | src/conversation/conversation_api.c |
59 | src/conversation/conversation_api_call.c | 59 | src/conversation/conversation_api_call.c |
60 | src/conversation/gnunet-conversation-test.c | ||
61 | src/conversation/gnunet-conversation.c | 60 | src/conversation/gnunet-conversation.c |
62 | src/conversation/gnunet-helper-audio-playback-gst.c | 61 | src/conversation/gnunet-conversation-test.c |
62 | src/conversation/gnunet_gst.c | ||
63 | src/conversation/gnunet_gst_test.c | ||
63 | src/conversation/gnunet-helper-audio-playback.c | 64 | src/conversation/gnunet-helper-audio-playback.c |
64 | src/conversation/gnunet-helper-audio-record-gst.c | 65 | src/conversation/gnunet-helper-audio-playback-gst.c |
65 | src/conversation/gnunet-helper-audio-record.c | 66 | src/conversation/gnunet-helper-audio-record.c |
67 | src/conversation/gnunet-helper-audio-record-gst.c | ||
66 | src/conversation/gnunet-service-conversation.c | 68 | src/conversation/gnunet-service-conversation.c |
67 | src/conversation/gnunet_gst.c | ||
68 | src/conversation/gnunet_gst_test.c | ||
69 | src/conversation/microphone.c | 69 | src/conversation/microphone.c |
70 | src/conversation/plugin_gnsrecord_conversation.c | 70 | src/conversation/plugin_gnsrecord_conversation.c |
71 | src/conversation/speaker.c | 71 | src/conversation/speaker.c |
@@ -101,6 +101,7 @@ src/dht/dht_api.c | |||
101 | src/dht/dht_test_lib.c | 101 | src/dht/dht_test_lib.c |
102 | src/dht/gnunet-dht-get.c | 102 | src/dht/gnunet-dht-get.c |
103 | src/dht/gnunet-dht-monitor.c | 103 | src/dht/gnunet-dht-monitor.c |
104 | src/dht/gnunet_dht_profiler.c | ||
104 | src/dht/gnunet-dht-put.c | 105 | src/dht/gnunet-dht-put.c |
105 | src/dht/gnunet-service-dht.c | 106 | src/dht/gnunet-service-dht.c |
106 | src/dht/gnunet-service-dht_clients.c | 107 | src/dht/gnunet-service-dht_clients.c |
@@ -109,7 +110,6 @@ src/dht/gnunet-service-dht_hello.c | |||
109 | src/dht/gnunet-service-dht_neighbours.c | 110 | src/dht/gnunet-service-dht_neighbours.c |
110 | src/dht/gnunet-service-dht_nse.c | 111 | src/dht/gnunet-service-dht_nse.c |
111 | src/dht/gnunet-service-dht_routing.c | 112 | src/dht/gnunet-service-dht_routing.c |
112 | src/dht/gnunet_dht_profiler.c | ||
113 | src/dht/plugin_block_dht.c | 113 | src/dht/plugin_block_dht.c |
114 | src/dns/dns_api.c | 114 | src/dns/dns_api.c |
115 | src/dns/gnunet-dns-monitor.c | 115 | src/dns/gnunet-dns-monitor.c |
@@ -123,8 +123,8 @@ src/dv/gnunet-dv.c | |||
123 | src/dv/gnunet-service-dv.c | 123 | src/dv/gnunet-service-dv.c |
124 | src/dv/plugin_transport_dv.c | 124 | src/dv/plugin_transport_dv.c |
125 | src/exit/gnunet-daemon-exit.c | 125 | src/exit/gnunet-daemon-exit.c |
126 | src/exit/gnunet-helper-exit-windows.c | ||
127 | src/exit/gnunet-helper-exit.c | 126 | src/exit/gnunet-helper-exit.c |
127 | src/exit/gnunet-helper-exit-windows.c | ||
128 | src/fragmentation/defragmentation.c | 128 | src/fragmentation/defragmentation.c |
129 | src/fragmentation/fragmentation.c | 129 | src/fragmentation/fragmentation.c |
130 | src/fs/fs_api.c | 130 | src/fs/fs_api.c |
@@ -149,8 +149,8 @@ src/fs/gnunet-auto-share.c | |||
149 | src/fs/gnunet-daemon-fsprofiler.c | 149 | src/fs/gnunet-daemon-fsprofiler.c |
150 | src/fs/gnunet-directory.c | 150 | src/fs/gnunet-directory.c |
151 | src/fs/gnunet-download.c | 151 | src/fs/gnunet-download.c |
152 | src/fs/gnunet-fs-profiler.c | ||
153 | src/fs/gnunet-fs.c | 152 | src/fs/gnunet-fs.c |
153 | src/fs/gnunet-fs-profiler.c | ||
154 | src/fs/gnunet-helper-fs-publish.c | 154 | src/fs/gnunet-helper-fs-publish.c |
155 | src/fs/gnunet-publish.c | 155 | src/fs/gnunet-publish.c |
156 | src/fs/gnunet-search.c | 156 | src/fs/gnunet-search.c |
@@ -170,10 +170,10 @@ src/gns/gns_tld_api.c | |||
170 | src/gns/gnunet-bcd.c | 170 | src/gns/gnunet-bcd.c |
171 | src/gns/gnunet-dns2gns.c | 171 | src/gns/gnunet-dns2gns.c |
172 | src/gns/gnunet-gns-benchmark.c | 172 | src/gns/gnunet-gns-benchmark.c |
173 | src/gns/gnunet-gns.c | ||
173 | src/gns/gnunet-gns-helper-service-w32.c | 174 | src/gns/gnunet-gns-helper-service-w32.c |
174 | src/gns/gnunet-gns-import.c | 175 | src/gns/gnunet-gns-import.c |
175 | src/gns/gnunet-gns-proxy.c | 176 | src/gns/gnunet-gns-proxy.c |
176 | src/gns/gnunet-gns.c | ||
177 | src/gns/gnunet-service-gns.c | 177 | src/gns/gnunet-service-gns.c |
178 | src/gns/gnunet-service-gns_interceptor.c | 178 | src/gns/gnunet-service-gns_interceptor.c |
179 | src/gns/gnunet-service-gns_resolver.c | 179 | src/gns/gnunet-service-gns_resolver.c |
@@ -181,15 +181,15 @@ src/gns/nss/nss_gns.c | |||
181 | src/gns/nss/nss_gns_query.c | 181 | src/gns/nss/nss_gns_query.c |
182 | src/gns/plugin_block_gns.c | 182 | src/gns/plugin_block_gns.c |
183 | src/gns/plugin_gnsrecord_gns.c | 183 | src/gns/plugin_gnsrecord_gns.c |
184 | src/gns/w32nsp-install.c | ||
185 | src/gns/w32nsp-resolve.c | ||
186 | src/gns/w32nsp-uninstall.c | ||
187 | src/gns/w32nsp.c | ||
188 | src/gnsrecord/gnsrecord.c | 184 | src/gnsrecord/gnsrecord.c |
189 | src/gnsrecord/gnsrecord_crypto.c | 185 | src/gnsrecord/gnsrecord_crypto.c |
190 | src/gnsrecord/gnsrecord_misc.c | 186 | src/gnsrecord/gnsrecord_misc.c |
191 | src/gnsrecord/gnsrecord_serialization.c | 187 | src/gnsrecord/gnsrecord_serialization.c |
192 | src/gnsrecord/plugin_gnsrecord_dns.c | 188 | src/gnsrecord/plugin_gnsrecord_dns.c |
189 | src/gns/w32nsp.c | ||
190 | src/gns/w32nsp-install.c | ||
191 | src/gns/w32nsp-resolve.c | ||
192 | src/gns/w32nsp-uninstall.c | ||
193 | src/hello/address.c | 193 | src/hello/address.c |
194 | src/hello/gnunet-hello.c | 194 | src/hello/gnunet-hello.c |
195 | src/hello/hello.c | 195 | src/hello/hello.c |
@@ -218,8 +218,8 @@ src/namecache/namecache_api.c | |||
218 | src/namecache/plugin_namecache_flat.c | 218 | src/namecache/plugin_namecache_flat.c |
219 | src/namecache/plugin_namecache_postgres.c | 219 | src/namecache/plugin_namecache_postgres.c |
220 | src/namecache/plugin_namecache_sqlite.c | 220 | src/namecache/plugin_namecache_sqlite.c |
221 | src/namestore/gnunet-namestore-fcfsd.c | ||
222 | src/namestore/gnunet-namestore.c | 221 | src/namestore/gnunet-namestore.c |
222 | src/namestore/gnunet-namestore-fcfsd.c | ||
223 | src/namestore/gnunet-service-namestore.c | 223 | src/namestore/gnunet-service-namestore.c |
224 | src/namestore/gnunet-zoneimport.c | 224 | src/namestore/gnunet-zoneimport.c |
225 | src/namestore/namestore_api.c | 225 | src/namestore/namestore_api.c |
@@ -234,10 +234,10 @@ src/nat-auto/gnunet-service-nat-auto.c | |||
234 | src/nat-auto/gnunet-service-nat-auto_legacy.c | 234 | src/nat-auto/gnunet-service-nat-auto_legacy.c |
235 | src/nat-auto/nat_auto_api.c | 235 | src/nat-auto/nat_auto_api.c |
236 | src/nat-auto/nat_auto_api_test.c | 236 | src/nat-auto/nat_auto_api_test.c |
237 | src/nat/gnunet-helper-nat-client-windows.c | ||
238 | src/nat/gnunet-helper-nat-client.c | 237 | src/nat/gnunet-helper-nat-client.c |
239 | src/nat/gnunet-helper-nat-server-windows.c | 238 | src/nat/gnunet-helper-nat-client-windows.c |
240 | src/nat/gnunet-helper-nat-server.c | 239 | src/nat/gnunet-helper-nat-server.c |
240 | src/nat/gnunet-helper-nat-server-windows.c | ||
241 | src/nat/gnunet-nat.c | 241 | src/nat/gnunet-nat.c |
242 | src/nat/gnunet-service-nat.c | 242 | src/nat/gnunet-service-nat.c |
243 | src/nat/gnunet-service-nat_externalip.c | 243 | src/nat/gnunet-service-nat_externalip.c |
@@ -246,15 +246,15 @@ src/nat/gnunet-service-nat_mini.c | |||
246 | src/nat/gnunet-service-nat_stun.c | 246 | src/nat/gnunet-service-nat_stun.c |
247 | src/nat/nat_api.c | 247 | src/nat/nat_api.c |
248 | src/nat/nat_api_stun.c | 248 | src/nat/nat_api_stun.c |
249 | src/nse/gnunet-nse-profiler.c | ||
250 | src/nse/gnunet-nse.c | 249 | src/nse/gnunet-nse.c |
250 | src/nse/gnunet-nse-profiler.c | ||
251 | src/nse/gnunet-service-nse.c | 251 | src/nse/gnunet-service-nse.c |
252 | src/nse/nse_api.c | 252 | src/nse/nse_api.c |
253 | src/peerinfo-tool/gnunet-peerinfo.c | ||
254 | src/peerinfo-tool/gnunet-peerinfo_plugins.c | ||
255 | src/peerinfo/gnunet-service-peerinfo.c | 253 | src/peerinfo/gnunet-service-peerinfo.c |
256 | src/peerinfo/peerinfo_api.c | 254 | src/peerinfo/peerinfo_api.c |
257 | src/peerinfo/peerinfo_api_notify.c | 255 | src/peerinfo/peerinfo_api_notify.c |
256 | src/peerinfo-tool/gnunet-peerinfo.c | ||
257 | src/peerinfo-tool/gnunet-peerinfo_plugins.c | ||
258 | src/peerstore/gnunet-peerstore.c | 258 | src/peerstore/gnunet-peerstore.c |
259 | src/peerstore/gnunet-service-peerstore.c | 259 | src/peerstore/gnunet-service-peerstore.c |
260 | src/peerstore/peerstore_api.c | 260 | src/peerstore/peerstore_api.c |
@@ -301,6 +301,7 @@ src/regex/regex_internal_dht.c | |||
301 | src/regex/regex_test_graph.c | 301 | src/regex/regex_test_graph.c |
302 | src/regex/regex_test_lib.c | 302 | src/regex/regex_test_lib.c |
303 | src/regex/regex_test_random.c | 303 | src/regex/regex_test_random.c |
304 | src/rest/gnunet-rest-server.c | ||
304 | src/rest-plugins/json_reclaim.c | 305 | src/rest-plugins/json_reclaim.c |
305 | src/rest-plugins/oidc_helper.c | 306 | src/rest-plugins/oidc_helper.c |
306 | src/rest-plugins/plugin_rest_copying.c | 307 | src/rest-plugins/plugin_rest_copying.c |
@@ -311,28 +312,27 @@ src/rest-plugins/plugin_rest_namestore.c | |||
311 | src/rest-plugins/plugin_rest_openid_connect.c | 312 | src/rest-plugins/plugin_rest_openid_connect.c |
312 | src/rest-plugins/plugin_rest_peerinfo.c | 313 | src/rest-plugins/plugin_rest_peerinfo.c |
313 | src/rest-plugins/plugin_rest_reclaim.c | 314 | src/rest-plugins/plugin_rest_reclaim.c |
314 | src/rest/gnunet-rest-server.c | ||
315 | src/rest/rest.c | 315 | src/rest/rest.c |
316 | src/revocation/gnunet-revocation.c | 316 | src/revocation/gnunet-revocation.c |
317 | src/revocation/gnunet-service-revocation.c | 317 | src/revocation/gnunet-service-revocation.c |
318 | src/revocation/plugin_block_revocation.c | 318 | src/revocation/plugin_block_revocation.c |
319 | src/revocation/revocation_api.c | 319 | src/revocation/revocation_api.c |
320 | src/rps/gnunet-rps-profiler.c | ||
321 | src/rps/gnunet-rps.c | 320 | src/rps/gnunet-rps.c |
321 | src/rps/gnunet-rps-profiler.c | ||
322 | src/rps/gnunet-service-rps.c | 322 | src/rps/gnunet-service-rps.c |
323 | src/rps/gnunet-service-rps_custommap.c | 323 | src/rps/gnunet-service-rps_custommap.c |
324 | src/rps/gnunet-service-rps_sampler.c | 324 | src/rps/gnunet-service-rps_sampler.c |
325 | src/rps/gnunet-service-rps_sampler_elem.c | 325 | src/rps/gnunet-service-rps_sampler_elem.c |
326 | src/rps/gnunet-service-rps_view.c | 326 | src/rps/gnunet-service-rps_view.c |
327 | src/rps/rps_api.c | ||
327 | src/rps/rps-sampler_client.c | 328 | src/rps/rps-sampler_client.c |
328 | src/rps/rps-sampler_common.c | 329 | src/rps/rps-sampler_common.c |
329 | src/rps/rps-test_util.c | 330 | src/rps/rps-test_util.c |
330 | src/rps/rps_api.c | ||
331 | src/scalarproduct/gnunet-scalarproduct.c | 331 | src/scalarproduct/gnunet-scalarproduct.c |
332 | src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c | ||
333 | src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c | ||
334 | src/scalarproduct/gnunet-service-scalarproduct_alice.c | 332 | src/scalarproduct/gnunet-service-scalarproduct_alice.c |
335 | src/scalarproduct/gnunet-service-scalarproduct_bob.c | 333 | src/scalarproduct/gnunet-service-scalarproduct_bob.c |
334 | src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c | ||
335 | src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c | ||
336 | src/scalarproduct/scalarproduct_api.c | 336 | src/scalarproduct/scalarproduct_api.c |
337 | src/secretsharing/gnunet-secretsharing-profiler.c | 337 | src/secretsharing/gnunet-secretsharing-profiler.c |
338 | src/secretsharing/gnunet-service-secretsharing.c | 338 | src/secretsharing/gnunet-service-secretsharing.c |
@@ -361,16 +361,15 @@ src/statistics/gnunet-statistics.c | |||
361 | src/statistics/statistics_api.c | 361 | src/statistics/statistics_api.c |
362 | src/template/gnunet-service-template.c | 362 | src/template/gnunet-service-template.c |
363 | src/template/gnunet-template.c | 363 | src/template/gnunet-template.c |
364 | src/testbed-logger/gnunet-service-testbed-logger.c | ||
365 | src/testbed-logger/testbed_logger_api.c | ||
366 | src/testbed/generate-underlay-topology.c | 364 | src/testbed/generate-underlay-topology.c |
367 | src/testbed/gnunet-daemon-latency-logger.c | 365 | src/testbed/gnunet-daemon-latency-logger.c |
368 | src/testbed/gnunet-daemon-testbed-blacklist.c | 366 | src/testbed/gnunet-daemon-testbed-blacklist.c |
369 | src/testbed/gnunet-daemon-testbed-underlay.c | 367 | src/testbed/gnunet-daemon-testbed-underlay.c |
370 | src/testbed/gnunet-helper-testbed.c | 368 | src/testbed/gnunet-helper-testbed.c |
369 | src/testbed/gnunet_mpi_test.c | ||
371 | src/testbed/gnunet-service-test-barriers.c | 370 | src/testbed/gnunet-service-test-barriers.c |
372 | src/testbed/gnunet-service-testbed.c | ||
373 | src/testbed/gnunet-service-testbed_barriers.c | 371 | src/testbed/gnunet-service-testbed_barriers.c |
372 | src/testbed/gnunet-service-testbed.c | ||
374 | src/testbed/gnunet-service-testbed_cache.c | 373 | src/testbed/gnunet-service-testbed_cache.c |
375 | src/testbed/gnunet-service-testbed_connectionpool.c | 374 | src/testbed/gnunet-service-testbed_connectionpool.c |
376 | src/testbed/gnunet-service-testbed_cpustatus.c | 375 | src/testbed/gnunet-service-testbed_cpustatus.c |
@@ -378,19 +377,20 @@ src/testbed/gnunet-service-testbed_links.c | |||
378 | src/testbed/gnunet-service-testbed_meminfo.c | 377 | src/testbed/gnunet-service-testbed_meminfo.c |
379 | src/testbed/gnunet-service-testbed_oc.c | 378 | src/testbed/gnunet-service-testbed_oc.c |
380 | src/testbed/gnunet-service-testbed_peers.c | 379 | src/testbed/gnunet-service-testbed_peers.c |
381 | src/testbed/gnunet-testbed-profiler.c | ||
382 | src/testbed/gnunet_mpi_test.c | ||
383 | src/testbed/gnunet_testbed_mpi_spawn.c | 380 | src/testbed/gnunet_testbed_mpi_spawn.c |
384 | src/testbed/testbed_api.c | 381 | src/testbed/gnunet-testbed-profiler.c |
382 | src/testbed-logger/gnunet-service-testbed-logger.c | ||
383 | src/testbed-logger/testbed_logger_api.c | ||
385 | src/testbed/testbed_api_barriers.c | 384 | src/testbed/testbed_api_barriers.c |
385 | src/testbed/testbed_api.c | ||
386 | src/testbed/testbed_api_hosts.c | 386 | src/testbed/testbed_api_hosts.c |
387 | src/testbed/testbed_api_operations.c | 387 | src/testbed/testbed_api_operations.c |
388 | src/testbed/testbed_api_peers.c | 388 | src/testbed/testbed_api_peers.c |
389 | src/testbed/testbed_api_sd.c | 389 | src/testbed/testbed_api_sd.c |
390 | src/testbed/testbed_api_services.c | 390 | src/testbed/testbed_api_services.c |
391 | src/testbed/testbed_api_statistics.c | 391 | src/testbed/testbed_api_statistics.c |
392 | src/testbed/testbed_api_test.c | ||
393 | src/testbed/testbed_api_testbed.c | 392 | src/testbed/testbed_api_testbed.c |
393 | src/testbed/testbed_api_test.c | ||
394 | src/testbed/testbed_api_topology.c | 394 | src/testbed/testbed_api_topology.c |
395 | src/testbed/testbed_api_underlay.c | 395 | src/testbed/testbed_api_underlay.c |
396 | src/testing/gnunet-testing.c | 396 | src/testing/gnunet-testing.c |
@@ -400,29 +400,29 @@ src/topology/friends.c | |||
400 | src/topology/gnunet-daemon-topology.c | 400 | src/topology/gnunet-daemon-topology.c |
401 | src/transport/gnunet-communicator-unix.c | 401 | src/transport/gnunet-communicator-unix.c |
402 | src/transport/gnunet-helper-transport-bluetooth.c | 402 | src/transport/gnunet-helper-transport-bluetooth.c |
403 | src/transport/gnunet-helper-transport-wlan-dummy.c | ||
404 | src/transport/gnunet-helper-transport-wlan.c | 403 | src/transport/gnunet-helper-transport-wlan.c |
404 | src/transport/gnunet-helper-transport-wlan-dummy.c | ||
405 | src/transport/gnunet-service-tng.c | 405 | src/transport/gnunet-service-tng.c |
406 | src/transport/gnunet-service-transport.c | ||
407 | src/transport/gnunet-service-transport_ats.c | 406 | src/transport/gnunet-service-transport_ats.c |
407 | src/transport/gnunet-service-transport.c | ||
408 | src/transport/gnunet-service-transport_hello.c | 408 | src/transport/gnunet-service-transport_hello.c |
409 | src/transport/gnunet-service-transport_manipulation.c | 409 | src/transport/gnunet-service-transport_manipulation.c |
410 | src/transport/gnunet-service-transport_neighbours.c | 410 | src/transport/gnunet-service-transport_neighbours.c |
411 | src/transport/gnunet-service-transport_plugins.c | 411 | src/transport/gnunet-service-transport_plugins.c |
412 | src/transport/gnunet-service-transport_validation.c | 412 | src/transport/gnunet-service-transport_validation.c |
413 | src/transport/gnunet-transport.c | ||
413 | src/transport/gnunet-transport-certificate-creation.c | 414 | src/transport/gnunet-transport-certificate-creation.c |
414 | src/transport/gnunet-transport-profiler.c | 415 | src/transport/gnunet-transport-profiler.c |
415 | src/transport/gnunet-transport-wlan-receiver.c | 416 | src/transport/gnunet-transport-wlan-receiver.c |
416 | src/transport/gnunet-transport-wlan-sender.c | 417 | src/transport/gnunet-transport-wlan-sender.c |
417 | src/transport/gnunet-transport.c | ||
418 | src/transport/plugin_transport_http_client.c | 418 | src/transport/plugin_transport_http_client.c |
419 | src/transport/plugin_transport_http_common.c | 419 | src/transport/plugin_transport_http_common.c |
420 | src/transport/plugin_transport_http_server.c | 420 | src/transport/plugin_transport_http_server.c |
421 | src/transport/plugin_transport_smtp.c | 421 | src/transport/plugin_transport_smtp.c |
422 | src/transport/plugin_transport_tcp.c | 422 | src/transport/plugin_transport_tcp.c |
423 | src/transport/plugin_transport_template.c | 423 | src/transport/plugin_transport_template.c |
424 | src/transport/plugin_transport_udp.c | ||
425 | src/transport/plugin_transport_udp_broadcasting.c | 424 | src/transport/plugin_transport_udp_broadcasting.c |
425 | src/transport/plugin_transport_udp.c | ||
426 | src/transport/plugin_transport_unix.c | 426 | src/transport/plugin_transport_unix.c |
427 | src/transport/plugin_transport_wlan.c | 427 | src/transport/plugin_transport_wlan.c |
428 | src/transport/plugin_transport_xt.c | 428 | src/transport/plugin_transport_xt.c |
@@ -431,11 +431,6 @@ src/transport/tcp_connection_legacy.c | |||
431 | src/transport/tcp_server_legacy.c | 431 | src/transport/tcp_server_legacy.c |
432 | src/transport/tcp_server_mst_legacy.c | 432 | src/transport/tcp_server_mst_legacy.c |
433 | src/transport/tcp_service_legacy.c | 433 | src/transport/tcp_service_legacy.c |
434 | src/transport/transport-testing-filenames.c | ||
435 | src/transport/transport-testing-loggers.c | ||
436 | src/transport/transport-testing-main.c | ||
437 | src/transport/transport-testing-send.c | ||
438 | src/transport/transport-testing.c | ||
439 | src/transport/transport_api2_communication.c | 434 | src/transport/transport_api2_communication.c |
440 | src/transport/transport_api_address_to_string.c | 435 | src/transport/transport_api_address_to_string.c |
441 | src/transport/transport_api_blacklist.c | 436 | src/transport/transport_api_blacklist.c |
@@ -445,6 +440,11 @@ src/transport/transport_api_manipulation.c | |||
445 | src/transport/transport_api_monitor_peers.c | 440 | src/transport/transport_api_monitor_peers.c |
446 | src/transport/transport_api_monitor_plugins.c | 441 | src/transport/transport_api_monitor_plugins.c |
447 | src/transport/transport_api_offer_hello.c | 442 | src/transport/transport_api_offer_hello.c |
443 | src/transport/transport-testing.c | ||
444 | src/transport/transport-testing-filenames.c | ||
445 | src/transport/transport-testing-loggers.c | ||
446 | src/transport/transport-testing-main.c | ||
447 | src/transport/transport-testing-send.c | ||
448 | src/util/bandwidth.c | 448 | src/util/bandwidth.c |
449 | src/util/benchmark.c | 449 | src/util/benchmark.c |
450 | src/util/bio.c | 450 | src/util/bio.c |
@@ -457,8 +457,8 @@ src/util/configuration_loader.c | |||
457 | src/util/container_bloomfilter.c | 457 | src/util/container_bloomfilter.c |
458 | src/util/container_heap.c | 458 | src/util/container_heap.c |
459 | src/util/container_meta_data.c | 459 | src/util/container_meta_data.c |
460 | src/util/container_multihashmap.c | ||
461 | src/util/container_multihashmap32.c | 460 | src/util/container_multihashmap32.c |
461 | src/util/container_multihashmap.c | ||
462 | src/util/container_multipeermap.c | 462 | src/util/container_multipeermap.c |
463 | src/util/container_multishortmap.c | 463 | src/util/container_multishortmap.c |
464 | src/util/crypto_abe.c | 464 | src/util/crypto_abe.c |
@@ -480,15 +480,15 @@ src/util/dnsparser.c | |||
480 | src/util/dnsstub.c | 480 | src/util/dnsstub.c |
481 | src/util/getopt.c | 481 | src/util/getopt.c |
482 | src/util/getopt_helpers.c | 482 | src/util/getopt_helpers.c |
483 | src/util/gnunet-config-diff.c | ||
484 | src/util/gnunet-config.c | 483 | src/util/gnunet-config.c |
484 | src/util/gnunet-config-diff.c | ||
485 | src/util/gnunet-ecc.c | 485 | src/util/gnunet-ecc.c |
486 | src/util/gnunet-helper-w32-console.c | 486 | src/util/gnunet-helper-w32-console.c |
487 | src/util/gnunet-resolver.c | 487 | src/util/gnunet-resolver.c |
488 | src/util/gnunet-scrypt.c | 488 | src/util/gnunet-scrypt.c |
489 | src/util/gnunet-service-resolver.c | 489 | src/util/gnunet-service-resolver.c |
490 | src/util/gnunet-timeout-w32.c | ||
491 | src/util/gnunet-timeout.c | 490 | src/util/gnunet-timeout.c |
491 | src/util/gnunet-timeout-w32.c | ||
492 | src/util/gnunet-uri.c | 492 | src/util/gnunet-uri.c |
493 | src/util/helper.c | 493 | src/util/helper.c |
494 | src/util/load.c | 494 | src/util/load.c |
@@ -516,13 +516,13 @@ src/util/tun.c | |||
516 | src/util/w32cat.c | 516 | src/util/w32cat.c |
517 | src/util/win.c | 517 | src/util/win.c |
518 | src/util/winproc.c | 518 | src/util/winproc.c |
519 | src/vpn/gnunet-helper-vpn-windows.c | ||
520 | src/vpn/gnunet-helper-vpn.c | 519 | src/vpn/gnunet-helper-vpn.c |
520 | src/vpn/gnunet-helper-vpn-windows.c | ||
521 | src/vpn/gnunet-service-vpn.c | 521 | src/vpn/gnunet-service-vpn.c |
522 | src/vpn/gnunet-vpn.c | 522 | src/vpn/gnunet-vpn.c |
523 | src/vpn/vpn_api.c | 523 | src/vpn/vpn_api.c |
524 | src/zonemaster/gnunet-service-zonemaster-monitor.c | ||
525 | src/zonemaster/gnunet-service-zonemaster.c | 524 | src/zonemaster/gnunet-service-zonemaster.c |
525 | src/zonemaster/gnunet-service-zonemaster-monitor.c | ||
526 | src/fs/fs_api.h | 526 | src/fs/fs_api.h |
527 | src/include/gnunet_common.h | 527 | src/include/gnunet_common.h |
528 | src/include/gnunet_mq_lib.h | 528 | src/include/gnunet_mq_lib.h |
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c index 619d0c528..8386a696d 100644 --- a/src/namestore/gnunet-namestore.c +++ b/src/namestore/gnunet-namestore.c | |||
@@ -136,6 +136,11 @@ static int is_shadow; | |||
136 | static struct GNUNET_NAMESTORE_QueueEntry *del_qe; | 136 | static struct GNUNET_NAMESTORE_QueueEntry *del_qe; |
137 | 137 | ||
138 | /** | 138 | /** |
139 | * Queue entry for the 'set/replace' operation. | ||
140 | */ | ||
141 | static struct GNUNET_NAMESTORE_QueueEntry *set_qe; | ||
142 | |||
143 | /** | ||
139 | * Name of the records to add/list/remove. | 144 | * Name of the records to add/list/remove. |
140 | */ | 145 | */ |
141 | static char *name; | 146 | static char *name; |
@@ -195,7 +200,6 @@ static size_t data_size; | |||
195 | */ | 200 | */ |
196 | static uint64_t etime; | 201 | static uint64_t etime; |
197 | 202 | ||
198 | |||
199 | /** | 203 | /** |
200 | * Is expiration time relative or absolute time? | 204 | * Is expiration time relative or absolute time? |
201 | */ | 205 | */ |
@@ -251,6 +255,11 @@ do_shutdown (void *cls) | |||
251 | GNUNET_NAMESTORE_cancel (add_qe); | 255 | GNUNET_NAMESTORE_cancel (add_qe); |
252 | add_qe = NULL; | 256 | add_qe = NULL; |
253 | } | 257 | } |
258 | if (NULL != set_qe) | ||
259 | { | ||
260 | GNUNET_NAMESTORE_cancel (set_qe); | ||
261 | set_qe = NULL; | ||
262 | } | ||
254 | if (NULL != add_qe_uri) | 263 | if (NULL != add_qe_uri) |
255 | { | 264 | { |
256 | GNUNET_NAMESTORE_cancel (add_qe_uri); | 265 | GNUNET_NAMESTORE_cancel (add_qe_uri); |
@@ -930,43 +939,34 @@ parse_expiration (const char *expirationstring, | |||
930 | } | 939 | } |
931 | 940 | ||
932 | 941 | ||
933 | #if 0 | 942 | /** |
934 | /* globals? */ | 943 | * Function called when namestore is done with the replace |
935 | unsigned int rd_count; | 944 | * operation. |
936 | struct GNUNET_GNSRECORD_Data *rd; | 945 | * |
937 | 946 | * @param cls NULL | |
938 | 947 | * @param success #GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate) | |
939 | rd_count = 0; | 948 | * #GNUNET_NO if content was already there or not found |
940 | for (struct RecordSetEntry *e = recordset; NULL != e; e = e->next) | 949 | * #GNUNET_YES (or other positive value) on success |
941 | rd_count++; | 950 | * @param emsg NULL on success, otherwise an error message |
942 | rd = GNUNET_new_array (rd_count, | 951 | */ |
943 | struct GNUNET_GNSRECORD_Data); | 952 | static void |
944 | rd_count = 0; | 953 | replace_cont (void *cls, |
945 | for (struct RecordSetEntry *e = recordset; NULL != e; e = e->next) | 954 | int success, |
955 | const char *emsg) | ||
946 | { | 956 | { |
947 | rd[rd_count] = e->record; | 957 | (void) cls; |
948 | rd_count++; | 958 | |
959 | set_qe = NULL; | ||
960 | if (GNUNET_OK != success) | ||
961 | { | ||
962 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, | ||
963 | _("Failed to replace records: %s\n"), | ||
964 | emsg); | ||
965 | ret = 1; /* fail from 'main' */ | ||
966 | } | ||
967 | GNUNET_SCHEDULER_shutdown (); | ||
949 | } | 968 | } |
950 | 969 | ||
951 | /* if add: */ | ||
952 | qe = GNUNET_NAMESTORE_records_store (..., | ||
953 | rd_count, | ||
954 | rd, | ||
955 | &my_cont | ||
956 | ..); | ||
957 | |||
958 | in 'my_cont' and/or shutdown: | ||
959 | |||
960 | qe = NULL; | ||
961 | GNUNET_free (rd); | ||
962 | |||
963 | in shutdown: | ||
964 | |||
965 | if NULL != qe NAMESTORE_cancel (qe); | ||
966 | GNUNET_free (rd); | ||
967 | |||
968 | #endif | ||
969 | |||
970 | 970 | ||
971 | /** | 971 | /** |
972 | * Callback invoked from identity service with ego information. | 972 | * Callback invoked from identity service with ego information. |
@@ -1000,7 +1000,7 @@ identity_cb (void *cls, | |||
1000 | GNUNET_free_non_null (ego_name); | 1000 | GNUNET_free_non_null (ego_name); |
1001 | ego_name = NULL; | 1001 | ego_name = NULL; |
1002 | 1002 | ||
1003 | if (! (add|del|list|(NULL != nickstring)|(NULL != uri)|(NULL != reverse_pkey)) ) | 1003 | if (! (add|del|list|(NULL != nickstring)|(NULL != uri)|(NULL != reverse_pkey))|(NULL != recordset) ) |
1004 | { | 1004 | { |
1005 | /* nothing more to be done */ | 1005 | /* nothing more to be done */ |
1006 | fprintf (stderr, | 1006 | fprintf (stderr, |
@@ -1009,8 +1009,7 @@ identity_cb (void *cls, | |||
1009 | return; | 1009 | return; |
1010 | } | 1010 | } |
1011 | GNUNET_CRYPTO_ecdsa_key_get_public (&zone_pkey, | 1011 | GNUNET_CRYPTO_ecdsa_key_get_public (&zone_pkey, |
1012 | &pub); | 1012 | &pub); |
1013 | |||
1014 | ns = GNUNET_NAMESTORE_connect (cfg); | 1013 | ns = GNUNET_NAMESTORE_connect (cfg); |
1015 | if (NULL == ns) | 1014 | if (NULL == ns) |
1016 | { | 1015 | { |
@@ -1018,6 +1017,44 @@ identity_cb (void *cls, | |||
1018 | _("Failed to connect to namestore\n")); | 1017 | _("Failed to connect to namestore\n")); |
1019 | return; | 1018 | return; |
1020 | } | 1019 | } |
1020 | |||
1021 | if (NULL != recordset) | ||
1022 | { | ||
1023 | /* replace entire record set */ | ||
1024 | unsigned int rd_count; | ||
1025 | struct GNUNET_GNSRECORD_Data *rd; | ||
1026 | |||
1027 | if (NULL == name) | ||
1028 | { | ||
1029 | fprintf (stderr, | ||
1030 | _("Missing option `%s' for operation `%s'\n"), | ||
1031 | "-n", _("replace")); | ||
1032 | GNUNET_SCHEDULER_shutdown (); | ||
1033 | ret = 1; | ||
1034 | return; | ||
1035 | } | ||
1036 | rd_count = 0; | ||
1037 | for (struct RecordSetEntry *e = recordset; NULL != e; e = e->next) | ||
1038 | rd_count++; | ||
1039 | rd = GNUNET_new_array (rd_count, | ||
1040 | struct GNUNET_GNSRECORD_Data); | ||
1041 | rd_count = 0; | ||
1042 | for (struct RecordSetEntry *e = recordset; NULL != e; e = e->next) | ||
1043 | { | ||
1044 | rd[rd_count] = e->record; | ||
1045 | rd_count++; | ||
1046 | } | ||
1047 | set_qe = GNUNET_NAMESTORE_records_store (ns, | ||
1048 | &zone_pkey, | ||
1049 | name, | ||
1050 | rd_count, | ||
1051 | rd, | ||
1052 | &replace_cont, | ||
1053 | NULL); | ||
1054 | GNUNET_free (rd); | ||
1055 | return; | ||
1056 | } | ||
1057 | |||
1021 | if (add) | 1058 | if (add) |
1022 | { | 1059 | { |
1023 | if (NULL == name) | 1060 | if (NULL == name) |
@@ -1526,9 +1563,9 @@ main (int argc, | |||
1526 | gettext_noop ("determine our name for the given PKEY"), | 1563 | gettext_noop ("determine our name for the given PKEY"), |
1527 | &reverse_pkey), | 1564 | &reverse_pkey), |
1528 | multirecord_option ('R', | 1565 | multirecord_option ('R', |
1529 | "record", | 1566 | "replace", |
1530 | "RECORDLINE", | 1567 | "RECORDLINE", |
1531 | gettext_noop ("complete record on one line to add/delete/display; can be specified multiple times"), | 1568 | gettext_noop ("set record set to values given by (possibly multiple) RECORDLINES; can be specified multiple times"), |
1532 | &recordset), | 1569 | &recordset), |
1533 | GNUNET_GETOPT_option_string ('t', | 1570 | GNUNET_GETOPT_option_string ('t', |
1534 | "type", | 1571 | "type", |
diff --git a/src/namestore/test_namestore_put_multiple.sh b/src/namestore/test_namestore_put_multiple.sh index 48ad95a3c..81e1ad2b5 100644 --- a/src/namestore/test_namestore_put_multiple.sh +++ b/src/namestore/test_namestore_put_multiple.sh | |||
@@ -75,7 +75,6 @@ function testing { | |||
75 | # TEST CASES | 75 | # TEST CASES |
76 | # 1 | 76 | # 1 |
77 | echo "Testing adding of single A record with -R" | 77 | echo "Testing adding of single A record with -R" |
78 | declare -a arr=('1200 A n 127.0.0.1') | ||
79 | testing test1 "${arr[@]}" | 78 | testing test1 "${arr[@]}" |
80 | # 2 | 79 | # 2 |
81 | echo "Testing adding of multiple A records with -R" | 80 | echo "Testing adding of multiple A records with -R" |