diff options
-rw-r--r-- | configure.ac | 12 | ||||
-rw-r--r-- | doc/handbook/gendocs_template | 2 | ||||
-rw-r--r-- | doc/handbook/gendocs_template_min | 2 | ||||
-rw-r--r-- | po/POTFILES.in | 102 | ||||
-rw-r--r-- | src/datacache/plugin_datacache_postgres.c | 9 | ||||
-rw-r--r-- | src/datastore/plugin_datastore_postgres.c | 14 | ||||
-rw-r--r-- | src/namecache/plugin_namecache_postgres.c | 6 | ||||
-rw-r--r-- | src/namestore/plugin_namestore_postgres.c | 6 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport.c | 2 | ||||
-rw-r--r-- | src/util/strings.c | 22 |
10 files changed, 98 insertions, 79 deletions
diff --git a/configure.ac b/configure.ac index 3cf7e6cb6..581764b52 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1335,7 +1335,7 @@ CPPFLAGS=$SAVE_CPPFLAGS | |||
1335 | 1335 | ||
1336 | # test for postgres: | 1336 | # test for postgres: |
1337 | postgres=false | 1337 | postgres=false |
1338 | AX_LIB_POSTGRESQL([9.5], | 1338 | AX_LIB_POSTGRESQL([12.0], |
1339 | [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" | 1339 | [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" |
1340 | AC_CHECK_HEADERS([libpq-fe.h], | 1340 | AC_CHECK_HEADERS([libpq-fe.h], |
1341 | postgres=true) | 1341 | postgres=true) |
@@ -1817,6 +1817,16 @@ AC_MSG_RESULT($use_gcov) | |||
1817 | AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) | 1817 | AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) |
1818 | 1818 | ||
1819 | 1819 | ||
1820 | # Temporarily disable a specific piece of code until TNG is out. | ||
1821 | AC_ARG_ENABLE([transport-timing-diagnostic], | ||
1822 | [AS_HELP_STRING([--enable-transport-timing-diagnostic], | ||
1823 | [enable logging of transport (not TNG) sending times])], | ||
1824 | [enable_ttd=yes], | ||
1825 | [enable_ttd=no]) | ||
1826 | AS_IF([test "x$enable_ttd" = "xyes"], | ||
1827 | [AC_DEFINE([ENABLE_TTD], [1], [Define if transport (not TNG) should warn about sending times.])]) | ||
1828 | |||
1829 | |||
1820 | # version info | 1830 | # version info |
1821 | # TODO: git blame says this predates our switch to git. | 1831 | # TODO: git blame says this predates our switch to git. |
1822 | # git-svn should be adjusted to simply git, or | 1832 | # git-svn should be adjusted to simply git, or |
diff --git a/doc/handbook/gendocs_template b/doc/handbook/gendocs_template index 178f6cb4c..cb0450bee 100644 --- a/doc/handbook/gendocs_template +++ b/doc/handbook/gendocs_template | |||
@@ -72,7 +72,7 @@ script</a>.)</p> | |||
72 | 72 | ||
73 | <p>Please send general FSF & GNU inquiries to | 73 | <p>Please send general FSF & GNU inquiries to |
74 | <a href="mailto:gnu@gnu.org"><gnu@gnu.org></a>. | 74 | <a href="mailto:gnu@gnu.org"><gnu@gnu.org></a>. |
75 | There are also <a href="/contact/">other ways to contact</a> | 75 | There are also <a href="https://www.gnu.org/contact/">other ways to contact</a> |
76 | the FSF. Broken links and other corrections or suggestions can be sent | 76 | the FSF. Broken links and other corrections or suggestions can be sent |
77 | to <a href="mailto:%%EMAIL%%"><%%EMAIL%%></a>.</p> | 77 | to <a href="mailto:%%EMAIL%%"><%%EMAIL%%></a>.</p> |
78 | </div> | 78 | </div> |
diff --git a/doc/handbook/gendocs_template_min b/doc/handbook/gendocs_template_min index 112fa3bfb..6a4711870 100644 --- a/doc/handbook/gendocs_template_min +++ b/doc/handbook/gendocs_template_min | |||
@@ -75,7 +75,7 @@ script</a>.)</p> | |||
75 | 75 | ||
76 | <p>Please send general FSF & GNU inquiries to | 76 | <p>Please send general FSF & GNU inquiries to |
77 | <a href="mailto:gnu@gnu.org"><gnu@gnu.org></a>. | 77 | <a href="mailto:gnu@gnu.org"><gnu@gnu.org></a>. |
78 | There are also <a href="/contact/">other ways to contact</a> | 78 | There are also <a href="https://www.gnu.org/contact/">other ways to contact</a> |
79 | the FSF. Broken links and other corrections or suggestions can be sent | 79 | the FSF. Broken links and other corrections or suggestions can be sent |
80 | to <a href="mailto:%%EMAIL%%"><%%EMAIL%%></a>.</p> | 80 | to <a href="mailto:%%EMAIL%%"><%%EMAIL%%></a>.</p> |
81 | </div> | 81 | </div> |
diff --git a/po/POTFILES.in b/po/POTFILES.in index 36d948d93..5c379eed8 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 |
@@ -50,8 +50,8 @@ src/cadet/cadet_api_list_peers.c | |||
50 | src/cadet/cadet_api_list_tunnels.c | 50 | src/cadet/cadet_api_list_tunnels.c |
51 | src/cadet/cadet_test_lib.c | 51 | src/cadet/cadet_test_lib.c |
52 | src/cadet/desirability_table.c | 52 | src/cadet/desirability_table.c |
53 | src/cadet/gnunet-cadet.c | ||
54 | src/cadet/gnunet-cadet-profiler.c | 53 | src/cadet/gnunet-cadet-profiler.c |
54 | src/cadet/gnunet-cadet.c | ||
55 | src/cadet/gnunet-service-cadet.c | 55 | src/cadet/gnunet-service-cadet.c |
56 | src/cadet/gnunet-service-cadet_channel.c | 56 | src/cadet/gnunet-service-cadet_channel.c |
57 | src/cadet/gnunet-service-cadet_connection.c | 57 | src/cadet/gnunet-service-cadet_connection.c |
@@ -67,15 +67,15 @@ src/consensus/gnunet-service-consensus.c | |||
67 | src/consensus/plugin_block_consensus.c | 67 | src/consensus/plugin_block_consensus.c |
68 | src/conversation/conversation_api.c | 68 | src/conversation/conversation_api.c |
69 | src/conversation/conversation_api_call.c | 69 | src/conversation/conversation_api_call.c |
70 | src/conversation/gnunet-conversation.c | ||
71 | src/conversation/gnunet-conversation-test.c | 70 | src/conversation/gnunet-conversation-test.c |
72 | src/conversation/gnunet_gst.c | 71 | src/conversation/gnunet-conversation.c |
73 | src/conversation/gnunet_gst_test.c | ||
74 | src/conversation/gnunet-helper-audio-playback.c | ||
75 | src/conversation/gnunet-helper-audio-playback-gst.c | 72 | src/conversation/gnunet-helper-audio-playback-gst.c |
76 | src/conversation/gnunet-helper-audio-record.c | 73 | src/conversation/gnunet-helper-audio-playback.c |
77 | src/conversation/gnunet-helper-audio-record-gst.c | 74 | src/conversation/gnunet-helper-audio-record-gst.c |
75 | src/conversation/gnunet-helper-audio-record.c | ||
78 | src/conversation/gnunet-service-conversation.c | 76 | src/conversation/gnunet-service-conversation.c |
77 | src/conversation/gnunet_gst.c | ||
78 | src/conversation/gnunet_gst_test.c | ||
79 | src/conversation/microphone.c | 79 | src/conversation/microphone.c |
80 | src/conversation/plugin_gnsrecord_conversation.c | 80 | src/conversation/plugin_gnsrecord_conversation.c |
81 | src/conversation/speaker.c | 81 | src/conversation/speaker.c |
@@ -105,7 +105,6 @@ src/dht/dht_api.c | |||
105 | src/dht/dht_test_lib.c | 105 | src/dht/dht_test_lib.c |
106 | src/dht/gnunet-dht-get.c | 106 | src/dht/gnunet-dht-get.c |
107 | src/dht/gnunet-dht-monitor.c | 107 | src/dht/gnunet-dht-monitor.c |
108 | src/dht/gnunet_dht_profiler.c | ||
109 | src/dht/gnunet-dht-put.c | 108 | src/dht/gnunet-dht-put.c |
110 | src/dht/gnunet-service-dht.c | 109 | src/dht/gnunet-service-dht.c |
111 | src/dht/gnunet-service-dht_clients.c | 110 | src/dht/gnunet-service-dht_clients.c |
@@ -114,6 +113,7 @@ src/dht/gnunet-service-dht_hello.c | |||
114 | src/dht/gnunet-service-dht_neighbours.c | 113 | src/dht/gnunet-service-dht_neighbours.c |
115 | src/dht/gnunet-service-dht_nse.c | 114 | src/dht/gnunet-service-dht_nse.c |
116 | src/dht/gnunet-service-dht_routing.c | 115 | src/dht/gnunet-service-dht_routing.c |
116 | src/dht/gnunet_dht_profiler.c | ||
117 | src/dht/plugin_block_dht.c | 117 | src/dht/plugin_block_dht.c |
118 | src/dns/dns_api.c | 118 | src/dns/dns_api.c |
119 | src/dns/gnunet-dns-monitor.c | 119 | src/dns/gnunet-dns-monitor.c |
@@ -148,8 +148,8 @@ src/fs/gnunet-auto-share.c | |||
148 | src/fs/gnunet-daemon-fsprofiler.c | 148 | src/fs/gnunet-daemon-fsprofiler.c |
149 | src/fs/gnunet-directory.c | 149 | src/fs/gnunet-directory.c |
150 | src/fs/gnunet-download.c | 150 | src/fs/gnunet-download.c |
151 | src/fs/gnunet-fs.c | ||
152 | src/fs/gnunet-fs-profiler.c | 151 | src/fs/gnunet-fs-profiler.c |
152 | src/fs/gnunet-fs.c | ||
153 | src/fs/gnunet-helper-fs-publish.c | 153 | src/fs/gnunet-helper-fs-publish.c |
154 | src/fs/gnunet-publish.c | 154 | src/fs/gnunet-publish.c |
155 | src/fs/gnunet-search.c | 155 | src/fs/gnunet-search.c |
@@ -169,9 +169,9 @@ src/gns/gns_tld_api.c | |||
169 | src/gns/gnunet-bcd.c | 169 | src/gns/gnunet-bcd.c |
170 | src/gns/gnunet-dns2gns.c | 170 | src/gns/gnunet-dns2gns.c |
171 | src/gns/gnunet-gns-benchmark.c | 171 | src/gns/gnunet-gns-benchmark.c |
172 | src/gns/gnunet-gns.c | ||
173 | src/gns/gnunet-gns-import.c | 172 | src/gns/gnunet-gns-import.c |
174 | src/gns/gnunet-gns-proxy.c | 173 | src/gns/gnunet-gns-proxy.c |
174 | src/gns/gnunet-gns.c | ||
175 | src/gns/gnunet-service-gns.c | 175 | src/gns/gnunet-service-gns.c |
176 | src/gns/gnunet-service-gns_interceptor.c | 176 | src/gns/gnunet-service-gns_interceptor.c |
177 | src/gns/gnunet-service-gns_resolver.c | 177 | src/gns/gnunet-service-gns_resolver.c |
@@ -188,8 +188,8 @@ src/gnsrecord/gnunet-gnsrecord-tvg.c | |||
188 | src/gnsrecord/plugin_gnsrecord_dns.c | 188 | src/gnsrecord/plugin_gnsrecord_dns.c |
189 | src/hello/address.c | 189 | src/hello/address.c |
190 | src/hello/gnunet-hello.c | 190 | src/hello/gnunet-hello.c |
191 | src/hello/hello.c | ||
192 | src/hello/hello-ng.c | 191 | src/hello/hello-ng.c |
192 | src/hello/hello.c | ||
193 | src/hostlist/gnunet-daemon-hostlist.c | 193 | src/hostlist/gnunet-daemon-hostlist.c |
194 | src/hostlist/gnunet-daemon-hostlist_client.c | 194 | src/hostlist/gnunet-daemon-hostlist_client.c |
195 | src/hostlist/gnunet-daemon-hostlist_server.c | 195 | src/hostlist/gnunet-daemon-hostlist_server.c |
@@ -214,8 +214,8 @@ src/namecache/namecache_api.c | |||
214 | src/namecache/plugin_namecache_flat.c | 214 | src/namecache/plugin_namecache_flat.c |
215 | src/namecache/plugin_namecache_postgres.c | 215 | src/namecache/plugin_namecache_postgres.c |
216 | src/namecache/plugin_namecache_sqlite.c | 216 | src/namecache/plugin_namecache_sqlite.c |
217 | src/namestore/gnunet-namestore.c | ||
218 | src/namestore/gnunet-namestore-fcfsd.c | 217 | src/namestore/gnunet-namestore-fcfsd.c |
218 | src/namestore/gnunet-namestore.c | ||
219 | src/namestore/gnunet-service-namestore.c | 219 | src/namestore/gnunet-service-namestore.c |
220 | src/namestore/gnunet-zoneimport.c | 220 | src/namestore/gnunet-zoneimport.c |
221 | src/namestore/namestore_api.c | 221 | src/namestore/namestore_api.c |
@@ -241,17 +241,17 @@ src/nat/gnunet-service-nat_mini.c | |||
241 | src/nat/gnunet-service-nat_stun.c | 241 | src/nat/gnunet-service-nat_stun.c |
242 | src/nat/nat_api.c | 242 | src/nat/nat_api.c |
243 | src/nat/nat_api_stun.c | 243 | src/nat/nat_api_stun.c |
244 | src/nse/gnunet-nse.c | ||
245 | src/nse/gnunet-nse-profiler.c | 244 | src/nse/gnunet-nse-profiler.c |
245 | src/nse/gnunet-nse.c | ||
246 | src/nse/gnunet-service-nse.c | 246 | src/nse/gnunet-service-nse.c |
247 | src/nse/nse_api.c | 247 | src/nse/nse_api.c |
248 | src/nt/nt.c | 248 | src/nt/nt.c |
249 | src/peerinfo/gnunet-service-peerinfo.c | ||
250 | src/peerinfo/peerinfo_api.c | ||
251 | src/peerinfo/peerinfo_api_notify.c | ||
252 | src/peerinfo-tool/gnunet-peerinfo.c | 249 | src/peerinfo-tool/gnunet-peerinfo.c |
253 | src/peerinfo-tool/gnunet-peerinfo_plugins.c | 250 | src/peerinfo-tool/gnunet-peerinfo_plugins.c |
254 | src/peerinfo-tool/plugin_rest_peerinfo.c | 251 | src/peerinfo-tool/plugin_rest_peerinfo.c |
252 | src/peerinfo/gnunet-service-peerinfo.c | ||
253 | src/peerinfo/peerinfo_api.c | ||
254 | src/peerinfo/peerinfo_api_notify.c | ||
255 | src/peerstore/gnunet-peerstore.c | 255 | src/peerstore/gnunet-peerstore.c |
256 | src/peerstore/gnunet-service-peerstore.c | 256 | src/peerstore/gnunet-service-peerstore.c |
257 | src/peerstore/peerstore_api.c | 257 | src/peerstore/peerstore_api.c |
@@ -297,27 +297,27 @@ src/rest/gnunet-rest-server.c | |||
297 | src/rest/plugin_rest_config.c | 297 | src/rest/plugin_rest_config.c |
298 | src/rest/plugin_rest_copying.c | 298 | src/rest/plugin_rest_copying.c |
299 | src/rest/rest.c | 299 | src/rest/rest.c |
300 | src/revocation/gnunet-revocation.c | ||
301 | src/revocation/gnunet-revocation-tvg.c | 300 | src/revocation/gnunet-revocation-tvg.c |
301 | src/revocation/gnunet-revocation.c | ||
302 | src/revocation/gnunet-service-revocation.c | 302 | src/revocation/gnunet-service-revocation.c |
303 | src/revocation/plugin_block_revocation.c | 303 | src/revocation/plugin_block_revocation.c |
304 | src/revocation/revocation_api.c | 304 | src/revocation/revocation_api.c |
305 | src/rps/gnunet-rps.c | ||
306 | src/rps/gnunet-rps-profiler.c | 305 | src/rps/gnunet-rps-profiler.c |
306 | src/rps/gnunet-rps.c | ||
307 | src/rps/gnunet-service-rps.c | 307 | src/rps/gnunet-service-rps.c |
308 | src/rps/gnunet-service-rps_custommap.c | 308 | src/rps/gnunet-service-rps_custommap.c |
309 | src/rps/gnunet-service-rps_sampler.c | 309 | src/rps/gnunet-service-rps_sampler.c |
310 | src/rps/gnunet-service-rps_sampler_elem.c | 310 | src/rps/gnunet-service-rps_sampler_elem.c |
311 | src/rps/gnunet-service-rps_view.c | 311 | src/rps/gnunet-service-rps_view.c |
312 | src/rps/rps_api.c | ||
313 | src/rps/rps-sampler_client.c | 312 | src/rps/rps-sampler_client.c |
314 | src/rps/rps-sampler_common.c | 313 | src/rps/rps-sampler_common.c |
315 | src/rps/rps-test_util.c | 314 | src/rps/rps-test_util.c |
315 | src/rps/rps_api.c | ||
316 | src/scalarproduct/gnunet-scalarproduct.c | 316 | src/scalarproduct/gnunet-scalarproduct.c |
317 | src/scalarproduct/gnunet-service-scalarproduct_alice.c | ||
318 | src/scalarproduct/gnunet-service-scalarproduct_bob.c | ||
319 | src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c | 317 | src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c |
320 | src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c | 318 | src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c |
319 | src/scalarproduct/gnunet-service-scalarproduct_alice.c | ||
320 | src/scalarproduct/gnunet-service-scalarproduct_bob.c | ||
321 | src/scalarproduct/scalarproduct_api.c | 321 | src/scalarproduct/scalarproduct_api.c |
322 | src/secretsharing/gnunet-secretsharing-profiler.c | 322 | src/secretsharing/gnunet-secretsharing-profiler.c |
323 | src/secretsharing/gnunet-service-secretsharing.c | 323 | src/secretsharing/gnunet-service-secretsharing.c |
@@ -331,12 +331,12 @@ src/set/gnunet-set-ibf-profiler.c | |||
331 | src/set/gnunet-set-profiler.c | 331 | src/set/gnunet-set-profiler.c |
332 | src/set/ibf.c | 332 | src/set/ibf.c |
333 | src/set/ibf_sim.c | 333 | src/set/ibf_sim.c |
334 | src/set/plugin_block_set_test.c | ||
335 | src/set/set_api.c | ||
334 | src/seti/gnunet-service-seti.c | 336 | src/seti/gnunet-service-seti.c |
335 | src/seti/gnunet-seti-profiler.c | 337 | src/seti/gnunet-seti-profiler.c |
336 | src/seti/plugin_block_seti_test.c | 338 | src/seti/plugin_block_seti_test.c |
337 | src/seti/seti_api.c | 339 | src/seti/seti_api.c |
338 | src/set/plugin_block_set_test.c | ||
339 | src/set/set_api.c | ||
340 | src/setu/gnunet-service-setu.c | 340 | src/setu/gnunet-service-setu.c |
341 | src/setu/gnunet-service-setu_strata_estimator.c | 341 | src/setu/gnunet-service-setu_strata_estimator.c |
342 | src/setu/gnunet-setu-ibf-profiler.c | 342 | src/setu/gnunet-setu-ibf-profiler.c |
@@ -355,15 +355,16 @@ src/statistics/gnunet-statistics.c | |||
355 | src/statistics/statistics_api.c | 355 | src/statistics/statistics_api.c |
356 | src/template/gnunet-service-template.c | 356 | src/template/gnunet-service-template.c |
357 | src/template/gnunet-template.c | 357 | src/template/gnunet-template.c |
358 | src/testbed-logger/gnunet-service-testbed-logger.c | ||
359 | src/testbed-logger/testbed_logger_api.c | ||
358 | src/testbed/generate-underlay-topology.c | 360 | src/testbed/generate-underlay-topology.c |
359 | src/testbed/gnunet-daemon-latency-logger.c | 361 | src/testbed/gnunet-daemon-latency-logger.c |
360 | src/testbed/gnunet-daemon-testbed-blacklist.c | 362 | src/testbed/gnunet-daemon-testbed-blacklist.c |
361 | src/testbed/gnunet-daemon-testbed-underlay.c | 363 | src/testbed/gnunet-daemon-testbed-underlay.c |
362 | src/testbed/gnunet-helper-testbed.c | 364 | src/testbed/gnunet-helper-testbed.c |
363 | src/testbed/gnunet_mpi_test.c | ||
364 | src/testbed/gnunet-service-test-barriers.c | 365 | src/testbed/gnunet-service-test-barriers.c |
365 | src/testbed/gnunet-service-testbed_barriers.c | ||
366 | src/testbed/gnunet-service-testbed.c | 366 | src/testbed/gnunet-service-testbed.c |
367 | src/testbed/gnunet-service-testbed_barriers.c | ||
367 | src/testbed/gnunet-service-testbed_cache.c | 368 | src/testbed/gnunet-service-testbed_cache.c |
368 | src/testbed/gnunet-service-testbed_connectionpool.c | 369 | src/testbed/gnunet-service-testbed_connectionpool.c |
369 | src/testbed/gnunet-service-testbed_cpustatus.c | 370 | src/testbed/gnunet-service-testbed_cpustatus.c |
@@ -371,20 +372,19 @@ src/testbed/gnunet-service-testbed_links.c | |||
371 | src/testbed/gnunet-service-testbed_meminfo.c | 372 | src/testbed/gnunet-service-testbed_meminfo.c |
372 | src/testbed/gnunet-service-testbed_oc.c | 373 | src/testbed/gnunet-service-testbed_oc.c |
373 | src/testbed/gnunet-service-testbed_peers.c | 374 | src/testbed/gnunet-service-testbed_peers.c |
374 | src/testbed/gnunet_testbed_mpi_spawn.c | ||
375 | src/testbed/gnunet-testbed-profiler.c | 375 | src/testbed/gnunet-testbed-profiler.c |
376 | src/testbed-logger/gnunet-service-testbed-logger.c | 376 | src/testbed/gnunet_mpi_test.c |
377 | src/testbed-logger/testbed_logger_api.c | 377 | src/testbed/gnunet_testbed_mpi_spawn.c |
378 | src/testbed/testbed_api_barriers.c | ||
379 | src/testbed/testbed_api.c | 378 | src/testbed/testbed_api.c |
379 | src/testbed/testbed_api_barriers.c | ||
380 | src/testbed/testbed_api_hosts.c | 380 | src/testbed/testbed_api_hosts.c |
381 | src/testbed/testbed_api_operations.c | 381 | src/testbed/testbed_api_operations.c |
382 | src/testbed/testbed_api_peers.c | 382 | src/testbed/testbed_api_peers.c |
383 | src/testbed/testbed_api_sd.c | 383 | src/testbed/testbed_api_sd.c |
384 | src/testbed/testbed_api_services.c | 384 | src/testbed/testbed_api_services.c |
385 | src/testbed/testbed_api_statistics.c | 385 | src/testbed/testbed_api_statistics.c |
386 | src/testbed/testbed_api_testbed.c | ||
387 | src/testbed/testbed_api_test.c | 386 | src/testbed/testbed_api_test.c |
387 | src/testbed/testbed_api_testbed.c | ||
388 | src/testbed/testbed_api_topology.c | 388 | src/testbed/testbed_api_topology.c |
389 | src/testbed/testbed_api_underlay.c | 389 | src/testbed/testbed_api_underlay.c |
390 | src/testing/gnunet-testing.c | 390 | src/testing/gnunet-testing.c |
@@ -396,34 +396,40 @@ src/transport/gnunet-communicator-tcp.c | |||
396 | src/transport/gnunet-communicator-udp.c | 396 | src/transport/gnunet-communicator-udp.c |
397 | src/transport/gnunet-communicator-unix.c | 397 | src/transport/gnunet-communicator-unix.c |
398 | src/transport/gnunet-helper-transport-bluetooth.c | 398 | src/transport/gnunet-helper-transport-bluetooth.c |
399 | src/transport/gnunet-helper-transport-wlan.c | ||
400 | src/transport/gnunet-helper-transport-wlan-dummy.c | 399 | src/transport/gnunet-helper-transport-wlan-dummy.c |
400 | src/transport/gnunet-helper-transport-wlan.c | ||
401 | src/transport/gnunet-service-tng.c | 401 | src/transport/gnunet-service-tng.c |
402 | src/transport/gnunet-service-transport_ats.c | ||
403 | src/transport/gnunet-service-transport.c | 402 | src/transport/gnunet-service-transport.c |
403 | src/transport/gnunet-service-transport_ats.c | ||
404 | src/transport/gnunet-service-transport_hello.c | 404 | src/transport/gnunet-service-transport_hello.c |
405 | src/transport/gnunet-service-transport_manipulation.c | 405 | src/transport/gnunet-service-transport_manipulation.c |
406 | src/transport/gnunet-service-transport_neighbours.c | 406 | src/transport/gnunet-service-transport_neighbours.c |
407 | src/transport/gnunet-service-transport_plugins.c | 407 | src/transport/gnunet-service-transport_plugins.c |
408 | src/transport/gnunet-service-transport_validation.c | 408 | src/transport/gnunet-service-transport_validation.c |
409 | src/transport/gnunet-transport.c | ||
410 | src/transport/gnunet-transport-profiler.c | 409 | src/transport/gnunet-transport-profiler.c |
411 | src/transport/gnunet-transport-wlan-receiver.c | 410 | src/transport/gnunet-transport-wlan-receiver.c |
412 | src/transport/gnunet-transport-wlan-sender.c | 411 | src/transport/gnunet-transport-wlan-sender.c |
412 | src/transport/gnunet-transport.c | ||
413 | src/transport/plugin_transport_http_client.c | 413 | src/transport/plugin_transport_http_client.c |
414 | src/transport/plugin_transport_http_common.c | 414 | src/transport/plugin_transport_http_common.c |
415 | src/transport/plugin_transport_http_server.c | 415 | src/transport/plugin_transport_http_server.c |
416 | src/transport/plugin_transport_smtp.c | 416 | src/transport/plugin_transport_smtp.c |
417 | src/transport/plugin_transport_tcp.c | 417 | src/transport/plugin_transport_tcp.c |
418 | src/transport/plugin_transport_template.c | 418 | src/transport/plugin_transport_template.c |
419 | src/transport/plugin_transport_udp_broadcasting.c | ||
420 | src/transport/plugin_transport_udp.c | 419 | src/transport/plugin_transport_udp.c |
420 | src/transport/plugin_transport_udp_broadcasting.c | ||
421 | src/transport/plugin_transport_unix.c | 421 | src/transport/plugin_transport_unix.c |
422 | src/transport/plugin_transport_wlan.c | 422 | src/transport/plugin_transport_wlan.c |
423 | src/transport/tcp_connection_legacy.c | 423 | src/transport/tcp_connection_legacy.c |
424 | src/transport/tcp_server_legacy.c | 424 | src/transport/tcp_server_legacy.c |
425 | src/transport/tcp_server_mst_legacy.c | 425 | src/transport/tcp_server_mst_legacy.c |
426 | src/transport/tcp_service_legacy.c | 426 | src/transport/tcp_service_legacy.c |
427 | src/transport/transport-testing-filenames.c | ||
428 | src/transport/transport-testing-loggers.c | ||
429 | src/transport/transport-testing-main.c | ||
430 | src/transport/transport-testing-send.c | ||
431 | src/transport/transport-testing.c | ||
432 | src/transport/transport-testing2.c | ||
427 | src/transport/transport_api2_application.c | 433 | src/transport/transport_api2_application.c |
428 | src/transport/transport_api2_communication.c | 434 | src/transport/transport_api2_communication.c |
429 | src/transport/transport_api2_core.c | 435 | src/transport/transport_api2_core.c |
@@ -436,12 +442,6 @@ src/transport/transport_api_manipulation.c | |||
436 | src/transport/transport_api_monitor_peers.c | 442 | src/transport/transport_api_monitor_peers.c |
437 | src/transport/transport_api_monitor_plugins.c | 443 | src/transport/transport_api_monitor_plugins.c |
438 | src/transport/transport_api_offer_hello.c | 444 | src/transport/transport_api_offer_hello.c |
439 | src/transport/transport-testing2.c | ||
440 | src/transport/transport-testing.c | ||
441 | src/transport/transport-testing-filenames.c | ||
442 | src/transport/transport-testing-loggers.c | ||
443 | src/transport/transport-testing-main.c | ||
444 | src/transport/transport-testing-send.c | ||
445 | src/util/bandwidth.c | 445 | src/util/bandwidth.c |
446 | src/util/benchmark.c | 446 | src/util/benchmark.c |
447 | src/util/bio.c | 447 | src/util/bio.c |
@@ -456,8 +456,8 @@ src/util/consttime_memcmp.c | |||
456 | src/util/container_bloomfilter.c | 456 | src/util/container_bloomfilter.c |
457 | src/util/container_heap.c | 457 | src/util/container_heap.c |
458 | src/util/container_meta_data.c | 458 | src/util/container_meta_data.c |
459 | src/util/container_multihashmap32.c | ||
460 | src/util/container_multihashmap.c | 459 | src/util/container_multihashmap.c |
460 | src/util/container_multihashmap32.c | ||
461 | src/util/container_multipeermap.c | 461 | src/util/container_multipeermap.c |
462 | src/util/container_multishortmap.c | 462 | src/util/container_multishortmap.c |
463 | src/util/container_multiuuidmap.c | 463 | src/util/container_multiuuidmap.c |
@@ -481,8 +481,8 @@ src/util/dnsparser.c | |||
481 | src/util/dnsstub.c | 481 | src/util/dnsstub.c |
482 | src/util/getopt.c | 482 | src/util/getopt.c |
483 | src/util/getopt_helpers.c | 483 | src/util/getopt_helpers.c |
484 | src/util/gnunet-config.c | ||
485 | src/util/gnunet-config-diff.c | 484 | src/util/gnunet-config-diff.c |
485 | src/util/gnunet-config.c | ||
486 | src/util/gnunet-crypto-tvg.c | 486 | src/util/gnunet-crypto-tvg.c |
487 | src/util/gnunet-ecc.c | 487 | src/util/gnunet-ecc.c |
488 | src/util/gnunet-qr.c | 488 | src/util/gnunet-qr.c |
@@ -520,8 +520,8 @@ src/vpn/gnunet-helper-vpn.c | |||
520 | src/vpn/gnunet-service-vpn.c | 520 | src/vpn/gnunet-service-vpn.c |
521 | src/vpn/gnunet-vpn.c | 521 | src/vpn/gnunet-vpn.c |
522 | src/vpn/vpn_api.c | 522 | src/vpn/vpn_api.c |
523 | src/zonemaster/gnunet-service-zonemaster.c | ||
524 | src/zonemaster/gnunet-service-zonemaster-monitor.c | 523 | src/zonemaster/gnunet-service-zonemaster-monitor.c |
524 | src/zonemaster/gnunet-service-zonemaster.c | ||
525 | src/fs/fs_api.h | 525 | src/fs/fs_api.h |
526 | src/testbed/testbed_api.h | 526 | src/testbed/testbed_api.h |
527 | src/testbed/testbed_api_operations.h | 527 | src/testbed/testbed_api_operations.h |
diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c index c21be9219..724324ca4 100644 --- a/src/datacache/plugin_datacache_postgres.c +++ b/src/datacache/plugin_datacache_postgres.c | |||
@@ -67,14 +67,19 @@ static int | |||
67 | init_connection (struct Plugin *plugin) | 67 | init_connection (struct Plugin *plugin) |
68 | { | 68 | { |
69 | struct GNUNET_PQ_ExecuteStatement es[] = { | 69 | struct GNUNET_PQ_ExecuteStatement es[] = { |
70 | GNUNET_PQ_make_try_execute ("CREATE TEMPORARY SEQUENCE IF NOT EXISTS gn011dc_oid_seq"), | ||
70 | GNUNET_PQ_make_execute ("CREATE TEMPORARY TABLE IF NOT EXISTS gn011dc (" | 71 | GNUNET_PQ_make_execute ("CREATE TEMPORARY TABLE IF NOT EXISTS gn011dc (" |
72 | " oid OID NOT NULL DEFAULT nextval('gn011dc_oid_seq')," | ||
71 | " type INTEGER NOT NULL," | 73 | " type INTEGER NOT NULL," |
72 | " prox INTEGER NOT NULL," | 74 | " prox INTEGER NOT NULL," |
73 | " discard_time BIGINT NOT NULL," | 75 | " discard_time BIGINT NOT NULL," |
74 | " key BYTEA NOT NULL," | 76 | " key BYTEA NOT NULL," |
75 | " value BYTEA NOT NULL," | 77 | " value BYTEA NOT NULL," |
76 | " path BYTEA DEFAULT NULL)" | 78 | " path BYTEA DEFAULT NULL)"), |
77 | "WITH OIDS"), | 79 | GNUNET_PQ_make_try_execute ( |
80 | "ALTER SEQUENCE gnu011dc_oid_seq OWNED BY gn011dc.oid"), | ||
81 | GNUNET_PQ_make_try_execute ( | ||
82 | "CREATE INDEX IF NOT EXISTS idx_oid ON gn011dc (oid)"), | ||
78 | GNUNET_PQ_make_try_execute ( | 83 | GNUNET_PQ_make_try_execute ( |
79 | "CREATE INDEX IF NOT EXISTS idx_key ON gn011dc (key)"), | 84 | "CREATE INDEX IF NOT EXISTS idx_key ON gn011dc (key)"), |
80 | GNUNET_PQ_make_try_execute ( | 85 | GNUNET_PQ_make_try_execute ( |
diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c index 88ceb1b0a..6a5d45832 100644 --- a/src/datastore/plugin_datastore_postgres.c +++ b/src/datastore/plugin_datastore_postgres.c | |||
@@ -72,8 +72,10 @@ init_connection (struct Plugin *plugin) | |||
72 | * we only test equality on it and can cast it to/from uint32_t. For repl, prio, and anonLevel | 72 | * we only test equality on it and can cast it to/from uint32_t. For repl, prio, and anonLevel |
73 | * we do math or inequality tests, so we can't handle the entire range of uint32_t. | 73 | * we do math or inequality tests, so we can't handle the entire range of uint32_t. |
74 | * This will also cause problems for expiration times after 294247-01-10-04:00:54 UTC. | 74 | * This will also cause problems for expiration times after 294247-01-10-04:00:54 UTC. |
75 | * PostgreSQL also recommends against using WITH OIDS. | 75 | */ |
76 | */GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS gn090 (" | 76 | GNUNET_PQ_make_try_execute ( |
77 | "CREATE SEQUENCE IF NOT EXISTS gn090_oid_seq"), | ||
78 | GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS gn090 (" | ||
77 | " repl INTEGER NOT NULL DEFAULT 0," | 79 | " repl INTEGER NOT NULL DEFAULT 0," |
78 | " type INTEGER NOT NULL DEFAULT 0," | 80 | " type INTEGER NOT NULL DEFAULT 0," |
79 | " prio INTEGER NOT NULL DEFAULT 0," | 81 | " prio INTEGER NOT NULL DEFAULT 0," |
@@ -82,8 +84,12 @@ init_connection (struct Plugin *plugin) | |||
82 | " rvalue BIGINT NOT NULL DEFAULT 0," | 84 | " rvalue BIGINT NOT NULL DEFAULT 0," |
83 | " hash BYTEA NOT NULL DEFAULT ''," | 85 | " hash BYTEA NOT NULL DEFAULT ''," |
84 | " vhash BYTEA NOT NULL DEFAULT ''," | 86 | " vhash BYTEA NOT NULL DEFAULT ''," |
85 | " value BYTEA NOT NULL DEFAULT '')" | 87 | " value BYTEA NOT NULL DEFAULT ''," |
86 | "WITH OIDS"), | 88 | " oid OID NOT NULL DEFAULT nextval('gn090_oid_seq'))"), |
89 | GNUNET_PQ_make_try_execute ( | ||
90 | "ALTER SEQUENCE gn090_oid_seq OWNED BY gn090.oid"), | ||
91 | GNUNET_PQ_make_try_execute ( | ||
92 | "CREATE INDEX IF NOT EXISTS oid_hash ON gn090 (oid)"), | ||
87 | GNUNET_PQ_make_try_execute ( | 93 | GNUNET_PQ_make_try_execute ( |
88 | "CREATE INDEX IF NOT EXISTS idx_hash ON gn090 (hash)"), | 94 | "CREATE INDEX IF NOT EXISTS idx_hash ON gn090 (hash)"), |
89 | GNUNET_PQ_make_try_execute ( | 95 | GNUNET_PQ_make_try_execute ( |
diff --git a/src/namecache/plugin_namecache_postgres.c b/src/namecache/plugin_namecache_postgres.c index 0e947e9c5..654a3ae81 100644 --- a/src/namecache/plugin_namecache_postgres.c +++ b/src/namecache/plugin_namecache_postgres.c | |||
@@ -64,15 +64,13 @@ database_setup (struct Plugin *plugin) | |||
64 | " query BYTEA NOT NULL DEFAULT ''," | 64 | " query BYTEA NOT NULL DEFAULT ''," |
65 | " block BYTEA NOT NULL DEFAULT ''," | 65 | " block BYTEA NOT NULL DEFAULT ''," |
66 | " expiration_time BIGINT NOT NULL DEFAULT 0" | 66 | " expiration_time BIGINT NOT NULL DEFAULT 0" |
67 | ")" | 67 | ")"); |
68 | "WITH OIDS"); | ||
69 | struct GNUNET_PQ_ExecuteStatement es_default = | 68 | struct GNUNET_PQ_ExecuteStatement es_default = |
70 | GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS ns096blocks (" | 69 | GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS ns096blocks (" |
71 | " query BYTEA NOT NULL DEFAULT ''," | 70 | " query BYTEA NOT NULL DEFAULT ''," |
72 | " block BYTEA NOT NULL DEFAULT ''," | 71 | " block BYTEA NOT NULL DEFAULT ''," |
73 | " expiration_time BIGINT NOT NULL DEFAULT 0" | 72 | " expiration_time BIGINT NOT NULL DEFAULT 0" |
74 | ")" | 73 | ")"); |
75 | "WITH OIDS"); | ||
76 | const struct GNUNET_PQ_ExecuteStatement *cr; | 74 | const struct GNUNET_PQ_ExecuteStatement *cr; |
77 | 75 | ||
78 | if (GNUNET_YES == | 76 | if (GNUNET_YES == |
diff --git a/src/namestore/plugin_namestore_postgres.c b/src/namestore/plugin_namestore_postgres.c index 01dddde9e..04100567c 100644 --- a/src/namestore/plugin_namestore_postgres.c +++ b/src/namestore/plugin_namestore_postgres.c | |||
@@ -73,8 +73,7 @@ database_setup (struct Plugin *plugin) | |||
73 | " record_data BYTEA NOT NULL DEFAULT ''," | 73 | " record_data BYTEA NOT NULL DEFAULT ''," |
74 | " label TEXT NOT NULL DEFAULT ''," | 74 | " label TEXT NOT NULL DEFAULT ''," |
75 | " CONSTRAINT zl UNIQUE (zone_private_key,label)" | 75 | " CONSTRAINT zl UNIQUE (zone_private_key,label)" |
76 | ")" | 76 | ")"); |
77 | "WITH OIDS"); | ||
78 | struct GNUNET_PQ_ExecuteStatement es_default = | 77 | struct GNUNET_PQ_ExecuteStatement es_default = |
79 | GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS ns098records (" | 78 | GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS ns098records (" |
80 | " seq BIGSERIAL PRIMARY KEY," | 79 | " seq BIGSERIAL PRIMARY KEY," |
@@ -85,8 +84,7 @@ database_setup (struct Plugin *plugin) | |||
85 | " record_data BYTEA NOT NULL DEFAULT ''," | 84 | " record_data BYTEA NOT NULL DEFAULT ''," |
86 | " label TEXT NOT NULL DEFAULT ''," | 85 | " label TEXT NOT NULL DEFAULT ''," |
87 | " CONSTRAINT zl UNIQUE (zone_private_key,label)" | 86 | " CONSTRAINT zl UNIQUE (zone_private_key,label)" |
88 | ")" | 87 | ")"); |
89 | "WITH OIDS"); | ||
90 | const struct GNUNET_PQ_ExecuteStatement *cr; | 88 | const struct GNUNET_PQ_ExecuteStatement *cr; |
91 | struct GNUNET_PQ_ExecuteStatement sc = GNUNET_PQ_EXECUTE_STATEMENT_END; | 89 | struct GNUNET_PQ_ExecuteStatement sc = GNUNET_PQ_EXECUTE_STATEMENT_END; |
92 | 90 | ||
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 207c17f2f..92e37a91c 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -700,6 +700,7 @@ handle_send_transmit_continuation (void *cls, | |||
700 | 700 | ||
701 | delay = GNUNET_TIME_absolute_get_duration (stcc->send_time); | 701 | delay = GNUNET_TIME_absolute_get_duration (stcc->send_time); |
702 | addr = GST_neighbour_get_current_address (&stcc->target); | 702 | addr = GST_neighbour_get_current_address (&stcc->target); |
703 | #ifdef ENABLE_TTD | ||
703 | if (delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us) | 704 | if (delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us) |
704 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 705 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
705 | "It took us %s to send %u/%u bytes to %s (%d, %s)\n", | 706 | "It took us %s to send %u/%u bytes to %s (%d, %s)\n", |
@@ -718,6 +719,7 @@ handle_send_transmit_continuation (void *cls, | |||
718 | GNUNET_i2s (&stcc->target), | 719 | GNUNET_i2s (&stcc->target), |
719 | success, | 720 | success, |
720 | (NULL != addr) ? addr->transport_name : "%"); | 721 | (NULL != addr) ? addr->transport_name : "%"); |
722 | #endif | ||
721 | 723 | ||
722 | if (GNUNET_NO == stcc->down) | 724 | if (GNUNET_NO == stcc->down) |
723 | { | 725 | { |
diff --git a/src/util/strings.c b/src/util/strings.c index 9d6f4039e..381b66e1e 100644 --- a/src/util/strings.c +++ b/src/util/strings.c | |||
@@ -176,7 +176,7 @@ GNUNET_STRINGS_buffer_tokenize (const char *buffer, | |||
176 | char * | 176 | char * |
177 | GNUNET_STRINGS_byte_size_fancy (unsigned long long size) | 177 | GNUNET_STRINGS_byte_size_fancy (unsigned long long size) |
178 | { | 178 | { |
179 | const char *unit = _ (/* size unit */ "b"); | 179 | const char *unit = /* size unit */ "b"; |
180 | char *ret; | 180 | char *ret; |
181 | 181 | ||
182 | if (size > 5 * 1024) | 182 | if (size > 5 * 1024) |
@@ -703,37 +703,37 @@ GNUNET_STRINGS_relative_time_to_string (struct GNUNET_TIME_Relative delta, | |||
703 | int do_round) | 703 | int do_round) |
704 | { | 704 | { |
705 | static GNUNET_THREAD_LOCAL char buf[128]; | 705 | static GNUNET_THREAD_LOCAL char buf[128]; |
706 | const char *unit = _ (/* time unit */ "µs"); | 706 | const char *unit = /* time unit */ "µs"; |
707 | uint64_t dval = delta.rel_value_us; | 707 | uint64_t dval = delta.rel_value_us; |
708 | 708 | ||
709 | if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == delta.rel_value_us) | 709 | if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == delta.rel_value_us) |
710 | return _ ("forever"); | 710 | return "forever"; |
711 | if (0 == delta.rel_value_us) | 711 | if (0 == delta.rel_value_us) |
712 | return _ ("0 ms"); | 712 | return "0 ms"; |
713 | if (((GNUNET_YES == do_round) && (dval > 5 * 1000)) || (0 == (dval % 1000))) | 713 | if (((GNUNET_YES == do_round) && (dval > 5 * 1000)) || (0 == (dval % 1000))) |
714 | { | 714 | { |
715 | dval = dval / 1000; | 715 | dval = dval / 1000; |
716 | unit = _ (/* time unit */ "ms"); | 716 | unit = /* time unit */ "ms"; |
717 | if (((GNUNET_YES == do_round) && (dval > 5 * 1000)) || (0 == (dval % 1000))) | 717 | if (((GNUNET_YES == do_round) && (dval > 5 * 1000)) || (0 == (dval % 1000))) |
718 | { | 718 | { |
719 | dval = dval / 1000; | 719 | dval = dval / 1000; |
720 | unit = _ (/* time unit */ "s"); | 720 | unit = /* time unit */ "s"; |
721 | if (((GNUNET_YES == do_round) && (dval > 5 * 60)) || (0 == (dval % 60))) | 721 | if (((GNUNET_YES == do_round) && (dval > 5 * 60)) || (0 == (dval % 60))) |
722 | { | 722 | { |
723 | dval = dval / 60; | 723 | dval = dval / 60; |
724 | unit = _ (/* time unit */ "m"); | 724 | unit = /* time unit */ "m"; |
725 | if (((GNUNET_YES == do_round) && (dval > 5 * 60)) || (0 == (dval % 60))) | 725 | if (((GNUNET_YES == do_round) && (dval > 5 * 60)) || (0 == (dval % 60))) |
726 | { | 726 | { |
727 | dval = dval / 60; | 727 | dval = dval / 60; |
728 | unit = _ (/* time unit */ "h"); | 728 | unit = /* time unit */ "h"; |
729 | if (((GNUNET_YES == do_round) && (dval > 5 * 24)) || | 729 | if (((GNUNET_YES == do_round) && (dval > 5 * 24)) || |
730 | (0 == (dval % 24))) | 730 | (0 == (dval % 24))) |
731 | { | 731 | { |
732 | dval = dval / 24; | 732 | dval = dval / 24; |
733 | if (1 == dval) | 733 | if (1 == dval) |
734 | unit = _ (/* time unit */ "day"); | 734 | unit = /* time unit */ "day"; |
735 | else | 735 | else |
736 | unit = _ (/* time unit */ "days"); | 736 | unit = /* time unit */ "days"; |
737 | } | 737 | } |
738 | } | 738 | } |
739 | } | 739 | } |
@@ -761,7 +761,7 @@ GNUNET_STRINGS_absolute_time_to_string (struct GNUNET_TIME_Absolute t) | |||
761 | struct tm *tp; | 761 | struct tm *tp; |
762 | 762 | ||
763 | if (t.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us) | 763 | if (t.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us) |
764 | return _ ("end of time"); | 764 | return "end of time"; |
765 | tt = t.abs_value_us / 1000LL / 1000LL; | 765 | tt = t.abs_value_us / 1000LL / 1000LL; |
766 | tp = localtime (&tt); | 766 | tp = localtime (&tt); |
767 | /* This is hacky, but i don't know a way to detect libc character encoding. | 767 | /* This is hacky, but i don't know a way to detect libc character encoding. |