From 8e827de2a1db34dfe15f5f9da2850ca469b5ecc3 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 12 Oct 2019 18:11:15 +0000 Subject: yapf format. --- src/testbed/buildvars.py.in | 1 - 1 file changed, 1 deletion(-) diff --git a/src/testbed/buildvars.py.in b/src/testbed/buildvars.py.in index e2f8ec27b..3b2f56118 100644 --- a/src/testbed/buildvars.py.in +++ b/src/testbed/buildvars.py.in @@ -16,7 +16,6 @@ # # SPDX-License-Identifier: AGPL3.0-or-later - # file: testbed/buildvars.py # brief: file for importing variables from build system into python # author: Sree Harsha Totakura -- cgit v1.2.3 From a5f5e7ed9b07b902af4438d76087e034abcba9b2 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 12 Oct 2019 18:16:07 +0000 Subject: format python --- contrib/scripts/gnunet-chk.py.in | 23 +- contrib/scripts/gnunet_janitor.py.in | 1 + contrib/scripts/gnunet_pyexpect.py.in | 20 +- contrib/scripts/pydiffer.py.in | 5 +- contrib/scripts/removetrailingwhitespace.py.in | 1 - contrib/scripts/terminate.py.in | 2 +- src/arm/test_gnunet_arm.py.in | 26 +- src/consensus/consensus-simulation.py.in | 15 +- src/dht/test_dht_tools.py.in | 29 +- src/fs/test_gnunet_fs_idx.py.in | 57 +++- src/fs/test_gnunet_fs_psd.py.in | 75 +++++- src/fs/test_gnunet_fs_rec.py.in | 90 +++++-- src/integration-tests/gnunet_pyexpect.py.in | 115 ++++---- src/integration-tests/gnunet_testing.py.in | 100 +++++-- .../test_integration_bootstrap_and_connect.py.in | 2 +- .../test_integration_clique.py.in | 14 +- .../test_integration_disconnect.py.in | 300 +++++++++++---------- .../test_integration_disconnect_nat.py.in | 22 +- .../test_integration_reconnect.py.in | 272 +++++++++---------- .../test_integration_reconnect_nat.py.in | 25 +- src/peerinfo-tool/test_gnunet_peerinfo.py.in | 75 ++++-- src/revocation/test_local_revocation.py.in | 31 ++- src/statistics/test_gnunet_statistics.py.in | 8 +- 23 files changed, 827 insertions(+), 481 deletions(-) diff --git a/contrib/scripts/gnunet-chk.py.in b/contrib/scripts/gnunet-chk.py.in index 0fb591627..7d2cf73d3 100755 --- a/contrib/scripts/gnunet-chk.py.in +++ b/contrib/scripts/gnunet-chk.py.in @@ -29,9 +29,8 @@ import sys from Crypto.Cipher import AES from functools import reduce - # Defaults -DBLOCK_SIZE = (32 * 1024) # Data block size +DBLOCK_SIZE = (32 * 1024) # Data block size # Pick a multiple of 2 here to achive 8-byte alignment! We also # probably want DBlocks to have (roughly) the same size as IBlocks. @@ -39,7 +38,7 @@ DBLOCK_SIZE = (32 * 1024) # Data block size # byte = 2 * 512 bits). DO NOT CHANGE! CHK_PER_INODE = 256 -CHK_HASH_SIZE = 64 # SHA-512 hash = 512 bits = 64 bytes +CHK_HASH_SIZE = 64 # SHA-512 hash = 512 bits = 64 bytes CHK_QUERY_SIZE = CHK_HASH_SIZE # Again a SHA-512 hash @@ -94,11 +93,11 @@ class AESKey(object): """Class for AES Keys. Contains the main key and the initialization vector. """ - key = None # The actual AES key - iv = None # The initialization vector - cipher = None # The cipher object - KEY_SIZE = 32 # AES 256-bit key = 32 bytes - IV_SIZE = AES.block_size # Initialization vector size (= AES block size) + key = None # The actual AES key + iv = None # The initialization vector + cipher = None # The cipher object + KEY_SIZE = 32 # AES 256-bit key = 32 bytes + IV_SIZE = AES.block_size # Initialization vector size (= AES block size) def __init__(self, passphrase): """Creates a new AES key. @@ -355,13 +354,15 @@ def chkuri_from_path(path): def usage(): """Prints help about using this script.""" - print(""" + print( + """ Usage: gnunet-chk.py [options] file Prints the Content Hash Key of given file in GNUNET-style URI. Options: -h, --help : prints this message -""") +""" + ) if '__main__' == __name__: @@ -373,7 +374,7 @@ if '__main__' == __name__: usage() sys.exit(2) for option, value in opts: - if option in("-h", "--help"): + if option in ("-h", "--help"): usage() sys.exit(0) if len(args) != 1: diff --git a/contrib/scripts/gnunet_janitor.py.in b/contrib/scripts/gnunet_janitor.py.in index b0b50ca76..d6834bfb4 100644 --- a/contrib/scripts/gnunet_janitor.py.in +++ b/contrib/scripts/gnunet_janitor.py.in @@ -31,6 +31,7 @@ import time import signal import terminate + def get_process_list(): result = [] pids = [pid for pid in os.listdir('/proc') if pid.isdigit()] diff --git a/contrib/scripts/gnunet_pyexpect.py.in b/contrib/scripts/gnunet_pyexpect.py.in index 188436f51..48f8acdc1 100644 --- a/contrib/scripts/gnunet_pyexpect.py.in +++ b/contrib/scripts/gnunet_pyexpect.py.in @@ -11,7 +11,7 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. -# +# # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # @@ -27,7 +27,7 @@ import shutil import time -class pexpect (object): +class pexpect(object): def __init__(self): super(pexpect, self).__init__() @@ -54,12 +54,22 @@ class pexpect (object): if len(stream) == 0: return True else: - print("Failed to find `{1}' in {0}, which is `{2}' ({3})".format(s, r, stream, len(stream))) + print( + "Failed to find `{1}' in {0}, which is `{2}' ({3})". + format(s, r, stream, len(stream)) + ) sys.exit(2) - raise ValueError("Argument `r' should be an instance of re.RegexObject or a special string, but is `{0}'".format(r)) + raise ValueError( + "Argument `r' should be an instance of re.RegexObject or a special string, but is `{0}'" + .format(r) + ) m = r.search(stream.decode(), flags) if not m: - print("Failed to find `{1}' in {0}, which is is `{2}'".format(s, r.pattern, stream)) + print( + "Failed to find `{1}' in {0}, which is is `{2}'".format( + s, r.pattern, stream + ) + ) sys.exit(2) stream = stream[m.end():] if s == 'stdout': diff --git a/contrib/scripts/pydiffer.py.in b/contrib/scripts/pydiffer.py.in index 35d9ffa35..08f0f4ae6 100644 --- a/contrib/scripts/pydiffer.py.in +++ b/contrib/scripts/pydiffer.py.in @@ -10,7 +10,10 @@ def getdiff(old, new): diff = [] with open(old) as a: with open(new) as b: - for l in difflib.unified_diff(a.read().splitlines(), b.read().splitlines()): + for l in difflib.unified_diff( + a.read().splitlines(), + b.read().splitlines() + ): diff.append(l) return diff diff --git a/contrib/scripts/removetrailingwhitespace.py.in b/contrib/scripts/removetrailingwhitespace.py.in index 5824fb591..e6c2d9014 100755 --- a/contrib/scripts/removetrailingwhitespace.py.in +++ b/contrib/scripts/removetrailingwhitespace.py.in @@ -3,7 +3,6 @@ import sys import re - for fileName in sys.argv[1:]: f = open(fileName, 'r+') fileString = f.read() diff --git a/contrib/scripts/terminate.py.in b/contrib/scripts/terminate.py.in index f57ac6167..2cb4a13c4 100644 --- a/contrib/scripts/terminate.py.in +++ b/contrib/scripts/terminate.py.in @@ -26,7 +26,7 @@ import subprocess import os -class dummyobj (object): +class dummyobj(object): pass diff --git a/src/arm/test_gnunet_arm.py.in b/src/arm/test_gnunet_arm.py.in index 1d067b5d9..9605c4eae 100644 --- a/src/arm/test_gnunet_arm.py.in +++ b/src/arm/test_gnunet_arm.py.in @@ -56,25 +56,41 @@ def fail(result): def end_arm_failer(command, rc, stdo, stde, normal): if normal: if rc != 0: - fail("FAIL: error running {}\nCommand output was:\n{}\n{}".format(command, stdo, stde)) + fail( + "FAIL: error running {}\nCommand output was:\n{}\n{}".format( + command, stdo, stde + ) + ) else: if rc == 0: - fail("FAIL: expected error while running {}\nCommand output was:\n{}\n{}".format(command, stdo, stde)) + fail( + "FAIL: expected error while running {}\nCommand output was:\n{}\n{}" + .format(command, stdo, stde) + ) def print_only_failer(command, rc, stdo, stde, normal): if normal: if rc != 0: - print("FAIL: error running {}\nCommand output was:\n{}\n{}".format(command, stdo, stde)) + print( + "FAIL: error running {}\nCommand output was:\n{}\n{}".format( + command, stdo, stde + ) + ) sys.exit(1) else: if rc == 0: - print("FAIL: expected error while running {}\nCommand output was:\n{}\n{}".format(command, stdo, stde)) + print( + "FAIL: expected error while running {}\nCommand output was:\n{}\n{}" + .format(command, stdo, stde) + ) sys.exit(1) def r_something(to_run, extra_args, failer=None, normal=True, **kw): - rc, stdo, stde = sub_run(to_run + extra_args, nofail=True, want_stde=True, **kw) + rc, stdo, stde = sub_run( + to_run + extra_args, nofail=True, want_stde=True, **kw + ) if failer is not None: failer(to_run + extra_args, rc, stdo, stde, normal) return (rc, stdo, stde) diff --git a/src/consensus/consensus-simulation.py.in b/src/consensus/consensus-simulation.py.in index 39daf81c6..c6b97e63f 100644 --- a/src/consensus/consensus-simulation.py.in +++ b/src/consensus/consensus-simulation.py.in @@ -46,9 +46,10 @@ def simulate(k, n, verbose): def done_p(): for x in range(k, n): - if bsc(info[x]) < n-k: + if bsc(info[x]) < n - k: return False return True + rounds = 0 while not done_p(): if verbose: @@ -65,7 +66,10 @@ def simulate(k, n, verbose): partner_physical = peers.index(partner_logical) if peer_physical < k or partner_physical < k: if verbose: - print("bad peer in connection", peer_physical, "--", partner_physical) + print( + "bad peer in connection", peer_physical, "--", + partner_physical + ) continue if peer_logical & arc == 0: # we are outgoing @@ -78,8 +82,11 @@ def simulate(k, n, verbose): ghost_partner_logical = (peer_logical - arc) % n if ghost_partner_logical & arc == 0: peer_type = peer_type + ", ghost incoming" - new_info[peer_physical] = new_info[peer_physical] | info[peer_physical] | info[partner_physical] - new_info[partner_physical] = new_info[partner_physical] | info[peer_physical] | info[partner_physical] + new_info[peer_physical] = new_info[peer_physical] | info[ + peer_physical] | info[partner_physical] + new_info[partner_physical + ] = new_info[partner_physical] | info[ + peer_physical] | info[partner_physical] else: peer_type = "incoming" if verbose > 1: diff --git a/src/dht/test_dht_tools.py.in b/src/dht/test_dht_tools.py.in index 2d9379a42..c2f95e4b5 100644 --- a/src/dht/test_dht_tools.py.in +++ b/src/dht/test_dht_tools.py.in @@ -94,20 +94,34 @@ def r_put(extra_args, **kw): def end_arm_failer(command, rc, stdo, stde, normal): if normal: if rc != 0: - fail("FAIL: error running {}\nCommand output was:\n{}\n{}".format(command, stdo, stde)) + fail( + "FAIL: error running {}\nCommand output was:\n{}\n{}".format( + command, stdo, stde + ) + ) else: if rc == 0: - fail("FAIL: expected error while running {}\nCommand output was:\n{}\n{}".format(command, stdo, stde)) + fail( + "FAIL: expected error while running {}\nCommand output was:\n{}\n{}" + .format(command, stdo, stde) + ) def print_only_failer(command, rc, stdo, stde, normal): if normal: if rc != 0: - print("FAIL: error running {}\nCommand output was:\n{}\n{}".format(command, stdo, stde)) + print( + "FAIL: error running {}\nCommand output was:\n{}\n{}".format( + command, stdo, stde + ) + ) cleanup(1) else: if rc == 0: - print("FAIL: expected error while running {}\nCommand output was:\n{}\n{}".format(command, stdo, stde)) + print( + "FAIL: expected error while running {}\nCommand output was:\n{}\n{}" + .format(command, stdo, stde) + ) cleanup(1) @@ -122,10 +136,13 @@ print("PASS") time.sleep(1) print("TEST: Testing get...", end='') -rc, stdo, stde = r_get(['-k', 'testkey', '-T', '50 ms', '-t', '8'], want_stdo=True, failer=end_arm_failer) +rc, stdo, stde = r_get(['-k', 'testkey', '-T', '50 ms', '-t', '8'], + want_stdo=True, + failer=end_arm_failer) stdo = stdo.decode('utf-8').replace('\r', '').splitlines() expect = "Result 0, type 8:\ntestdata".splitlines() -if len(stdo) != 2 or len(expect) != 2 or stdo[0] != expect[0] or stdo[1] != expect[1]: +if len(stdo) != 2 or len(expect + ) != 2 or stdo[0] != expect[0] or stdo[1] != expect[1]: fail("output `{}' differs from expected `{}'".format(stdo, expect)) print("PASS") diff --git a/src/fs/test_gnunet_fs_idx.py.in b/src/fs/test_gnunet_fs_idx.py.in index 4798cf503..2c8c7e8ec 100755 --- a/src/fs/test_gnunet_fs_idx.py.in +++ b/src/fs/test_gnunet_fs_idx.py.in @@ -11,7 +11,7 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. -# +# # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # @@ -43,7 +43,9 @@ elif os.name == 'nt': unindex = './gnunet-unindex.exe' if os.name == "nt": - shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True) + shutil.rmtree( + os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True + ) else: shutil.rmtree("/tmp/gnunet-test-fs-py-idx", True) @@ -53,22 +55,59 @@ arm.communicate() try: pub = pexpect() - pub.spawn(None, [publish, '-c', 'test_gnunet_fs_idx_data.conf', '-m', "description:Test archive", '-k', 'tst', 'test_gnunet_fs_rec_data.tgz'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n")) + pub.spawn( + None, [ + publish, '-c', 'test_gnunet_fs_idx_data.conf', '-m', + "description:Test archive", '-k', 'tst', + 'test_gnunet_fs_rec_data.tgz' + ], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) + pub.expect( + "stdout", + re.compile( + r"URI is `gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n" + ) + ) down = pexpect() - down.spawn(None, [download, '-c', 'test_gnunet_fs_idx_data.conf', '-o', 'test_gnunet_fs_rec_data.tar.gz', 'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - down.expect("stdout", re.compile(r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n")) + down.spawn( + None, [ + download, '-c', 'test_gnunet_fs_idx_data.conf', '-o', + 'test_gnunet_fs_rec_data.tar.gz', + 'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822' + ], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) + down.expect( + "stdout", + re.compile( + r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n" + ) + ) os.remove("test_gnunet_fs_rec_data.tar.gz") un = pexpect() - un.spawn(None, [unindex, '-c', 'test_gnunet_fs_idx_data.conf', 'test_gnunet_fs_rec_data.tgz'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + un.spawn( + None, [ + unindex, '-c', 'test_gnunet_fs_idx_data.conf', + 'test_gnunet_fs_rec_data.tgz' + ], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) un.expect("stdout", re.compile(r'Unindexing done\.\r?\n')) finally: - arm = subprocess.Popen([gnunetarm, '-eq', '-c', 'test_gnunet_fs_idx_data.conf']) + arm = subprocess.Popen([ + gnunetarm, '-eq', '-c', 'test_gnunet_fs_idx_data.conf' + ]) arm.communicate() if os.name == "nt": - shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True) + shutil.rmtree( + os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True + ) else: shutil.rmtree("/tmp/gnunet-test-fs-py-idx", True) diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in index a1e4db9d5..abb3d0b83 100755 --- a/src/fs/test_gnunet_fs_psd.py.in +++ b/src/fs/test_gnunet_fs_psd.py.in @@ -11,7 +11,7 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. -# +# # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # @@ -38,8 +38,8 @@ except NameError: reload(sys) # Force encoding to utf-8, as this test otherwise fails -# on some systems (see #5094). In Python 3+ there is no attribute -# sys.setdefaultencoding anymore. +# on some systems (see #5094). In Python 3+ there is no attribute +# sys.setdefaultencoding anymore. if (3 < sys.version_info[0]): sys.setdefaultencoding('utf8') @@ -68,9 +68,11 @@ if "GNUNET_PREFIX" in os.environ: else: print("You need to export GNUNET_PREFIX") sys.exit(1) - + if os.name == "nt": - shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-psd"), True) + shutil.rmtree( + os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-psd"), True + ) else: shutil.rmtree("/tmp/gnunet-test-fs-py-psd", True) @@ -80,23 +82,68 @@ arm.communicate() # first, basic publish-search-download run try: pub = pexpect() - pub.spawn(None, [publish, '-c', 'test_gnunet_fs_psd_data.conf', '-n', '-m', "description:Test archive", '-k', 'tst', 'test_gnunet_fs_rec_data.tgz'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - pub.expect("stdout", re.compile(r"Publishing `.+test_gnunet_fs_rec_data.tgz' done\.\r?\n")) - pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n")) + pub.spawn( + None, [ + publish, '-c', 'test_gnunet_fs_psd_data.conf', '-n', '-m', + "description:Test archive", '-k', 'tst', + 'test_gnunet_fs_rec_data.tgz' + ], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) + pub.expect( + "stdout", + re.compile(r"Publishing `.+test_gnunet_fs_rec_data.tgz' done\.\r?\n") + ) + pub.expect( + "stdout", + re.compile( + r"URI is `gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n" + ) + ) s = pexpect() - s.spawn(None, [search, '-V', '-t', '1000 ms', '-N', '1', '-c', 'test_gnunet_fs_psd_data.conf', 'tst'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - s.expect("stdout", re.compile(r'gnunet-download -o "test_gnunet_fs_rec_data.tgz" gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822\r?\n')) + s.spawn( + None, [ + search, '-V', '-t', '1000 ms', '-N', '1', '-c', + 'test_gnunet_fs_psd_data.conf', 'tst' + ], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) + s.expect( + "stdout", + re.compile( + r'gnunet-download -o "test_gnunet_fs_rec_data.tgz" gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822\r?\n' + ) + ) down = pexpect() - down.spawn(None, [download, '-c', 'test_gnunet_fs_psd_data.conf', '-o', 'test_gnunet_fs_rec_data.tar.gz', 'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - down.expect("stdout", re.compile(r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n")) + down.spawn( + None, [ + download, '-c', 'test_gnunet_fs_psd_data.conf', '-o', + 'test_gnunet_fs_rec_data.tar.gz', + 'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822' + ], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) + down.expect( + "stdout", + re.compile( + r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n" + ) + ) os.remove("test_gnunet_fs_rec_data.tar.gz") finally: - arm = subprocess.Popen([gnunetarm, '-eq', '-c', 'test_gnunet_fs_psd_data.conf']) + arm = subprocess.Popen([ + gnunetarm, '-eq', '-c', 'test_gnunet_fs_psd_data.conf' + ]) arm.communicate() if os.name == "nt": - shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-psd"), True) + shutil.rmtree( + os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-psd"), True + ) else: shutil.rmtree("/tmp/gnunet-test-fs-py-psd", True) diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in index 0f881564f..0e1512b26 100755 --- a/src/fs/test_gnunet_fs_rec.py.in +++ b/src/fs/test_gnunet_fs_rec.py.in @@ -50,7 +50,9 @@ elif os.name == 'nt': directory = './gnunet-directory.exe' if os.name == "nt": - shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-rec"), True) + shutil.rmtree( + os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-rec"), True + ) else: shutil.rmtree("/tmp/gnunet-test-fs-py-rec", True) @@ -65,33 +67,83 @@ tar.extractall() # first, basic publish-search-download run try: pub = pexpect() - pub.spawn(None, [publish, '-c', 'test_gnunet_fs_rec_data.conf', '-k', 'testdir', 'dir/'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + pub.spawn( + None, [ + publish, '-c', 'test_gnunet_fs_rec_data.conf', '-k', 'testdir', + 'dir/' + ], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) # Can't say much for publishing, except that the last one is the toplevel directory pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n")) - pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n")) + pub.expect( + "stdout", + re.compile( + r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n" + ) + ) pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n")) - pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n")) + pub.expect( + "stdout", + re.compile( + r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n" + ) + ) pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n")) - pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n")) + pub.expect( + "stdout", + re.compile( + r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n" + ) + ) pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n")) - pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n")) + pub.expect( + "stdout", + re.compile( + r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n" + ) + ) pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n")) - pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n")) + pub.expect( + "stdout", + re.compile( + r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n" + ) + ) pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n")) - pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n")) - pub.expect("stdout", re.compile(r"Publishing `.+[\\/]dir[\\/]' done\.\r?\n")) + pub.expect( + "stdout", + re.compile( + r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n" + ) + ) + pub.expect( + "stdout", re.compile(r"Publishing `.+[\\/]dir[\\/]' done\.\r?\n") + ) m = pub.expect("stdout", re.compile(r".+\r?\n")) if not m: sys.exit(3) output = m.string - url = output[output.find("`")+1:output.find("'")] + url = output[output.find("`") + 1:output.find("'")] down = pexpect() - down.spawn(None, [download, '-c', 'test_gnunet_fs_rec_data.conf', '-R', '-o', 'rdir.gnd', url], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + down.spawn( + None, [ + download, '-c', 'test_gnunet_fs_rec_data.conf', '-R', '-o', + 'rdir.gnd', url + ], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) down.expect("stdout", re.compile(r"Downloading `rdir.gnd' done (.*).\r?\n")) d = pexpect() - d.spawn(None, [directory, '-c', 'test_gnunet_fs_rec_data.conf', 'rdir/a.gnd'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + d.spawn( + None, [directory, '-c', 'test_gnunet_fs_rec_data.conf', 'rdir/a.gnd'], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) d.expect("stdout", re.compile(r"Directory `a/' meta data:\r?\n")) d.expect("stdout", re.compile(r"Directory `a/' contents:\r?\n")) d.expect("stdout", re.compile(r"COPYING (.*)\r?\n")) @@ -101,14 +153,20 @@ try: os.remove("rdir/a.gnd") diff = dcdiff('dir', 'rdir') if len(diff) != 0: - raise Exception("Unexpected difference between source directory and downloaded result:\n{}".format(diff)) - + raise Exception( + "Unexpected difference between source directory and downloaded result:\n{}" + .format(diff) + ) finally: - arm = subprocess.Popen([gnunetarm, '-eq', '-c', 'test_gnunet_fs_rec_data.conf']) + arm = subprocess.Popen([ + gnunetarm, '-eq', '-c', 'test_gnunet_fs_rec_data.conf' + ]) arm.communicate() if os.name == "nt": - shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-rec"), True) + shutil.rmtree( + os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-rec"), True + ) else: shutil.rmtree("/tmp/gnunet-test-fs-py-rec", True) shutil.rmtree("dir", True) diff --git a/src/integration-tests/gnunet_pyexpect.py.in b/src/integration-tests/gnunet_pyexpect.py.in index d757634a5..aad84e4f7 100644 --- a/src/integration-tests/gnunet_pyexpect.py.in +++ b/src/integration-tests/gnunet_pyexpect.py.in @@ -11,7 +11,7 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. -# +# # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # @@ -26,58 +26,69 @@ import sys import shutil import time -class pexpect (object): - def __init__ (self): - super (pexpect, self).__init__ () - def spawn (self, stdin, arglist, *pargs, **kwargs): - env = kwargs.pop ('env', None) - if env is None: - env = os.environ.copy () - # This messes up some testcases, disable log redirection - env.pop ('GNUNET_FORCE_LOGFILE', None) - self.proc = subprocess.Popen (arglist, *pargs, env=env, **kwargs) - if self.proc is None: - print ("Failed to spawn a process {0}".format (arglist)) - sys.exit (1) - if stdin is not None: - self.stdo, self.stde = self.proc.communicate (stdin) - else: - self.stdo, self.stde = self.proc.communicate () - return self.proc +class pexpect(object): + def __init__(self): + super(pexpect, self).__init__() + + def spawn(self, stdin, arglist, *pargs, **kwargs): + env = kwargs.pop('env', None) + if env is None: + env = os.environ.copy() + # This messes up some testcases, disable log redirection + env.pop('GNUNET_FORCE_LOGFILE', None) + self.proc = subprocess.Popen(arglist, *pargs, env=env, **kwargs) + if self.proc is None: + print("Failed to spawn a process {0}".format(arglist)) + sys.exit(1) + if stdin is not None: + self.stdo, self.stde = self.proc.communicate(stdin) + else: + self.stdo, self.stde = self.proc.communicate() + return self.proc - def expect (self, s, r, flags=0): - stream = self.stdo if s == 'stdout' else self.stde - if isinstance (r, str): - if r == "EOF": - if len (stream) == 0: - return True + def expect(self, s, r, flags=0): + stream = self.stdo if s == 'stdout' else self.stde + if isinstance(r, str): + if r == "EOF": + if len(stream) == 0: + return True + else: + print( + "Failed to find `{1}' in {0}, which is `{2}' ({3})". + format(s, r, stream, len(stream)) + ) + sys.exit(2) + raise ValueError( + "Argument `r' should be an instance of re.RegexObject or a special string, but is `{0}'" + .format(r) + ) + m = r.search(stream, flags) + if not m: + print( + "Failed to find `{1}' in {0}, which is is `{2}'".format( + s, r.pattern, stream + ) + ) + sys.exit(2) + stream = stream[m.end():] + if s == 'stdout': + self.stdo = stream else: - print ("Failed to find `{1}' in {0}, which is `{2}' ({3})".format (s, r, stream, len (stream))) - sys.exit (2) - raise ValueError ("Argument `r' should be an instance of re.RegexObject or a special string, but is `{0}'".format (r)) - m = r.search (stream, flags) - if not m: - print ("Failed to find `{1}' in {0}, which is is `{2}'".format (s, r.pattern, stream)) - sys.exit (2) - stream = stream[m.end ():] - if s == 'stdout': - self.stdo = stream - else: - self.stde = stream - return m + self.stde = stream + return m - def read (self, s, size=-1): - stream = self.stdo if s == 'stdout' else self.stde - result = "" - if size < 0: - result = stream - new_stream = "" - else: - result = stream[0:size] - new_stream = stream[size:] - if s == 'stdout': - self.stdo = new_stream - else: - self.stde = new_stream - return result + def read(self, s, size=-1): + stream = self.stdo if s == 'stdout' else self.stde + result = "" + if size < 0: + result = stream + new_stream = "" + else: + result = stream[0:size] + new_stream = stream[size:] + if s == 'stdout': + self.stdo = new_stream + else: + self.stde = new_stream + return result diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index c3596d232..10f9d4475 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in @@ -30,11 +30,13 @@ import logging logger = logging.getLogger() handler = logging.StreamHandler() formatter = logging.Formatter( - '%(asctime)s %(name)-12s %(levelname)-8s %(message)s') + '%(asctime)s %(name)-12s %(levelname)-8s %(message)s' +) handler.setFormatter(formatter) logger.addHandler(handler) logger.setLevel(logging.DEBUG) + class Check(object): def __init__(self, test): self.fulfilled = False @@ -92,7 +94,9 @@ class Check(object): neg += 1 else: pos += 1 - logger.debug('%s out of %s conditions fulfilled', str(pos), str(pos+neg)) + logger.debug( + '%s out of %s conditions fulfilled', str(pos), str(pos + neg) + ) return self.fulfilled def reset(self): @@ -115,9 +119,13 @@ class Condition(object): def evaluate(self, failed_only): if ((self.fulfilled == False) and (failed_only == True)): - logger.debug('%s condition for was %s', str(self.type), str(self.fulfilled)) + logger.debug( + '%s condition for was %s', str(self.type), str(self.fulfilled) + ) elif (failed_only == False): - logger.debug('%s condition for was %s', str(self.type), str(self.fulfilled)) + logger.debug( + '%s condition for was %s', str(self.type), str(self.fulfilled) + ) return self.fulfilled @@ -140,9 +148,15 @@ class FileExistCondition(Condition): def evaluate(self, failed_only): if ((self.fulfilled == False) and (failed_only == True)): - logger.debug('%s confition for file %s was %s', str(self.type), self.file, str(self.fulfilled)) + logger.debug( + '%s confition for file %s was %s', str(self.type), self.file, + str(self.fulfilled) + ) elif (failed_only == False): - logger.debug('%s confition for file %s was %s', str(self.type), self.file, str(self.fulfilled)) + logger.debug( + '%s confition for file %s was %s', str(self.type), self.file, + str(self.fulfilled) + ) return self.fulfilled @@ -158,7 +172,9 @@ class StatisticsCondition(Condition): def check(self): if (self.fulfilled == False): - self.result = self.peer.get_statistics_value(self.subsystem, self.name) + self.result = self.peer.get_statistics_value( + self.subsystem, self.name + ) if (self.result == self.value): self.fulfilled = True return True @@ -174,8 +190,14 @@ class StatisticsCondition(Condition): else: fail = "" op = " == " - if (((self.fulfilled == False) and (failed_only == True)) or (failed_only == False)): - logger.debug('%s %s condition in subsystem %s: %s: (expected/real value) %s %s %s %s', self.peer.id[:4].decode("utf-8"), self.peer.cfg, self.subsystem.ljust(12), self.name.ljust(30), self.value, op, self.result, fail) + if (((self.fulfilled == False) and (failed_only == True)) + or (failed_only == False)): + logger.debug( + '%s %s condition in subsystem %s: %s: (expected/real value) %s %s %s %s', + self.peer.id[:4].decode("utf-8"), self.peer.cfg, + self.subsystem.ljust(12), self.name.ljust(30), self.value, op, + self.result, fail + ) return self.fulfilled @@ -195,8 +217,12 @@ class EqualStatisticsCondition(Condition): def check(self): if (self.fulfilled == False): - self.result = self.peer.get_statistics_value(self.subsystem, self.name) - self.result2 = self.peer2.get_statistics_value(self.subsystem2, self.name2) + self.result = self.peer.get_statistics_value( + self.subsystem, self.name + ) + self.result2 = self.peer2.get_statistics_value( + self.subsystem2, self.name2 + ) if (self.result == self.result2): self.fulfilled = True return True @@ -206,8 +232,14 @@ class EqualStatisticsCondition(Condition): return True def evaluate(self, failed_only): - if (((self.fulfilled == False) and (failed_only == True)) or (failed_only == False)): - logger.debug('%s %s %s == %s %s %s %s %s', self.peer.id[:4], self.subsystem.ljust(12), self.name.ljust(30), self.result, self.peer2.id[:4], self.subsystem2.ljust(12), self.name2.ljust(30), self.result2) + if (((self.fulfilled == False) and (failed_only == True)) + or (failed_only == False)): + logger.debug( + '%s %s %s == %s %s %s %s %s', self.peer.id[:4], + self.subsystem.ljust(12), self.name.ljust(30), self.result, + self.peer2.id[:4], self.subsystem2.ljust(12), + self.name2.ljust(30), self.result2 + ) return self.fulfilled @@ -262,19 +294,23 @@ class Peer(object): # print('ERROR! Peer using cfg ' + # self.cfg + # ' could not be stopped') - logger.debug('ERROR! Peer using cfg %s could not be stopped', self.cfg) + logger.debug( + 'ERROR! Peer using cfg %s could not be stopped', self.cfg + ) self.started = False return ret else: return False def start(self): - os.unsetenv ("XDG_CONFIG_HOME") - os.unsetenv ("XDG_DATA_HOME") - os.unsetenv ("XDG_CACHE_HOME") + os.unsetenv("XDG_CONFIG_HOME") + os.unsetenv("XDG_DATA_HOME") + os.unsetenv("XDG_CACHE_HOME") self.test.p("Starting peer using cfg " + self.cfg) try: - server = subprocess.Popen([self.test.gnunetarm, '-sq', '-c', self.cfg]) + server = subprocess.Popen([ + self.test.gnunetarm, '-sq', '-c', self.cfg + ]) server.communicate() except OSError: # print("Can not start peer") @@ -285,7 +321,11 @@ class Peer(object): test = '' try: server = pexpect() - server.spawn(None, [self.test.gnunetpeerinfo, '-c', self.cfg, '-s'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + server.spawn( + None, [self.test.gnunetpeerinfo, '-c', self.cfg, '-s'], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) test = server.read("stdout", 1024) except OSError: # print("Can not get peer identity") @@ -299,7 +339,9 @@ class Peer(object): return False self.test.p("Stopping peer using cfg " + self.cfg) try: - server = subprocess.Popen([self.test.gnunetarm, '-eq', '-c', self.cfg]) + server = subprocess.Popen([ + self.test.gnunetarm, '-eq', '-c', self.cfg + ]) server.communicate() except OSError: # print("Can not stop peer") @@ -310,7 +352,14 @@ class Peer(object): def get_statistics_value(self, subsystem, name): server = pexpect() - server.spawn(None, [self.test.gnunetstatistics, '-c', self.cfg, '-q', '-n', name, '-s', subsystem], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + server.spawn( + None, [ + self.test.gnunetstatistics, '-c', self.cfg, '-q', '-n', name, + '-s', subsystem + ], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) # server.expect ("stdout", re.compile (r"")) test = server.read("stdout", 10240) tests = test.partition(b'\n') @@ -319,9 +368,14 @@ class Peer(object): tests = (tests[0][:-1], tests[1], tests[2]) tests = tests[0] result = tests.decode("utf-8").strip() - logger.debug('running gnunet-statistics %s for %s "/" %s yields %s', self.cfg, name, subsystem, result) + logger.debug( + 'running gnunet-statistics %s for %s "/" %s yields %s', self.cfg, + name, subsystem, result + ) if (result.isdigit() == True): return result else: - logger.debug('Invalid statistics value: %s is not a number!', result) + logger.debug( + 'Invalid statistics value: %s is not a number!', result + ) return -1 diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in index 4b4b35629..ddac326cd 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in @@ -32,7 +32,6 @@ from gnunet_testing import Check from gnunet_testing import Condition from gnunet_testing import * - # # This test tests if a fresh peer bootstraps from a hostlist server and then # successfully connects to the server @@ -124,6 +123,7 @@ def check(): check.run_blocking(check_timeout, success_cont, fail_cont) + # # Test execution # diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in index 0444cf249..a23c025ca 100755 --- a/src/integration-tests/test_integration_clique.py.in +++ b/src/integration-tests/test_integration_clique.py.in @@ -11,7 +11,7 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. -# +# # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # @@ -113,9 +113,13 @@ def check_connect(): check.add(StatisticsCondition(client, 'dht', '# peers connected', 2)) check.add(StatisticsCondition(client, 'fs', '# peers connected', 2)) - check.add(StatisticsCondition(client_nat, 'transport', '# peers connected', 2)) + check.add( + StatisticsCondition(client_nat, 'transport', '# peers connected', 2) + ) check.add(StatisticsCondition(client_nat, 'core', '# peers connected', 2)) - check.add(StatisticsCondition(client_nat, 'topology', '# peers connected', 2)) + check.add( + StatisticsCondition(client_nat, 'topology', '# peers connected', 2) + ) check.add(StatisticsCondition(client_nat, 'dht', '# peers connected', 2)) check.add(StatisticsCondition(client_nat, 'fs', '# peers connected', 2)) @@ -127,6 +131,7 @@ def check_connect(): check.run_blocking(check_timeout, success_cont, fail_cont) + # # Test execution # @@ -199,7 +204,8 @@ def run(): cleanup() sys.exit(success) - if ((client.started == True) and (client_nat.started == True) and (server.started == True)): + if ((client.started == True) and (client_nat.started == True) + and (server.started == True)): test.p('Peers started, running check') check_connect() diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in index 737014e61..9861728c2 100755 --- a/src/integration-tests/test_integration_disconnect.py.in +++ b/src/integration-tests/test_integration_disconnect.py.in @@ -32,7 +32,6 @@ from gnunet_testing import Check from gnunet_testing import Condition from gnunet_testing import * - # # This test tests if a fresh peer bootstraps from a hostlist server and then # successfully connects to the server. When both peers are connected @@ -48,158 +47,169 @@ verbose = True check_timeout = 180 if os.name == "nt": - tmp = os.getenv ("TEMP") - signals = [signal.SIGTERM, signal.SIGINT] + tmp = os.getenv("TEMP") + signals = [signal.SIGTERM, signal.SIGINT] else: - tmp = "/tmp" - signals = [signal.SIGTERM, signal.SIGINT, signal.SIGHUP, signal.SIGQUIT] - -def cleanup_onerror (function, path, excinfo): - import stat - if not os.path.exists (path): - pass - elif not os.access(path, os.W_OK): - # Is the error an access error ? - os.chmod (path, stat.S_IWUSR) - function (path) - else: - raise - -def cleanup (): - shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), False, cleanup_onerror) - shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), False, cleanup_onerror) - - -def success_disconnect_cont (check): - print('Peers disconnected successfully') - global success - success = True; - - -def fail_disconnect_cont (check): - global success - success = False; - print('Peers failed to disconnect') - check.evaluate(True) - -def check_disconnect (): - test.p ('Shutting down bootstrap server') - server.stop () - check = Check (test) - check.add (StatisticsCondition (client, 'transport', '# peers connected',0)) - check.add (StatisticsCondition (client, 'core', '# peers connected',0)) - check.add (StatisticsCondition (client, 'topology', '# peers connected',0)) - check.add (StatisticsCondition (client, 'dht', '# peers connected',0)) - check.add (StatisticsCondition (client, 'fs', '# peers connected',0)) - check.run_blocking (check_timeout, success_disconnect_cont, fail_disconnect_cont) - - -def success_connect_cont (check): - print('Peers connected successfully') - check_disconnect () - - -def fail_connect_cont (check): - global success - success= False - print('Peers failed to connected!') - check.evaluate(True) - - -def check_connect (): - check = Check (test) - check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) - check.add (StatisticsCondition (server, 'core', '# peers connected',1)) - check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) - check.add (StatisticsCondition (server, 'dht', '# peers connected',1)) - check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) - - check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) - check.add (StatisticsCondition (client, 'core', '# peers connected',1)) - check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) - check.add (StatisticsCondition (client, 'dht', '# peers connected',1)) - check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) - - check.run_blocking (check_timeout, success_connect_cont, fail_connect_cont) + tmp = "/tmp" + signals = [signal.SIGTERM, signal.SIGINT, signal.SIGHUP, signal.SIGQUIT] + + +def cleanup_onerror(function, path, excinfo): + import stat + if not os.path.exists(path): + pass + elif not os.access(path, os.W_OK): + # Is the error an access error ? + os.chmod(path, stat.S_IWUSR) + function(path) + else: + raise + + +def cleanup(): + shutil.rmtree( + os.path.join(tmp, "c_bootstrap_server"), False, cleanup_onerror + ) + shutil.rmtree(os.path.join(tmp, "c_no_nat_client"), False, cleanup_onerror) + + +def success_disconnect_cont(check): + print('Peers disconnected successfully') + global success + success = True + + +def fail_disconnect_cont(check): + global success + success = False + print('Peers failed to disconnect') + check.evaluate(True) + + +def check_disconnect(): + test.p('Shutting down bootstrap server') + server.stop() + check = Check(test) + check.add(StatisticsCondition(client, 'transport', '# peers connected', 0)) + check.add(StatisticsCondition(client, 'core', '# peers connected', 0)) + check.add(StatisticsCondition(client, 'topology', '# peers connected', 0)) + check.add(StatisticsCondition(client, 'dht', '# peers connected', 0)) + check.add(StatisticsCondition(client, 'fs', '# peers connected', 0)) + check.run_blocking( + check_timeout, success_disconnect_cont, fail_disconnect_cont + ) + + +def success_connect_cont(check): + print('Peers connected successfully') + check_disconnect() + + +def fail_connect_cont(check): + global success + success = False + print('Peers failed to connected!') + check.evaluate(True) + + +def check_connect(): + check = Check(test) + check.add(StatisticsCondition(server, 'transport', '# peers connected', 1)) + check.add(StatisticsCondition(server, 'core', '# peers connected', 1)) + check.add(StatisticsCondition(server, 'topology', '# peers connected', 1)) + check.add(StatisticsCondition(server, 'dht', '# peers connected', 1)) + check.add(StatisticsCondition(server, 'fs', '# peers connected', 1)) + + check.add(StatisticsCondition(client, 'transport', '# peers connected', 1)) + check.add(StatisticsCondition(client, 'core', '# peers connected', 1)) + check.add(StatisticsCondition(client, 'topology', '# peers connected', 1)) + check.add(StatisticsCondition(client, 'dht', '# peers connected', 1)) + check.add(StatisticsCondition(client, 'fs', '# peers connected', 1)) + + check.run_blocking(check_timeout, success_connect_cont, fail_connect_cont) + # # Test execution # -def SigHandler(signum = None, frame = None): - global success - global server - global client - - print('Test was aborted!') - if (None != server): - server.stop () - if (None != client): - client.stop () - cleanup () - sys.exit(success) - -def run (): - global success - global test - global server - global client - - server = None - client = None - success = False - - for sig in signals: - signal.signal(sig, SigHandler) - - test = Test ('test_integration_bootstrap_and_connect.py', verbose) - cleanup () - - server = Peer(test, './confs/c_bootstrap_server.conf'); - client = Peer(test, './confs/c_no_nat_client.conf'); - - if (True != server.start()): - print('Failed to start server') - if (None != server): - server.stop () - cleanup () - sys.exit(success) - - # Give the server time to start - time.sleep(5) - - if (True != client.start()): - print('Failed to start client') - if (None != server): - server.stop () - if (None != client): - client.stop () - cleanup () - sys.exit(success) - - if ((client.started == True) and (server.started == True)): - test.p ('Peers started, running check') - time.sleep(5) - check_connect () - server.stop () - client.stop () - - cleanup () - - if (success == False): - print ('Test failed') - return False - else: - return True + +def SigHandler(signum=None, frame=None): + global success + global server + global client + + print('Test was aborted!') + if (None != server): + server.stop() + if (None != client): + client.stop() + cleanup() + sys.exit(success) + + +def run(): + global success + global test + global server + global client + + server = None + client = None + success = False + + for sig in signals: + signal.signal(sig, SigHandler) + + test = Test('test_integration_bootstrap_and_connect.py', verbose) + cleanup() + + server = Peer(test, './confs/c_bootstrap_server.conf') + client = Peer(test, './confs/c_no_nat_client.conf') + + if (True != server.start()): + print('Failed to start server') + if (None != server): + server.stop() + cleanup() + sys.exit(success) + + # Give the server time to start + time.sleep(5) + + if (True != client.start()): + print('Failed to start client') + if (None != server): + server.stop() + if (None != client): + client.stop() + cleanup() + sys.exit(success) + + if ((client.started == True) and (server.started == True)): + test.p('Peers started, running check') + time.sleep(5) + check_connect() + server.stop() + client.stop() + + cleanup() + + if (success == False): + print('Test failed') + return False + else: + return True + try: - run () + run() except (KeyboardInterrupt, SystemExit): - print('Test interrupted') - server.stop () - client.stop () - cleanup () + print('Test interrupted') + server.stop() + client.stop() + cleanup() if (success == False): - sys.exit(1) + sys.exit(1) else: - sys.exit(0) + sys.exit(0) diff --git a/src/integration-tests/test_integration_disconnect_nat.py.in b/src/integration-tests/test_integration_disconnect_nat.py.in index c3d5d8901..d3ff84ebe 100755 --- a/src/integration-tests/test_integration_disconnect_nat.py.in +++ b/src/integration-tests/test_integration_disconnect_nat.py.in @@ -32,7 +32,6 @@ from gnunet_testing import Check from gnunet_testing import Condition from gnunet_testing import * - # # This test tests if a fresh peer bootstraps from a hostlist server and then # successfully connects to the server. When both peers are connected @@ -68,7 +67,9 @@ def cleanup_onerror(function, path, excinfo): def cleanup(): - shutil.rmtree(os.path.join(tmp, "c_bootstrap_server"), False, cleanup_onerror) + shutil.rmtree( + os.path.join(tmp, "c_bootstrap_server"), False, cleanup_onerror + ) shutil.rmtree(os.path.join(tmp, "c_nat_client"), False, cleanup_onerror) @@ -80,7 +81,7 @@ def success_disconnect_cont(check): def fail_disconnect_cont(check): global success - success = False; + success = False print('Peers failed to disconnect') check.evaluate(True) @@ -96,7 +97,9 @@ def check_disconnect(): check.add(StatisticsCondition(server, 'topology', '# peers connected', 0)) check.add(StatisticsCondition(server, 'dht', '# peers connected', 0)) check.add(StatisticsCondition(server, 'fs', '# peers connected', 0)) - check.run_blocking(check_timeout, success_disconnect_cont, fail_disconnect_cont) + check.run_blocking( + check_timeout, success_disconnect_cont, fail_disconnect_cont + ) def success_connect_cont(check): @@ -115,9 +118,13 @@ def check_connect(): global server global nat_client check = Check(test) - check.add(StatisticsCondition(nat_client, 'transport', '# peers connected', 1)) + check.add( + StatisticsCondition(nat_client, 'transport', '# peers connected', 1) + ) check.add(StatisticsCondition(nat_client, 'core', '# peers connected', 1)) - check.add(StatisticsCondition(nat_client, 'topology', '# peers connected', 1)) + check.add( + StatisticsCondition(nat_client, 'topology', '# peers connected', 1) + ) check.add(StatisticsCondition(nat_client, 'dht', '# peers connected', 1)) check.add(StatisticsCondition(nat_client, 'fs', '# peers connected', 1)) @@ -134,6 +141,7 @@ def check_connect(): # Test execution # + def SigHandler(signum=None, frame=None): global success global server @@ -204,7 +212,7 @@ def run(): try: run() -except(KeyboardInterrupt, SystemExit): +except (KeyboardInterrupt, SystemExit): print('Test interrupted') server.stop() nat_client.stop() diff --git a/src/integration-tests/test_integration_reconnect.py.in b/src/integration-tests/test_integration_reconnect.py.in index 8c4193680..5bffb72e3 100755 --- a/src/integration-tests/test_integration_reconnect.py.in +++ b/src/integration-tests/test_integration_reconnect.py.in @@ -32,7 +32,6 @@ from gnunet_testing import Check from gnunet_testing import Condition from gnunet_testing import * - # # This test tests if a fresh peer bootstraps from a hostlist server and then # successfully connects to the server. When both peers are connected @@ -43,195 +42,196 @@ from gnunet_testing import * #definitions - testname = "test_integration_restart" verbose = True check_timeout = 180 if os.name == "nt": - tmp = os.getenv ("TEMP") - signals = [signal.SIGTERM, signal.SIGINT] + tmp = os.getenv("TEMP") + signals = [signal.SIGTERM, signal.SIGINT] else: - tmp = "/tmp" - signals = [signal.SIGTERM, signal.SIGINT, signal.SIGHUP, signal.SIGQUIT] - -def cleanup_onerror (function, path, excinfo): - import stat - if not os.path.exists (path): - pass - elif not os.access(path, os.W_OK): - # Is the error an access error ? - os.chmod (path, stat.S_IWUSR) - function (path) - else: - raise - -def cleanup (): + tmp = "/tmp" + signals = [signal.SIGTERM, signal.SIGINT, signal.SIGHUP, signal.SIGQUIT] + + +def cleanup_onerror(function, path, excinfo): + import stat + if not os.path.exists(path): + pass + elif not os.access(path, os.W_OK): + # Is the error an access error ? + os.chmod(path, stat.S_IWUSR) + function(path) + else: + raise + + +def cleanup(): retries = 10 - path = os.path.join (tmp, "c_bootstrap_server") - test.p ("Removing " + path) + path = os.path.join(tmp, "c_bootstrap_server") + test.p("Removing " + path) while ((os.path.exists(path)) and (retries > 0)): - shutil.rmtree ((path), False, cleanup_onerror) - time.sleep (1) + shutil.rmtree((path), False, cleanup_onerror) + time.sleep(1) retries -= 1 if (os.path.exists(path)): - test.p ("Failed to remove " + path) - + test.p("Failed to remove " + path) retries = 10 - path = os.path.join (tmp, "c_no_nat_client") - test.p ("Removing " + path) + path = os.path.join(tmp, "c_no_nat_client") + test.p("Removing " + path) while ((os.path.exists(path)) and (retries > 0)): - shutil.rmtree ((path), False, cleanup_onerror) - time.sleep (1) + shutil.rmtree((path), False, cleanup_onerror) + time.sleep(1) retries -= 1 if (os.path.exists(path)): - test.p ("Failed to remove " + path) + test.p("Failed to remove " + path) + -def success_restart_cont (check): - global success - print('Peers connected successfully after restart') - server.stop () - client.stop () - success = True; +def success_restart_cont(check): + global success + print('Peers connected successfully after restart') + server.stop() + client.stop() + success = True -def fail_restart_cont (check): - global success - success = False; - print('Peers failed to connect after restart') - check.evaluate(True) +def fail_restart_cont(check): + global success + success = False + print('Peers failed to connect after restart') + check.evaluate(True) -def success_connect_cont (check): - print('Peers connected successfully') - server.stop () - client.stop () +def success_connect_cont(check): + print('Peers connected successfully') + server.stop() + client.stop() - time.sleep(5) + time.sleep(5) - test.p ('Restarting client & server') - server.start () - client.start () + test.p('Restarting client & server') + server.start() + client.start() - check = Check (test) - check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) - check.add (StatisticsCondition (client, 'core', '# peers connected',1)) - check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) - check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) + check = Check(test) + check.add(StatisticsCondition(client, 'transport', '# peers connected', 1)) + check.add(StatisticsCondition(client, 'core', '# peers connected', 1)) + check.add(StatisticsCondition(client, 'topology', '# peers connected', 1)) + check.add(StatisticsCondition(client, 'fs', '# peers connected', 1)) - check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) - check.add (StatisticsCondition (server, 'core', '# peers connected',1)) - check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) - check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) + check.add(StatisticsCondition(server, 'transport', '# peers connected', 1)) + check.add(StatisticsCondition(server, 'core', '# peers connected', 1)) + check.add(StatisticsCondition(server, 'topology', '# peers connected', 1)) + check.add(StatisticsCondition(server, 'fs', '# peers connected', 1)) - check.run_blocking (check_timeout, success_restart_cont, fail_restart_cont) + check.run_blocking(check_timeout, success_restart_cont, fail_restart_cont) -def fail_connect_cont (check): - global success - success= False; - print('Peers failed to connect') - check.evaluate(True) +def fail_connect_cont(check): + global success + success = False + print('Peers failed to connect') + check.evaluate(True) -def check_connect (): - check = Check (test) - check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) - check.add (StatisticsCondition (client, 'core', '# peers connected',1)) - check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) - check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) +def check_connect(): + check = Check(test) + check.add(StatisticsCondition(client, 'transport', '# peers connected', 1)) + check.add(StatisticsCondition(client, 'core', '# peers connected', 1)) + check.add(StatisticsCondition(client, 'topology', '# peers connected', 1)) + check.add(StatisticsCondition(client, 'fs', '# peers connected', 1)) - check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) - check.add (StatisticsCondition (server, 'core', '# peers connected',1)) - check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) - check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) + check.add(StatisticsCondition(server, 'transport', '# peers connected', 1)) + check.add(StatisticsCondition(server, 'core', '# peers connected', 1)) + check.add(StatisticsCondition(server, 'topology', '# peers connected', 1)) + check.add(StatisticsCondition(server, 'fs', '# peers connected', 1)) + + check.run_blocking(check_timeout, success_connect_cont, fail_connect_cont) - check.run_blocking (check_timeout, success_connect_cont, fail_connect_cont) # # Test execution # -def SigHandler(signum = None, frame = None): - global success - global server - global client - - print('Test was aborted!') - if (None != server): - server.stop () - if (None != client): - client.stop () - cleanup () - sys.exit(success) +def SigHandler(signum=None, frame=None): + global success + global server + global client -def run (): - global success - global test - global server - global client + print('Test was aborted!') + if (None != server): + server.stop() + if (None != client): + client.stop() + cleanup() + sys.exit(success) - success = False - server = None - client = None - for sig in signals: - signal.signal(sig, SigHandler) +def run(): + global success + global test + global server + global client + success = False + server = None + client = None - test = Test ('test_integration_disconnect', verbose) - cleanup () - server = Peer(test, './confs/c_bootstrap_server.conf'); - server.start(); + for sig in signals: + signal.signal(sig, SigHandler) - client = Peer(test, './confs/c_no_nat_client.conf'); - client.start(); + test = Test('test_integration_disconnect', verbose) + cleanup() + server = Peer(test, './confs/c_bootstrap_server.conf') + server.start() + client = Peer(test, './confs/c_no_nat_client.conf') + client.start() - if (True != server.start()): - print('Failed to start server') - if (None != server): - server.stop () - if (None != server): - client.stop () - cleanup () - sys.exit(success) + if (True != server.start()): + print('Failed to start server') + if (None != server): + server.stop() + if (None != server): + client.stop() + cleanup() + sys.exit(success) - # Give the server time to start - time.sleep(5) + # Give the server time to start + time.sleep(5) - if (True != client.start()): - print('Failed to start client') - if (None != server): - server.stop () - if (None != server): - client.stop () - cleanup () - sys.exit(success) + if (True != client.start()): + print('Failed to start client') + if (None != server): + server.stop() + if (None != server): + client.stop() + cleanup() + sys.exit(success) - check_connect () + check_connect() - server.stop () - client.stop () - cleanup () + server.stop() + client.stop() + cleanup() - if (success == False): - print ('Test failed') - return True - else: - return False + if (success == False): + print('Test failed') + return True + else: + return False try: - run () + run() except (KeyboardInterrupt, SystemExit): print('Test interrupted') - server.stop () - client.stop () - cleanup () + server.stop() + client.stop() + cleanup() if (success == False): - sys.exit(1) + sys.exit(1) else: - sys.exit(0) + sys.exit(0) diff --git a/src/integration-tests/test_integration_reconnect_nat.py.in b/src/integration-tests/test_integration_reconnect_nat.py.in index 45626d50d..751a0484b 100755 --- a/src/integration-tests/test_integration_reconnect_nat.py.in +++ b/src/integration-tests/test_integration_reconnect_nat.py.in @@ -32,7 +32,6 @@ from gnunet_testing import Check from gnunet_testing import Condition from gnunet_testing import * - # # This test tests if a fresh peer bootstraps from a hostlist server and then # successfully connects to the server. When both peers are connected @@ -43,7 +42,6 @@ from gnunet_testing import * # definitions - testname = "test_integration_restart" verbose = True check_timeout = 180 @@ -82,7 +80,7 @@ def cleanup(): retries = 10 path = os.path.join(tmp, "c_nat_client") test.p("Removing " + path) - while((os.path.exists(path)) and(retries > 0)): + while ((os.path.exists(path)) and (retries > 0)): shutil.rmtree((path), False, cleanup_onerror) time.sleep(1) retries -= 1 @@ -91,18 +89,18 @@ def cleanup(): def success_restart_cont(check): - global success - print('Peers connected successfully after restart') - server.stop() - client.stop() - success = True + global success + print('Peers connected successfully after restart') + server.stop() + client.stop() + success = True def fail_restart_cont(check): - global success - success = False - print('Peers failed to connect after restart') - check.evaluate(True) + global success + success = False + print('Peers failed to connect after restart') + check.evaluate(True) def success_connect_cont(check): @@ -151,6 +149,7 @@ def check_connect(): check.run_blocking(check_timeout, success_connect_cont, fail_connect_cont) + # # Test execution # @@ -227,7 +226,7 @@ def run(): try: run() -except(KeyboardInterrupt, SystemExit): +except (KeyboardInterrupt, SystemExit): print('Test interrupted') server.stop() client.stop() diff --git a/src/peerinfo-tool/test_gnunet_peerinfo.py.in b/src/peerinfo-tool/test_gnunet_peerinfo.py.in index d07224b14..5d9daa930 100755 --- a/src/peerinfo-tool/test_gnunet_peerinfo.py.in +++ b/src/peerinfo-tool/test_gnunet_peerinfo.py.in @@ -11,7 +11,7 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. -# +# # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # @@ -43,53 +43,94 @@ elif os.name == 'nt': pinfo = pexpect() - if os.name == "nt": shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-peerinfo"), True) else: shutil.rmtree("/tmp/gnunet-test-peerinfo", True) # create hostkey via testing lib # FIXME: The /tmp/ location needs to be adjusted to the TMP variable! -hkk = subprocess.Popen([gnunettesting, '-n', '1', '-c', 'test_gnunet_peerinfo_data.conf', '-k', '/tmp/gnunet-test-peerinfo/.hostkey']) +hkk = subprocess.Popen([ + gnunettesting, '-n', '1', '-c', 'test_gnunet_peerinfo_data.conf', '-k', + '/tmp/gnunet-test-peerinfo/.hostkey' +]) hkk.communicate() -arm = subprocess.Popen([gnunetarm, '-sq', '-c', 'test_gnunet_peerinfo_data.conf']) +arm = subprocess.Popen([ + gnunetarm, '-sq', '-c', 'test_gnunet_peerinfo_data.conf' +]) arm.communicate() try: - pinfo.spawn(None, [peerinfo, '-c', 'test_gnunet_peerinfo_data.conf', '-s'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + pinfo.spawn( + None, [peerinfo, '-c', 'test_gnunet_peerinfo_data.conf', '-s'], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) pinfo.expect("stdout", re.compile(r'I am peer `.*\'.\r?\n')) - pinfo.spawn(None, [peerinfo, '-c', 'test_gnunet_peerinfo_data.conf', '-qs'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - pinfo.expect("stdout", re.compile(r'....................................................\r?\n')) - - pinfo.spawn(None, [peerinfo, '-c', 'test_gnunet_peerinfo_data.conf', 'invalid'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - pinfo.expect("stdout", re.compile(r'Invalid command line argument `invalid\'\r?\n')) - - arm = subprocess.Popen([gnunetarm, '-q', '-i', 'transport', '-c', 'test_gnunet_peerinfo_data.conf']) + pinfo.spawn( + None, [peerinfo, '-c', 'test_gnunet_peerinfo_data.conf', '-qs'], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) + pinfo.expect( + "stdout", + re. + compile(r'....................................................\r?\n') + ) + + pinfo.spawn( + None, [peerinfo, '-c', 'test_gnunet_peerinfo_data.conf', 'invalid'], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) + pinfo.expect( + "stdout", re.compile(r'Invalid command line argument `invalid\'\r?\n') + ) + + arm = subprocess.Popen([ + gnunetarm, '-q', '-i', 'transport', '-c', + 'test_gnunet_peerinfo_data.conf' + ]) arm.communicate() time.sleep(1) - pinfo.spawn(None, [peerinfo, '-i', '-c', 'test_gnunet_peerinfo_data.conf'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + pinfo.spawn( + None, [peerinfo, '-i', '-c', 'test_gnunet_peerinfo_data.conf'], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) pinfo.expect("stdout", re.compile("Peer `.*'\r?\n")) m = pinfo.expect("stdout", re.compile("\s.*:24357\r?\n")) while len(m.group(0)) > 0: m = pinfo.expect("stdout", re.compile("(\s.*:24357\r?\n|\r?\n|)")) - pinfo.spawn(None, [peerinfo, '-i', '-c', 'test_gnunet_peerinfo_data.conf', '-n'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + pinfo.spawn( + None, [peerinfo, '-i', '-c', 'test_gnunet_peerinfo_data.conf', '-n'], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) pinfo.expect("stdout", re.compile("Peer `.*'\r?\n")) m = pinfo.expect("stdout", re.compile("\s.*:24357\r?\n")) while len(m.group(0)) > 0: m = pinfo.expect("stdout", re.compile("(\s.*:24357\r?\n|\r?\n|)")) - pinfo.spawn(None, [peerinfo, '-c', 'test_gnunet_peerinfo_data.conf', '-qs'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + pinfo.spawn( + None, [peerinfo, '-c', 'test_gnunet_peerinfo_data.conf', '-qs'], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) pid = pinfo.read("stdout") pid.strip() finally: - arm = subprocess.Popen([gnunetarm, '-eq', '-c', 'test_gnunet_peerinfo_data.conf']) + arm = subprocess.Popen([ + gnunetarm, '-eq', '-c', 'test_gnunet_peerinfo_data.conf' + ]) arm.communicate() if os.name == "nt": - shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-peerinfo"), True) + shutil.rmtree( + os.path.join(os.getenv("TEMP"), "gnunet-test-peerinfo"), True + ) else: shutil.rmtree("/tmp/gnunet-test-peerinfo", True) diff --git a/src/revocation/test_local_revocation.py.in b/src/revocation/test_local_revocation.py.in index 4cc6119ca..d73d0a869 100644 --- a/src/revocation/test_local_revocation.py.in +++ b/src/revocation/test_local_revocation.py.in @@ -11,7 +11,7 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. -# +# # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # @@ -39,7 +39,10 @@ elif os.name == 'nt': TEST_CONFIGURATION = "test_revocation.conf" TEST_REVOCATION_EGO = "revoc_test" -get_clean = subprocess.Popen([config, '-c', TEST_CONFIGURATION, '-s', 'PATHS', '-o', 'GNUNET_HOME', '-f'], stdout=subprocess.PIPE) +get_clean = subprocess.Popen([ + config, '-c', TEST_CONFIGURATION, '-s', 'PATHS', '-o', 'GNUNET_HOME', '-f' +], + stdout=subprocess.PIPE) cleandir, x = get_clean.communicate() cleandir = cleandir.decode("utf-8") cleandir = cleandir.rstrip('\n').rstrip('\r') @@ -55,10 +58,15 @@ try: print("Creating an ego " + TEST_REVOCATION_EGO) sys.stdout.flush() sys.stderr.flush() - idc = subprocess.Popen([ident, '-C', TEST_REVOCATION_EGO, '-c', TEST_CONFIGURATION]) + idc = subprocess.Popen([ + ident, '-C', TEST_REVOCATION_EGO, '-c', TEST_CONFIGURATION + ]) idc.communicate() if idc.returncode != 0: - raise Exception("gnunet-identity failed to create an ego `" + TEST_REVOCATION_EGO + "'") + raise Exception( + "gnunet-identity failed to create an ego `" + TEST_REVOCATION_EGO + + "'" + ) sys.stdout.flush() sys.stderr.flush() @@ -72,11 +80,15 @@ try: print("Testing key " + rev_key) sys.stdout.flush() sys.stderr.flush() - tst = subprocess.Popen([revoc, '-t', rev_key, '-c', TEST_CONFIGURATION], stdout=subprocess.PIPE) + tst = subprocess.Popen([revoc, '-t', rev_key, '-c', TEST_CONFIGURATION], + stdout=subprocess.PIPE) output_not_revoked, x = tst.communicate() output_not_revoked = output_not_revoked.decode("utf-8") if tst.returncode != 0: - raise Exception("gnunet-revocation failed to test a key - " + str(tst.returncode) + ": " + output_not_revoked) + raise Exception( + "gnunet-revocation failed to test a key - " + str(tst.returncode) + + ": " + output_not_revoked + ) if 'valid' not in output_not_revoked: res = 1 print("Key was not valid") @@ -86,7 +98,9 @@ try: print("Revoking key " + rev_key) sys.stdout.flush() sys.stderr.flush() - rev = subprocess.Popen([revoc, '-R', TEST_REVOCATION_EGO, '-p', '-c', TEST_CONFIGURATION]) + rev = subprocess.Popen([ + revoc, '-R', TEST_REVOCATION_EGO, '-p', '-c', TEST_CONFIGURATION + ]) rev.communicate() if rev.returncode != 0: raise Exception("gnunet-revocation failed to revoke a key") @@ -94,7 +108,8 @@ try: print("Testing revoked key " + rev_key) sys.stdout.flush() sys.stderr.flush() - tst = subprocess.Popen([revoc, '-t', rev_key, '-c', TEST_CONFIGURATION], stdout=subprocess.PIPE) + tst = subprocess.Popen([revoc, '-t', rev_key, '-c', TEST_CONFIGURATION], + stdout=subprocess.PIPE) output_revoked, x = tst.communicate() output_revoked = output_revoked.decode("utf-8") if tst.returncode != 0: diff --git a/src/statistics/test_gnunet_statistics.py.in b/src/statistics/test_gnunet_statistics.py.in index b14dc9d9e..3a13c24f3 100644 --- a/src/statistics/test_gnunet_statistics.py.in +++ b/src/statistics/test_gnunet_statistics.py.in @@ -122,7 +122,9 @@ if len([x for x in stdo.splitlines() if re.search(b'42', x)]) != 1: print("PASS") print("TEST: Set persistent value...", end='') -rc, stdo, stde = r_st(['-n', 'lasting', '-s', 'subsystem', '40', '-p'], nofail=True, want_stdo=False) +rc, stdo, stde = r_st(['-n', 'lasting', '-s', 'subsystem', '40', '-p'], + nofail=True, + want_stdo=False) rc, stdo, stde = r_st([], nofail=True, want_stdo=True) if len([x for x in stdo.splitlines() if re.search(b'40', x)]) != 1: fail("FAIL: unexpected output:\n{}".format(stdo)) @@ -137,7 +139,9 @@ if len([x for x in stdo.splitlines() if re.search(b'40', x)]) != 1: print("PASS") print("TEST: Removing persistence...", end='') -rc, stdo, stde = r_st(['-n', 'lasting', '-s', 'subsystem', '40'], nofail=True, want_stdo=False) +rc, stdo, stde = r_st(['-n', 'lasting', '-s', 'subsystem', '40'], + nofail=True, + want_stdo=False) rc, stdo, stde = r_st([], nofail=True, want_stdo=True) if len([x for x in stdo.splitlines() if re.search(b'!', x)]) != 0: fail("FAIL: unexpected output:\n{}".format(stdo)) -- cgit v1.2.3 From 3371f389918feb4b428dfd129464c555852b4189 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 12 Oct 2019 18:17:27 +0000 Subject: more python format --- contrib/scripts/find_typedefs.py | 6 +++--- contrib/scripts/gdb-iterate-dll.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/scripts/find_typedefs.py b/contrib/scripts/find_typedefs.py index 804eae235..965be3c34 100644 --- a/contrib/scripts/find_typedefs.py +++ b/contrib/scripts/find_typedefs.py @@ -4,7 +4,6 @@ import os import re import sys - debug = False @@ -14,7 +13,8 @@ def get_td_from_function_signature(line, file, num): left_paren += 1 li = line[left_paren:] right_paren = line.find(')') - if right_paren > 0 and right_paren > left_paren and line[right_paren:].find('(') >= 0: + if right_paren > 0 and right_paren > left_paren and line[ + right_paren:].find('(') >= 0: fname = line[:right_paren] fname = fname.lstrip(' ').lstrip('*').lstrip(' ').rstrip(' ') if len(fname) > 0: @@ -70,7 +70,7 @@ def find_typedefs(file): td_line.append(l[rightcbrace + 1:]) else: td_line.append(l) - if len(l) > 0 and l[-1] == ';' and(not td_struct or td_level == 0): + if len(l) > 0 and l[-1] == ';' and (not td_struct or td_level == 0): td_line = ' '.join(td_line) td_line = td_line[:-1] if len(td_line) > 0: diff --git a/contrib/scripts/gdb-iterate-dll.py b/contrib/scripts/gdb-iterate-dll.py index 79d46aa96..28c435ccb 100644 --- a/contrib/scripts/gdb-iterate-dll.py +++ b/contrib/scripts/gdb-iterate-dll.py @@ -23,7 +23,8 @@ def search_dll(head, field, match, pfield): if field_val.type.code == gdb.TYPE_CODE_INT: val = int(field_val) res = (match == val) - elif (field_val.type.code == gdb.TYPE_CODE_STRING) or (field_val.type.code == gdb.TYPE_CODE_ARRAY): + elif (field_val.type.code == gdb.TYPE_CODE_STRING + ) or (field_val.type.code == gdb.TYPE_CODE_ARRAY): val = str(field_val) res = (match == val) elif (field_val.type.code == gdb.TYPE_CODE_TYPEDEF): -- cgit v1.2.3 From 41aecf40551173f2fbd82ac877cc88e9ff012825 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 12 Oct 2019 18:25:20 +0000 Subject: add yapf style --- bootstrap | 13 ++++++++++++- contrib/Makefile.am | 1 + contrib/conf/.style.yapf | 5 +++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 contrib/conf/.style.yapf diff --git a/bootstrap b/bootstrap index 3972863be..12c7f41f3 100755 --- a/bootstrap +++ b/bootstrap @@ -21,8 +21,19 @@ else echo "Uncrustify not detected, hook not installed. Please install uncrustify if you plan on doing development" fi -echo "checking for libtoolize / libtool... " +# yapf can be a suffixed binary, don't change the essential logic +# of this if you change it. +if existence yapf || existence yapf3.0 || existence yapf3.1 || existence yapf3.2 || existence yapf3.3 || existence yapf3.4 || existence yapf3.5 || existence yapf3.6 || existence yapf3.7 || existence yapf3.8 || existence yapf3.9 || existence yapf4.0; then + echo "Installing yapf symlink" + # Install yapf style symlink (if possible) + ln -s contrib/conf/.style.yapf 2> /dev/null +else + echo "yapf not detected, please install yapf if you plan on contributing python code" +fi + + +echo "checking for libtoolize / libtool... " if existence libtool || existence libtoolize || existence glibtoolize || existence slibtool; then autoreconf -if diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 61cb5b714..83c68d828 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -19,6 +19,7 @@ INITD_FILES = \ EXTRA_DIST = \ conf/colorit/colorit.conf \ + conf/.style.yapf \ conf/editors/eclipse/gnunet_codingstyle.xml \ conf/gnunet/no_forcestart.conf \ conf/gnunet/no_autostart_above_core.conf \ diff --git a/contrib/conf/.style.yapf b/contrib/conf/.style.yapf new file mode 100644 index 000000000..3b39780ca --- /dev/null +++ b/contrib/conf/.style.yapf @@ -0,0 +1,5 @@ +[style] +based_on_style = pep8 +coalesce_brackets=True +column_limit=80 +dedent_closing_brackets=True -- cgit v1.2.3 From 6859cb3d809d0a069f3592f3f6986a8c6bd1f35b Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 14 Oct 2019 11:32:53 +0000 Subject: we're at 0.11.x closes #5801 --- doc/doxygen/gnunet.doxy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/doxygen/gnunet.doxy b/doc/doxygen/gnunet.doxy index 6872d97a4..7874576ff 100644 --- a/doc/doxygen/gnunet.doxy +++ b/doc/doxygen/gnunet.doxy @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = GNUnet -PROJECT_NUMBER = 0.10.x +PROJECT_NUMBER = 0.11.x PROJECT_LOGO = logo.png OUTPUT_DIRECTORY = . CREATE_SUBDIRS = YES -- cgit v1.2.3 From 8d2feb0bc00b1e73db91a64792323968d8948e34 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 14 Oct 2019 11:40:30 +0000 Subject: fix typo in Changelog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 76b81e075..76a4680ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ Mon Sep 16 00:00:00 UTC 2019 Mon Sep 10 00:00:00 UTC 2019 Drop win32 and mingw support after discussion with - Christian. It has been unmaintained in out code base + Christian. It has been unmaintained in our code base for years and there are no known users. Future implementors for Windows 10 support can refer to this commit as reference. -ng0 -- cgit v1.2.3 From 6dce2a314c8823fcf0b619f9f447d9ea7126d958 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 14 Oct 2019 11:45:26 +0000 Subject: sort(1) os names. --- README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index e23d006b5..31ab18727 100644 --- a/README +++ b/README @@ -206,9 +206,9 @@ binary packages We recommend to use binary packages provided by your Operating System's package manager. GNUnet is reportedly available for at least: -GNU Guix, Nix, Debian, ALT Linux, Archlinux, Deepin, Devuan, Hyperbola, -Kali Linux, LEDE/OpenWRT, Manjaro, Parabola, Pardus, Parrot, PureOS, -Raspbian, Rosa, Trisquel, and Ubuntu. +ALT Linux, Archlinux, Debian, Deepin, Devuan, GNU Guix, Hyperbola, +Kali Linux, LEDE/OpenWRT, Manjaro, Nix, Parabola, Pardus, Parrot, +PureOS, Raspbian, Rosa, Trisquel, and Ubuntu. If GNUnet is available for your Operating System and it is missing, send us feedback so that we can add it to this list. Furthermore, if -- cgit v1.2.3 From 341fd49b42855e5b197ecfd98bafc66e65eccfa8 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 14 Oct 2019 12:10:35 +0000 Subject: 'make pretty' rule using uncrustify, detect uncrustify in configure script. closes #5904 --- Makefile.am | 5 +++++ configure.ac | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/Makefile.am b/Makefile.am index d69dd3a82..f2b48b358 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,3 +38,8 @@ docdir = $(datadir)/doc/gnunet/ doc_DATA = COPYING README ACLOCAL_AMFLAGS = -I m4 + +if HAVE_UNCRUSTIFY +pretty: + find $(top_srcdir) -type f ! -path '*/.*' ! -path '*/_*' -name '*.c' -name '*.h' -print0 | xargs -0 uncrustify -c $(top_srcdir) --replace --no-backup 2>&1 || true +endif diff --git a/configure.ac b/configure.ac index 7af7e83df..e486a893d 100644 --- a/configure.ac +++ b/configure.ac @@ -313,6 +313,15 @@ AS_IF([test x"$VAR_UPNPC_BINARY" != x"false"], [AC_DEFINE_UNQUOTED([UPNPC], "$VAR_UPNPC_BINARY", [Path to upnpc binary])], [AC_MSG_WARN([warning: 'upnpc' binary not found.])]) + +# uncrustify +AC_PATH_TARGET_TOOL(VAR_UNCRUSTIFY_BINARY, uncrustify, false) + +AS_IF([test x"$VAR_UNCRUSTIFY_BINARY" != x"false"], + [AC_DEFINE_UNQUOTED([HAVE_UNCRUSTIFY], "$VAR_UNCRUSTIFY_BINARY", [Path to uncrustify binary])], + [AC_MSG_WARN([warning: 'uncrustify' binary not found.])]) + + AC_CHECK_MEMBER(struct tm.tm_gmtoff, [AC_DEFINE(HAVE_TM_GMTOFF, 1, [Define if struct tm has the tm_gmtoff member.])], -- cgit v1.2.3 From 0bd7e210600d4c391bc6c35f909f1960123de743 Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Mon, 14 Oct 2019 14:49:44 +0200 Subject: readd reclaim --- src/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 51bf2d63d..09d176100 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,9 +12,7 @@ endif if HAVE_EXPERIMENTAL EXP_DIR = \ rps \ - abd \ - reclaim-attribute \ - reclaim + abd if HAVE_ABE EXP_DIR += \ abe @@ -59,6 +57,9 @@ endif if HAVE_MHD if HAVE_JSON REST_DIR = rest + RECLAIM_DIR = \ + reclaim-attribute \ + reclaim endif endif @@ -121,6 +122,7 @@ SUBDIRS = \ exit \ pt \ secretsharing \ + $(RECLAIM_DIR) \ $(EXP_DIR) \ integration-tests -- cgit v1.2.3 From 9747dddefba25dc3f3c3c39bfb55a5f4082ed856 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 14 Oct 2019 14:06:39 +0000 Subject: gitignore yapf --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6842f759f..955c97d36 100644 --- a/.gitignore +++ b/.gitignore @@ -61,8 +61,8 @@ doc/tutorial/gversion.texi # top-level symlink can exist .clang-format - uncrustify.cfg +.style.yapf # this exists outside of the main repository cmake/ -- cgit v1.2.3 From dc57bfc9ab69749453269c9bfce354a6c63a4648 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 14 Oct 2019 14:06:58 +0000 Subject: fix the previous uncrustify commit. --- Makefile.am | 4 ++-- configure.ac | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index f2b48b358..e8bd98da1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,7 @@ doc_DATA = COPYING README ACLOCAL_AMFLAGS = -I m4 -if HAVE_UNCRUSTIFY +if HAVE_UNCRUSTIFY_BINARY pretty: - find $(top_srcdir) -type f ! -path '*/.*' ! -path '*/_*' -name '*.c' -name '*.h' -print0 | xargs -0 uncrustify -c $(top_srcdir) --replace --no-backup 2>&1 || true + find $(top_srcdir) -type f -name '*.c' -or -name '*.h' -print0 | xargs -0 uncrustify -c $(top_srcdir)/contrib/uncrustify.cfg --replace --no-backup 2>&1 || true endif diff --git a/configure.ac b/configure.ac index e486a893d..5ca5f55d1 100644 --- a/configure.ac +++ b/configure.ac @@ -315,11 +315,9 @@ AS_IF([test x"$VAR_UPNPC_BINARY" != x"false"], # uncrustify -AC_PATH_TARGET_TOOL(VAR_UNCRUSTIFY_BINARY, uncrustify, false) - -AS_IF([test x"$VAR_UNCRUSTIFY_BINARY" != x"false"], - [AC_DEFINE_UNQUOTED([HAVE_UNCRUSTIFY], "$VAR_UNCRUSTIFY_BINARY", [Path to uncrustify binary])], - [AC_MSG_WARN([warning: 'uncrustify' binary not found.])]) +# TODO: maybe add flag to pass location +AC_CHECK_PROG(UNCRUSTIFY_BINARY, uncrustify, true) +AM_CONDITIONAL(HAVE_UNCRUSTIFY_BINARY, $UNCRUSTIFY_BINARY) AC_CHECK_MEMBER(struct tm.tm_gmtoff, -- cgit v1.2.3 From 9297532d6c2f3c8c700b114725ce79c0a9a2e001 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 14 Oct 2019 14:08:54 +0000 Subject: Changelog --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 76a4680ea..315c869e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Oct 14 00:00:00 UTC 2019 + Add 'pretty' make rule to run uncrustify over the source tree. + -ng0 + Mon Sep 16 00:00:00 UTC 2019 Remove checks for CXX and CPP. Scans found no (remaining) cxx code. ccache with clang on -- cgit v1.2.3 From 0169bf2da23e52f13eef3e77ed93e2ab3d6a674e Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 14 Oct 2019 14:09:47 +0000 Subject: po/POTFILES.in --- po/POTFILES.in | 130 +++++++++++++++++++++++---------------------------------- 1 file changed, 52 insertions(+), 78 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 1bffc3b02..4c6569b15 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,44 +4,35 @@ src/abd/delegate_misc.c src/abd/gnunet-abd.c src/abd/gnunet-service-abd.c src/abd/plugin_gnsrecord_abd.c -src/abd/plugin_rest_abd.c -src/abd/plugin_rest_credential.c src/abe/abe.c src/arm/arm_api.c src/arm/arm_monitor_api.c src/arm/gnunet-arm.c src/arm/gnunet-service-arm.c src/arm/mockup-service.c -src/ats/ats_api2_application.c -src/ats/ats_api2_transport.c +src/ats-tests/ats-testing-experiment.c +src/ats-tests/ats-testing-log.c +src/ats-tests/ats-testing-preferences.c +src/ats-tests/ats-testing-traffic.c +src/ats-tests/ats-testing.c +src/ats-tests/gnunet-ats-sim.c +src/ats-tests/gnunet-solver-eval.c +src/ats-tool/gnunet-ats.c src/ats/ats_api_connectivity.c src/ats/ats_api_performance.c src/ats/ats_api_scanner.c src/ats/ats_api_scheduling.c src/ats/gnunet-ats-solver-eval.c -src/ats/gnunet-service-ats_addresses.c src/ats/gnunet-service-ats.c +src/ats/gnunet-service-ats_addresses.c src/ats/gnunet-service-ats_connectivity.c -src/ats/gnunet-service-ats-new.c src/ats/gnunet-service-ats_normalization.c src/ats/gnunet-service-ats_performance.c src/ats/gnunet-service-ats_plugins.c src/ats/gnunet-service-ats_preferences.c src/ats/gnunet-service-ats_reservations.c src/ats/gnunet-service-ats_scheduling.c -src/ats/plugin_ats2_common.c -src/ats/plugin_ats2_simple.c -src/ats/plugin_ats_mlp.c src/ats/plugin_ats_proportional.c -src/ats/plugin_ats_ril.c -src/ats-tests/ats-testing.c -src/ats-tests/ats-testing-experiment.c -src/ats-tests/ats-testing-log.c -src/ats-tests/ats-testing-preferences.c -src/ats-tests/ats-testing-traffic.c -src/ats-tests/gnunet-ats-sim.c -src/ats-tests/gnunet-solver-eval.c -src/ats-tool/gnunet-ats.c src/auction/gnunet-auction-create.c src/auction/gnunet-auction-info.c src/auction/gnunet-auction-join.c @@ -58,8 +49,8 @@ src/cadet/cadet_api_list_peers.c src/cadet/cadet_api_list_tunnels.c src/cadet/cadet_test_lib.c src/cadet/desirability_table.c -src/cadet/gnunet-cadet.c src/cadet/gnunet-cadet-profiler.c +src/cadet/gnunet-cadet.c src/cadet/gnunet-service-cadet.c src/cadet/gnunet-service-cadet_channel.c src/cadet/gnunet-service-cadet_connection.c @@ -75,15 +66,15 @@ src/consensus/gnunet-service-consensus.c src/consensus/plugin_block_consensus.c src/conversation/conversation_api.c src/conversation/conversation_api_call.c -src/conversation/gnunet-conversation.c src/conversation/gnunet-conversation-test.c -src/conversation/gnunet_gst.c -src/conversation/gnunet_gst_test.c -src/conversation/gnunet-helper-audio-playback.c +src/conversation/gnunet-conversation.c src/conversation/gnunet-helper-audio-playback-gst.c -src/conversation/gnunet-helper-audio-record.c +src/conversation/gnunet-helper-audio-playback.c src/conversation/gnunet-helper-audio-record-gst.c +src/conversation/gnunet-helper-audio-record.c src/conversation/gnunet-service-conversation.c +src/conversation/gnunet_gst.c +src/conversation/gnunet_gst_test.c src/conversation/microphone.c src/conversation/plugin_gnsrecord_conversation.c src/conversation/speaker.c @@ -113,7 +104,6 @@ src/dht/dht_api.c src/dht/dht_test_lib.c src/dht/gnunet-dht-get.c src/dht/gnunet-dht-monitor.c -src/dht/gnunet_dht_profiler.c src/dht/gnunet-dht-put.c src/dht/gnunet-service-dht.c src/dht/gnunet-service-dht_clients.c @@ -122,6 +112,7 @@ src/dht/gnunet-service-dht_hello.c src/dht/gnunet-service-dht_neighbours.c src/dht/gnunet-service-dht_nse.c src/dht/gnunet-service-dht_routing.c +src/dht/gnunet_dht_profiler.c src/dht/plugin_block_dht.c src/dns/dns_api.c src/dns/gnunet-dns-monitor.c @@ -132,7 +123,6 @@ src/dns/gnunet-zonewalk.c src/dns/plugin_block_dns.c src/exit/gnunet-daemon-exit.c src/exit/gnunet-helper-exit.c -src/exit/gnunet-helper-exit-windows.c src/fragmentation/defragmentation.c src/fragmentation/fragmentation.c src/fs/fs_api.c @@ -157,8 +147,8 @@ src/fs/gnunet-auto-share.c src/fs/gnunet-daemon-fsprofiler.c src/fs/gnunet-directory.c src/fs/gnunet-download.c -src/fs/gnunet-fs.c src/fs/gnunet-fs-profiler.c +src/fs/gnunet-fs.c src/fs/gnunet-helper-fs-publish.c src/fs/gnunet-publish.c src/fs/gnunet-search.c @@ -178,10 +168,9 @@ src/gns/gns_tld_api.c src/gns/gnunet-bcd.c src/gns/gnunet-dns2gns.c src/gns/gnunet-gns-benchmark.c -src/gns/gnunet-gns.c -src/gns/gnunet-gns-helper-service-w32.c src/gns/gnunet-gns-import.c src/gns/gnunet-gns-proxy.c +src/gns/gnunet-gns.c src/gns/gnunet-service-gns.c src/gns/gnunet-service-gns_interceptor.c src/gns/gnunet-service-gns_resolver.c @@ -195,14 +184,10 @@ src/gnsrecord/gnsrecord_crypto.c src/gnsrecord/gnsrecord_misc.c src/gnsrecord/gnsrecord_serialization.c src/gnsrecord/plugin_gnsrecord_dns.c -src/gns/w32nsp.c -src/gns/w32nsp-install.c -src/gns/w32nsp-resolve.c -src/gns/w32nsp-uninstall.c src/hello/address.c src/hello/gnunet-hello.c -src/hello/hello.c src/hello/hello-ng.c +src/hello/hello.c src/hostlist/gnunet-daemon-hostlist.c src/hostlist/gnunet-daemon-hostlist_client.c src/hostlist/gnunet-daemon-hostlist_server.c @@ -210,6 +195,7 @@ src/identity/gnunet-identity.c src/identity/gnunet-service-identity.c src/identity/identity_api.c src/identity/identity_api_lookup.c +src/identity/identity_api_suffix_lookup.c src/identity/plugin_rest_identity.c src/json/json.c src/json/json_generator.c @@ -226,13 +212,13 @@ src/namecache/namecache_api.c src/namecache/plugin_namecache_flat.c src/namecache/plugin_namecache_postgres.c src/namecache/plugin_namecache_sqlite.c -src/namestore/gnunet-namestore.c src/namestore/gnunet-namestore-fcfsd.c +src/namestore/gnunet-namestore.c src/namestore/gnunet-service-namestore.c src/namestore/gnunet-zoneimport.c src/namestore/namestore_api.c src/namestore/namestore_api_monitor.c -src/namestore/plugin_namestore_heap.c +src/namestore/plugin_namestore_flat.c src/namestore/plugin_namestore_postgres.c src/namestore/plugin_namestore_sqlite.c src/namestore/plugin_rest_namestore.c @@ -244,9 +230,7 @@ src/nat-auto/gnunet-service-nat-auto_legacy.c src/nat-auto/nat_auto_api.c src/nat-auto/nat_auto_api_test.c src/nat/gnunet-helper-nat-client.c -src/nat/gnunet-helper-nat-client-windows.c src/nat/gnunet-helper-nat-server.c -src/nat/gnunet-helper-nat-server-windows.c src/nat/gnunet-nat.c src/nat/gnunet-service-nat.c src/nat/gnunet-service-nat_externalip.c @@ -255,17 +239,17 @@ src/nat/gnunet-service-nat_mini.c src/nat/gnunet-service-nat_stun.c src/nat/nat_api.c src/nat/nat_api_stun.c -src/nse/gnunet-nse.c src/nse/gnunet-nse-profiler.c +src/nse/gnunet-nse.c src/nse/gnunet-service-nse.c src/nse/nse_api.c src/nt/nt.c -src/peerinfo/gnunet-service-peerinfo.c -src/peerinfo/peerinfo_api.c -src/peerinfo/peerinfo_api_notify.c src/peerinfo-tool/gnunet-peerinfo.c src/peerinfo-tool/gnunet-peerinfo_plugins.c src/peerinfo-tool/plugin_rest_peerinfo.c +src/peerinfo/gnunet-service-peerinfo.c +src/peerinfo/peerinfo_api.c +src/peerinfo/peerinfo_api_notify.c src/peerstore/gnunet-peerstore.c src/peerstore/gnunet-service-peerstore.c src/peerstore/peerstore_api.c @@ -306,28 +290,29 @@ src/regex/regex_test_graph.c src/regex/regex_test_lib.c src/regex/regex_test_random.c src/rest/gnunet-rest-server.c +src/rest/plugin_rest_config.c src/rest/plugin_rest_copying.c src/rest/rest.c src/revocation/gnunet-revocation.c src/revocation/gnunet-service-revocation.c src/revocation/plugin_block_revocation.c src/revocation/revocation_api.c -src/rps/gnunet-rps.c src/rps/gnunet-rps-profiler.c +src/rps/gnunet-rps.c src/rps/gnunet-service-rps.c src/rps/gnunet-service-rps_custommap.c src/rps/gnunet-service-rps_sampler.c src/rps/gnunet-service-rps_sampler_elem.c src/rps/gnunet-service-rps_view.c -src/rps/rps_api.c src/rps/rps-sampler_client.c src/rps/rps-sampler_common.c src/rps/rps-test_util.c +src/rps/rps_api.c src/scalarproduct/gnunet-scalarproduct.c -src/scalarproduct/gnunet-service-scalarproduct_alice.c -src/scalarproduct/gnunet-service-scalarproduct_bob.c src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c +src/scalarproduct/gnunet-service-scalarproduct_alice.c +src/scalarproduct/gnunet-service-scalarproduct_bob.c src/scalarproduct/scalarproduct_api.c src/secretsharing/gnunet-secretsharing-profiler.c src/secretsharing/gnunet-service-secretsharing.c @@ -353,15 +338,16 @@ src/statistics/gnunet-statistics.c src/statistics/statistics_api.c src/template/gnunet-service-template.c src/template/gnunet-template.c +src/testbed-logger/gnunet-service-testbed-logger.c +src/testbed-logger/testbed_logger_api.c src/testbed/generate-underlay-topology.c src/testbed/gnunet-daemon-latency-logger.c src/testbed/gnunet-daemon-testbed-blacklist.c src/testbed/gnunet-daemon-testbed-underlay.c src/testbed/gnunet-helper-testbed.c -src/testbed/gnunet_mpi_test.c src/testbed/gnunet-service-test-barriers.c -src/testbed/gnunet-service-testbed_barriers.c src/testbed/gnunet-service-testbed.c +src/testbed/gnunet-service-testbed_barriers.c src/testbed/gnunet-service-testbed_cache.c src/testbed/gnunet-service-testbed_connectionpool.c src/testbed/gnunet-service-testbed_cpustatus.c @@ -369,20 +355,19 @@ src/testbed/gnunet-service-testbed_links.c src/testbed/gnunet-service-testbed_meminfo.c src/testbed/gnunet-service-testbed_oc.c src/testbed/gnunet-service-testbed_peers.c -src/testbed/gnunet_testbed_mpi_spawn.c src/testbed/gnunet-testbed-profiler.c -src/testbed-logger/gnunet-service-testbed-logger.c -src/testbed-logger/testbed_logger_api.c -src/testbed/testbed_api_barriers.c +src/testbed/gnunet_mpi_test.c +src/testbed/gnunet_testbed_mpi_spawn.c src/testbed/testbed_api.c +src/testbed/testbed_api_barriers.c src/testbed/testbed_api_hosts.c src/testbed/testbed_api_operations.c src/testbed/testbed_api_peers.c src/testbed/testbed_api_sd.c src/testbed/testbed_api_services.c src/testbed/testbed_api_statistics.c -src/testbed/testbed_api_testbed.c src/testbed/testbed_api_test.c +src/testbed/testbed_api_testbed.c src/testbed/testbed_api_topology.c src/testbed/testbed_api_underlay.c src/testing/gnunet-testing.c @@ -394,36 +379,40 @@ src/transport/gnunet-communicator-tcp.c src/transport/gnunet-communicator-udp.c src/transport/gnunet-communicator-unix.c src/transport/gnunet-helper-transport-bluetooth.c -src/transport/gnunet-helper-transport-wlan.c src/transport/gnunet-helper-transport-wlan-dummy.c +src/transport/gnunet-helper-transport-wlan.c src/transport/gnunet-service-tng.c -src/transport/gnunet-service-transport_ats.c src/transport/gnunet-service-transport.c +src/transport/gnunet-service-transport_ats.c src/transport/gnunet-service-transport_hello.c src/transport/gnunet-service-transport_manipulation.c src/transport/gnunet-service-transport_neighbours.c src/transport/gnunet-service-transport_plugins.c src/transport/gnunet-service-transport_validation.c -src/transport/gnunet-transport.c -src/transport/gnunet-transport-certificate-creation.c src/transport/gnunet-transport-profiler.c src/transport/gnunet-transport-wlan-receiver.c src/transport/gnunet-transport-wlan-sender.c +src/transport/gnunet-transport.c src/transport/plugin_transport_http_client.c src/transport/plugin_transport_http_common.c src/transport/plugin_transport_http_server.c src/transport/plugin_transport_smtp.c src/transport/plugin_transport_tcp.c src/transport/plugin_transport_template.c -src/transport/plugin_transport_udp_broadcasting.c src/transport/plugin_transport_udp.c +src/transport/plugin_transport_udp_broadcasting.c src/transport/plugin_transport_unix.c src/transport/plugin_transport_wlan.c src/transport/tcp_connection_legacy.c src/transport/tcp_server_legacy.c src/transport/tcp_server_mst_legacy.c src/transport/tcp_service_legacy.c -src/transport/transport_api2_address.c +src/transport/transport-testing-filenames.c +src/transport/transport-testing-loggers.c +src/transport/transport-testing-main.c +src/transport/transport-testing-send.c +src/transport/transport-testing.c +src/transport/transport-testing2.c src/transport/transport_api2_application.c src/transport/transport_api2_communication.c src/transport/transport_api2_core.c @@ -436,11 +425,6 @@ src/transport/transport_api_manipulation.c src/transport/transport_api_monitor_peers.c src/transport/transport_api_monitor_plugins.c src/transport/transport_api_offer_hello.c -src/transport/transport-testing.c -src/transport/transport-testing-filenames.c -src/transport/transport-testing-loggers.c -src/transport/transport-testing-main.c -src/transport/transport-testing-send.c src/util/bandwidth.c src/util/benchmark.c src/util/bio.c @@ -453,10 +437,11 @@ src/util/configuration_loader.c src/util/container_bloomfilter.c src/util/container_heap.c src/util/container_meta_data.c -src/util/container_multihashmap32.c src/util/container_multihashmap.c +src/util/container_multihashmap32.c src/util/container_multipeermap.c src/util/container_multishortmap.c +src/util/container_multiuuidmap.c src/util/crypto_abe.c src/util/crypto_crc.c src/util/crypto_ecc.c @@ -476,16 +461,14 @@ src/util/dnsparser.c src/util/dnsstub.c src/util/getopt.c src/util/getopt_helpers.c -src/util/gnunet-config.c src/util/gnunet-config-diff.c +src/util/gnunet-config.c src/util/gnunet-ecc.c -src/util/gnunet-helper-w32-console.c src/util/gnunet-qr.c src/util/gnunet-resolver.c src/util/gnunet-scrypt.c src/util/gnunet-service-resolver.c src/util/gnunet-timeout.c -src/util/gnunet-timeout-w32.c src/util/gnunet-uri.c src/util/helper.c src/util/load.c @@ -511,21 +494,12 @@ src/util/speedup.c src/util/strings.c src/util/time.c src/util/tun.c -src/util/w32cat.c -src/util/win.c -src/util/winproc.c src/vpn/gnunet-helper-vpn.c -src/vpn/gnunet-helper-vpn-windows.c src/vpn/gnunet-service-vpn.c src/vpn/gnunet-vpn.c src/vpn/vpn_api.c -src/zonemaster/gnunet-service-zonemaster.c src/zonemaster/gnunet-service-zonemaster-monitor.c +src/zonemaster/gnunet-service-zonemaster.c src/fs/fs_api.h -src/include/compat.h -src/include/gnunet_common.h -src/include/gnunet_mq_lib.h -src/include/gnunet_time_lib.h -src/scalarproduct/scalarproduct.h src/testbed/testbed_api.h src/testbed/testbed_api_operations.h -- cgit v1.2.3 From f801acf4e19dd4a6bec3911f81a16d73e5ddbf84 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 14 Oct 2019 14:18:31 +0000 Subject: with 'make pretty' running uncrustify, yapf styling the python files, this file seems obsolete? --- contrib/indent_pre-commit | 22 ++++++++++++++++++++++ pre-commit | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) create mode 100755 contrib/indent_pre-commit delete mode 100755 pre-commit diff --git a/contrib/indent_pre-commit b/contrib/indent_pre-commit new file mode 100755 index 000000000..c67fcaf0c --- /dev/null +++ b/contrib/indent_pre-commit @@ -0,0 +1,22 @@ +#!/bin/sh +# Run this script to indent the GNUnet code. When run without arguments, +# it indents the ENTIRE src/ tree. Run with 'src/XXX' to indent the +# src/XXX directory. +# +# This script is in the public domain. +if test $# = 0 +then + PATHS=src/ +else + PATHS="$@" +fi +find $PATHS -name "*.c" -exec indent {} \; +find $PATHS -name "*.h" -exec indent {} \; +find $PATHS -name "*.c" -exec indent {} \; +find $PATHS -name "*.h" -exec indent {} \; +find $PATHS -name "*.c" -exec contrib/scripts/removetrailingwhitespace.py {} \; +find $PATHS -name "*.h" -exec contrib/scripts/removetrailingwhitespace.py {} \; +if test -n "`dos2unix -V | head -n1 | awk '{print $1 $2}'`"; then + find $PATHS -name "*.c" -exec dos2unix {} \; + find $PATHS -name "*.h" -exec dos2unix {} \; +fi diff --git a/pre-commit b/pre-commit deleted file mode 100755 index c67fcaf0c..000000000 --- a/pre-commit +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# Run this script to indent the GNUnet code. When run without arguments, -# it indents the ENTIRE src/ tree. Run with 'src/XXX' to indent the -# src/XXX directory. -# -# This script is in the public domain. -if test $# = 0 -then - PATHS=src/ -else - PATHS="$@" -fi -find $PATHS -name "*.c" -exec indent {} \; -find $PATHS -name "*.h" -exec indent {} \; -find $PATHS -name "*.c" -exec indent {} \; -find $PATHS -name "*.h" -exec indent {} \; -find $PATHS -name "*.c" -exec contrib/scripts/removetrailingwhitespace.py {} \; -find $PATHS -name "*.h" -exec contrib/scripts/removetrailingwhitespace.py {} \; -if test -n "`dos2unix -V | head -n1 | awk '{print $1 $2}'`"; then - find $PATHS -name "*.c" -exec dos2unix {} \; - find $PATHS -name "*.h" -exec dos2unix {} \; -fi -- cgit v1.2.3 From 3d968d36122b64b374feb1be0fd131f6691995f0 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 14 Oct 2019 14:52:33 +0000 Subject: add yapf to make pretty --- Makefile.am | 4 ++++ configure.ac | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/Makefile.am b/Makefile.am index e8bd98da1..579939b09 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,11 @@ doc_DATA = COPYING README ACLOCAL_AMFLAGS = -I m4 +# TODO: better nesting. if HAVE_UNCRUSTIFY_BINARY pretty: find $(top_srcdir) -type f -name '*.c' -or -name '*.h' -print0 | xargs -0 uncrustify -c $(top_srcdir)/contrib/uncrustify.cfg --replace --no-backup 2>&1 || true +if HAVE_YAPF_BINARY + find $(top_srcdir) -type f -name '*.py' -or -name '*.py.in' -print0 | xargs -0 $(YAPF_BINARY) -i 2>&1 || true +endif endif diff --git a/configure.ac b/configure.ac index 5ca5f55d1..f56d2f508 100644 --- a/configure.ac +++ b/configure.ac @@ -319,6 +319,11 @@ AS_IF([test x"$VAR_UPNPC_BINARY" != x"false"], AC_CHECK_PROG(UNCRUSTIFY_BINARY, uncrustify, true) AM_CONDITIONAL(HAVE_UNCRUSTIFY_BINARY, $UNCRUSTIFY_BINARY) +# yapf +# TODO: less repetition, add flag to pass name +AC_CHECK_PROGS(YAPF_BINARY, [yapf yapf3.0 yapf3.1 yapf3.2 yapf3.3 yapf3.4 yapf3.5 yapf3.6 yapf3.7 yapf3.8 yapf3.9 yapf4.0], false) +AM_CONDITIONAL(HAVE_YAPF_BINARY, test x$YAPF_BINARY != xfalse) + AC_CHECK_MEMBER(struct tm.tm_gmtoff, [AC_DEFINE(HAVE_TM_GMTOFF, 1, -- cgit v1.2.3 From 4f9102a80c7f94b88c51176633a49a8107bbdc4e Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 14 Oct 2019 15:21:56 +0000 Subject: move back --- contrib/indent_pre-commit | 22 ---------------------- pre-commit | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) delete mode 100755 contrib/indent_pre-commit create mode 100755 pre-commit diff --git a/contrib/indent_pre-commit b/contrib/indent_pre-commit deleted file mode 100755 index c67fcaf0c..000000000 --- a/contrib/indent_pre-commit +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# Run this script to indent the GNUnet code. When run without arguments, -# it indents the ENTIRE src/ tree. Run with 'src/XXX' to indent the -# src/XXX directory. -# -# This script is in the public domain. -if test $# = 0 -then - PATHS=src/ -else - PATHS="$@" -fi -find $PATHS -name "*.c" -exec indent {} \; -find $PATHS -name "*.h" -exec indent {} \; -find $PATHS -name "*.c" -exec indent {} \; -find $PATHS -name "*.h" -exec indent {} \; -find $PATHS -name "*.c" -exec contrib/scripts/removetrailingwhitespace.py {} \; -find $PATHS -name "*.h" -exec contrib/scripts/removetrailingwhitespace.py {} \; -if test -n "`dos2unix -V | head -n1 | awk '{print $1 $2}'`"; then - find $PATHS -name "*.c" -exec dos2unix {} \; - find $PATHS -name "*.h" -exec dos2unix {} \; -fi diff --git a/pre-commit b/pre-commit new file mode 100755 index 000000000..c67fcaf0c --- /dev/null +++ b/pre-commit @@ -0,0 +1,22 @@ +#!/bin/sh +# Run this script to indent the GNUnet code. When run without arguments, +# it indents the ENTIRE src/ tree. Run with 'src/XXX' to indent the +# src/XXX directory. +# +# This script is in the public domain. +if test $# = 0 +then + PATHS=src/ +else + PATHS="$@" +fi +find $PATHS -name "*.c" -exec indent {} \; +find $PATHS -name "*.h" -exec indent {} \; +find $PATHS -name "*.c" -exec indent {} \; +find $PATHS -name "*.h" -exec indent {} \; +find $PATHS -name "*.c" -exec contrib/scripts/removetrailingwhitespace.py {} \; +find $PATHS -name "*.h" -exec contrib/scripts/removetrailingwhitespace.py {} \; +if test -n "`dos2unix -V | head -n1 | awk '{print $1 $2}'`"; then + find $PATHS -name "*.c" -exec dos2unix {} \; + find $PATHS -name "*.h" -exec dos2unix {} \; +fi -- cgit v1.2.3 From 096579cbd720bb0b6d0f974cdf0765cf0fdcfca4 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 14 Oct 2019 15:45:45 +0000 Subject: kommando zurueck, this time for real. --- contrib/indent_pre-commit | 22 ++++++++++++++++++++++ pre-commit | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) create mode 100755 contrib/indent_pre-commit delete mode 100755 pre-commit diff --git a/contrib/indent_pre-commit b/contrib/indent_pre-commit new file mode 100755 index 000000000..c67fcaf0c --- /dev/null +++ b/contrib/indent_pre-commit @@ -0,0 +1,22 @@ +#!/bin/sh +# Run this script to indent the GNUnet code. When run without arguments, +# it indents the ENTIRE src/ tree. Run with 'src/XXX' to indent the +# src/XXX directory. +# +# This script is in the public domain. +if test $# = 0 +then + PATHS=src/ +else + PATHS="$@" +fi +find $PATHS -name "*.c" -exec indent {} \; +find $PATHS -name "*.h" -exec indent {} \; +find $PATHS -name "*.c" -exec indent {} \; +find $PATHS -name "*.h" -exec indent {} \; +find $PATHS -name "*.c" -exec contrib/scripts/removetrailingwhitespace.py {} \; +find $PATHS -name "*.h" -exec contrib/scripts/removetrailingwhitespace.py {} \; +if test -n "`dos2unix -V | head -n1 | awk '{print $1 $2}'`"; then + find $PATHS -name "*.c" -exec dos2unix {} \; + find $PATHS -name "*.h" -exec dos2unix {} \; +fi diff --git a/pre-commit b/pre-commit deleted file mode 100755 index c67fcaf0c..000000000 --- a/pre-commit +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# Run this script to indent the GNUnet code. When run without arguments, -# it indents the ENTIRE src/ tree. Run with 'src/XXX' to indent the -# src/XXX directory. -# -# This script is in the public domain. -if test $# = 0 -then - PATHS=src/ -else - PATHS="$@" -fi -find $PATHS -name "*.c" -exec indent {} \; -find $PATHS -name "*.h" -exec indent {} \; -find $PATHS -name "*.c" -exec indent {} \; -find $PATHS -name "*.h" -exec indent {} \; -find $PATHS -name "*.c" -exec contrib/scripts/removetrailingwhitespace.py {} \; -find $PATHS -name "*.h" -exec contrib/scripts/removetrailingwhitespace.py {} \; -if test -n "`dos2unix -V | head -n1 | awk '{print $1 $2}'`"; then - find $PATHS -name "*.c" -exec dos2unix {} \; - find $PATHS -name "*.h" -exec dos2unix {} \; -fi -- cgit v1.2.3 From 36f25e7ccdee5c319a6bd77949f01453c8a5a69e Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Tue, 15 Oct 2019 10:40:00 +0200 Subject: minor fix --- doc/handbook/chapters/user.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/handbook/chapters/user.texi b/doc/handbook/chapters/user.texi index 652863320..aefa95c3d 100644 --- a/doc/handbook/chapters/user.texi +++ b/doc/handbook/chapters/user.texi @@ -1348,8 +1348,8 @@ That's it, you now know the basics for file-sharing with GNUnet! The GNU Name System (GNS) is secure and decentralized naming system. -It allows its users to resolve and register names within the @code{.gnu} -@dfn{top-level domain} (TLD). +It allows its users to register names as @dfn{top-level domains} (TLDs) and +resolve other namespaces within their TLDs. GNS is designed to provide: @itemize @bullet -- cgit v1.2.3 From 06d7bccf5a43b921b13e4136e5c4fe73284e6afa Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 16 Oct 2019 12:32:52 +0200 Subject: updated italian translation --- po/it.po | 7475 ++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 3591 insertions(+), 3884 deletions(-) diff --git a/po/it.po b/po/it.po index 25a5fd446..b4e7e7990 100644 --- a/po/it.po +++ b/po/it.po @@ -1,237 +1,136 @@ # Italian translations for GNUnet package. # Copyright (C) 2018 Free Software Foundation, Inc. # This file is distributed under the same license as the GNUnet package. -# Sebastiano Pistore , 2018. +# +# Sebastiano Pistore , 2018-2019. # msgid "" msgstr "" "Project-Id-Version: gnunet 0.10.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2019-10-07 11:45+0200\n" -"PO-Revision-Date: 2018-08-29 13:48+0200\n" -"Last-Translator: Sebastiano Pistore \n" +"POT-Creation-Date: 2014-04-08 11:11+0200\n" +"PO-Revision-Date: 2019-10-16 11:00+0200\n" +"Last-Translator: Sebastiano Pistore \n" "Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"\n" -"X-Generator: Poedit 2.0.7\n" +"X-Generator: Poedit 2.2.3\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/abd/gnunet-abd.c:394 src/namestore/gnunet-namestore.c:994 -#, c-format -msgid "Ego `%s' not known to identity service\n" -msgstr "" - -#: src/abd/gnunet-abd.c:410 src/abd/gnunet-abd.c:875 -#, c-format -msgid "Issuer public key `%s' is not well-formed\n" -msgstr "" - -#: src/abd/gnunet-abd.c:549 src/abd/gnunet-service-abd.c:1723 -#: src/namestore/gnunet-namestore.c:1019 -#: src/namestore/gnunet-namestore-fcfsd.c:1138 -#, c-format -msgid "Failed to connect to namestore\n" -msgstr "" - -#: src/abd/gnunet-abd.c:814 src/abd/gnunet-abd.c:865 -#, c-format -msgid "Issuer public key not well-formed\n" -msgstr "" - -#: src/abd/gnunet-abd.c:823 src/abd/gnunet-abd.c:884 -#, fuzzy, c-format -msgid "Failed to connect to ABD\n" -msgstr "# connessioni attive" - -#: src/abd/gnunet-abd.c:829 -#, c-format -msgid "You must provide issuer the attribute\n" -msgstr "" - -#: src/abd/gnunet-abd.c:836 -#, c-format -msgid "ego required\n" -msgstr "" - -#: src/abd/gnunet-abd.c:846 -#, c-format -msgid "Subject public key needed\n" +#: src/arm/arm_api.c:337 +msgid "Client was disconnected from arm service, trying to reconnect.\n" msgstr "" -#: src/abd/gnunet-abd.c:855 -#, c-format -msgid "Subject public key `%s' is not well-formed\n" +#: src/arm/arm_monitor_api.c:321 +msgid "Monitoring client was disconnected from arm service, trying to reconnect.\n" msgstr "" -#: src/abd/gnunet-abd.c:890 +#: src/arm/gnunet-arm.c:164 #, c-format -msgid "You must provide issuer and subject attributes\n" +msgid "Failed to remove configuration file %s\n" msgstr "" -#: src/abd/gnunet-abd.c:946 +#: src/arm/gnunet-arm.c:170 #, c-format -msgid "Please specify name to lookup, subject key and issuer key!\n" -msgstr "" - -#: src/abd/gnunet-abd.c:967 -msgid "verify credential against attribute" -msgstr "" - -#: src/abd/gnunet-abd.c:974 -msgid "" -"The public key of the subject to lookup thecredential for, or for issuer " -"side storage: subject and its attributes" -msgstr "" - -#: src/abd/gnunet-abd.c:981 -msgid "The private, signed delegate presented by the subject" -msgstr "" - -#: src/abd/gnunet-abd.c:988 -msgid "The public key of the authority to verify the credential against" -msgstr "" - -#: src/abd/gnunet-abd.c:993 -msgid "The ego/zone name to use" -msgstr "" - -#: src/abd/gnunet-abd.c:999 -msgid "The issuer attribute to verify against or to issue" -msgstr "" - -#: src/abd/gnunet-abd.c:1005 -msgid "" -"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\"" -msgstr "" - -#: src/abd/gnunet-abd.c:1010 -msgid "collect credentials" +msgid "Failed to remove servicehome directory %s\n" msgstr "" -#: src/abd/gnunet-abd.c:1015 -msgid "Create and issue a credential issuer side." -msgstr "" +#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013 +msgid "Message was sent successfully" +msgstr "Messaggio inviato con successo" -#: src/abd/gnunet-abd.c:1020 -msgid "Issue a credential subject side." +#: src/arm/gnunet-arm.c:218 +msgid "Misconfiguration (can not connect to the ARM service)" msgstr "" -#: src/abd/gnunet-abd.c:1025 -msgid "Create, sign and return a credential subject side." +#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017 +msgid "We disconnected from ARM before we could send a request" msgstr "" -#: src/abd/gnunet-abd.c:1032 -msgid "Import signed credentials that should be issued to a zone/ego" +#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019 +msgid "ARM API is busy" msgstr "" -#: src/abd/gnunet-abd.c:1036 -msgid "Create private record entry." +#: src/arm/gnunet-arm.c:224 +msgid "Request does not fit into a message" msgstr "" -#: src/abd/gnunet-abd.c:1042 src/abd/gnunet-abd.c:1048 -msgid "Indicates that the collect/verify process is done via forward search." -msgstr "" +#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023 +msgid "Request timed out" +msgstr "Richiesta scaduta" -#: src/abd/gnunet-abd.c:1061 -msgid "GNUnet abd resolver tool" +#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025 +msgid "Unknown request status" msgstr "" -#: src/abd/gnunet-service-abd.c:1718 src/gns/gnunet-gns.c:185 -#: src/gns/gnunet-gns-helper-service-w32.c:727 +#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041 #, c-format -msgid "Failed to connect to GNS\n" +msgid "%s is stopped" msgstr "" -#: src/abd/plugin_gnsrecord_abd.c:182 +#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043 #, c-format -msgid "Unable to parse ATTR record string `%s'\n" -msgstr "" - -#: src/abd/plugin_rest_abd.c:1128 src/abd/plugin_rest_credential.c:1128 -msgid "GNS REST API initialized\n" +msgid "%s is starting" msgstr "" -#: src/arm/gnunet-arm.c:156 +#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045 #, c-format -msgid "Failed to remove configuration file %s\n" +msgid "%s is stopping" msgstr "" -#: src/arm/gnunet-arm.c:162 +#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047 #, c-format -msgid "Failed to remove servicehome directory %s\n" -msgstr "" - -#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139 -msgid "Message was sent successfully" -msgstr "Messaggio inviato con successo" - -#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141 -msgid "We disconnected from ARM before we could send a request" -msgstr "" - -#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143 -msgid "Unknown request status" -msgstr "" - -#: src/arm/gnunet-arm.c:242 -#, fuzzy -msgid "is stopped" -msgstr "# elementi memorizzati" - -#: src/arm/gnunet-arm.c:244 -msgid "is starting" -msgstr "" - -#: src/arm/gnunet-arm.c:246 -msgid "is stopping" -msgstr "" - -#: src/arm/gnunet-arm.c:248 -msgid "is starting already" +msgid "%s is starting already" msgstr "" -#: src/arm/gnunet-arm.c:250 -msgid "is stopping already" +#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049 +#, c-format +msgid "%s is stopping already" msgstr "" -#: src/arm/gnunet-arm.c:252 -msgid "is started already" +#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051 +#, c-format +msgid "%s is started already" msgstr "" -#: src/arm/gnunet-arm.c:254 -msgid "is stopped already" +#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053 +#, c-format +msgid "%s is stopped already" msgstr "" -#: src/arm/gnunet-arm.c:256 -msgid "service is not known to ARM" +#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055 +#, c-format +msgid "%s service is not known to ARM" msgstr "" -#: src/arm/gnunet-arm.c:258 -msgid "service failed to start" +#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057 +#, c-format +msgid "%s service failed to start" msgstr "" -#: src/arm/gnunet-arm.c:260 -msgid "service cannot be manipulated because ARM is shutting down" +#: src/arm/gnunet-arm.c:262 +#, c-format +msgid "%s service cannot be started because ARM is shutting down" msgstr "" -#: src/arm/gnunet-arm.c:262 -msgid "Unknown result code." +#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1061 +#, c-format +msgid "%.s Unknown result code." msgstr "" -#: src/arm/gnunet-arm.c:295 +#: src/arm/gnunet-arm.c:297 msgid "Fatal error initializing ARM API.\n" msgstr "" -#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333 +#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335 #, c-format msgid "Failed to start the ARM service: %s\n" msgstr "" -#: src/arm/gnunet-arm.c:368 +#: src/arm/gnunet-arm.c:369 #, c-format msgid "Failed to send a stop request to the ARM service: %s\n" msgstr "" @@ -241,1059 +140,929 @@ msgstr "" msgid "Failed to stop the ARM service: %s\n" msgstr "" -#: src/arm/gnunet-arm.c:419 -#, c-format -msgid "Failed to send a request to start the `%s' service: %s\n" -msgstr "" +#: src/arm/gnunet-arm.c:421 +#, fuzzy, c-format +#| msgid "Failed to start service `%s'\n" +msgid "Failed to send a request to start the `%s' service: %%s\n" +msgstr "Impossibile avviare il servizio ' %s'\n" -#: src/arm/gnunet-arm.c:429 +#: src/arm/gnunet-arm.c:431 #, c-format msgid "Failed to start the `%s' service: %s\n" msgstr "" -#: src/arm/gnunet-arm.c:467 +#: src/arm/gnunet-arm.c:468 #, c-format msgid "Failed to send a request to kill the `%s' service: %%s\n" msgstr "" -#: src/arm/gnunet-arm.c:478 +#: src/arm/gnunet-arm.c:479 #, c-format msgid "Failed to kill the `%s' service: %s\n" msgstr "" -#: src/arm/gnunet-arm.c:519 +#: src/arm/gnunet-arm.c:517 #, c-format msgid "Failed to request a list of services: %s\n" msgstr "" -#: src/arm/gnunet-arm.c:528 +#: src/arm/gnunet-arm.c:525 msgid "Error communicating with ARM. ARM not running?\n" msgstr "" -#: src/arm/gnunet-arm.c:534 +#: src/arm/gnunet-arm.c:530 msgid "Running services:\n" msgstr "Servizi in esecuzione:\n" -#: src/arm/gnunet-arm.c:623 +#: src/arm/gnunet-arm.c:612 #, c-format msgid "Now only monitoring, press CTRL-C to stop.\n" msgstr "" -#: src/arm/gnunet-arm.c:656 +#: src/arm/gnunet-arm.c:643 #, c-format msgid "Stopped %s.\n" msgstr "%s arrestato.\n" -#: src/arm/gnunet-arm.c:659 +#: src/arm/gnunet-arm.c:646 #, c-format msgid "Starting %s...\n" msgstr "Avvio di %s in corso...\n" -#: src/arm/gnunet-arm.c:662 +#: src/arm/gnunet-arm.c:649 #, c-format msgid "Stopping %s...\n" msgstr "Arresto di %s in corso...\n" -#: src/arm/gnunet-arm.c:676 +#: src/arm/gnunet-arm.c:660 #, c-format msgid "Unknown status %u for service %s.\n" msgstr "" -#: src/arm/gnunet-arm.c:766 +#: src/arm/gnunet-arm.c:724 msgid "stop all GNUnet services" msgstr "arresta tutti i servizi GNUnet" -#: src/arm/gnunet-arm.c:771 +#: src/arm/gnunet-arm.c:726 msgid "start a particular service" msgstr "" -#: src/arm/gnunet-arm.c:776 +#: src/arm/gnunet-arm.c:728 msgid "stop a particular service" msgstr "" -#: src/arm/gnunet-arm.c:780 +#: src/arm/gnunet-arm.c:730 msgid "start all GNUnet default services" msgstr "" -#: src/arm/gnunet-arm.c:784 +#: src/arm/gnunet-arm.c:733 msgid "stop and start all GNUnet default services" msgstr "" -#: src/arm/gnunet-arm.c:788 +#: src/arm/gnunet-arm.c:736 msgid "delete config file and directory on exit" msgstr "" -#: src/arm/gnunet-arm.c:792 +#: src/arm/gnunet-arm.c:739 msgid "monitor ARM activities" msgstr "" -#: src/arm/gnunet-arm.c:796 +#: src/arm/gnunet-arm.c:741 msgid "don't print status messages" msgstr "" -#: src/arm/gnunet-arm.c:801 -msgid "exit with error status if operation does not finish after DELAY" +#: src/arm/gnunet-arm.c:744 +msgid "timeout in MSECS milliseconds for completing current operation" msgstr "" -#: src/arm/gnunet-arm.c:805 +#: src/arm/gnunet-arm.c:746 msgid "list currently running services" msgstr "elenca i servizi in esecuzione" -#: src/arm/gnunet-arm.c:809 +#: src/arm/gnunet-arm.c:748 msgid "don't let gnunet-service-arm inherit standard output" msgstr "" -#: src/arm/gnunet-arm.c:813 +#: src/arm/gnunet-arm.c:750 msgid "don't let gnunet-service-arm inherit standard error" msgstr "" -#: src/arm/gnunet-arm.c:828 +#: src/arm/gnunet-arm.c:761 msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" -#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 -#: src/transport/tcp_service_legacy.c:557 -#, c-format -msgid "" -"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n" -msgstr "" - -#: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418 -#: src/transport/plugin_transport_tcp.c:1139 -#: src/transport/plugin_transport_tcp.c:1145 -#: src/transport/plugin_transport_tcp.c:3835 -#: src/transport/tcp_service_legacy.c:576 -#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1150 -#: src/util/service.c:1156 -#, c-format -msgid "Require valid port number for service `%s' in configuration!\n" -msgstr "" - -#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 -#: src/util/service.c:1195 -#, c-format -msgid "UNIXPATH `%s' too long, maximum length is %llu\n" -msgstr "" - -#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 -#: src/util/service.c:1200 -#, c-format -msgid "Using `%s' instead\n" -msgstr "" - -#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 -#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1236 -#, c-format -msgid "" -"Disabling UNIX domain socket support for service `%s', failed to create UNIX " -"domain socket: %s\n" -msgstr "" - -#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 -#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1254 -#, c-format -msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" -msgstr "" - -#: src/arm/gnunet-service-arm.c:556 -#: src/transport/plugin_transport_http_server.c:2688 -#: src/transport/plugin_transport_tcp.c:1259 -#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1295 -#, c-format -msgid "Failed to resolve `%s': %s\n" +#: src/arm/gnunet-service-arm.c:266 +msgid "Could not send status result to client\n" msgstr "" -#: src/arm/gnunet-service-arm.c:575 -#: src/transport/plugin_transport_http_server.c:2706 -#: src/transport/plugin_transport_tcp.c:1278 -#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1315 -#, c-format -msgid "Failed to find %saddress for `%s'.\n" +#: src/arm/gnunet-service-arm.c:302 +msgid "Could not send list result to client\n" msgstr "" -#: src/arm/gnunet-service-arm.c:986 +#: src/arm/gnunet-service-arm.c:529 #, c-format msgid "Failed to start service `%s'\n" -msgstr "" +msgstr "Impossibile avviare il servizio ' %s'\n" -#: src/arm/gnunet-service-arm.c:997 +#: src/arm/gnunet-service-arm.c:540 #, c-format msgid "Starting service `%s'\n" msgstr "Avvio del servizio '%s' in corso\n" -#: src/arm/gnunet-service-arm.c:1109 +#: src/arm/gnunet-service-arm.c:639 #, c-format msgid "Unable to create socket for service `%s': %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1144 +#: src/arm/gnunet-service-arm.c:661 #, c-format msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1187 +#: src/arm/gnunet-service-arm.c:695 #, c-format msgid "ARM now monitors connections to service `%s' at `%s'\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1346 +#: src/arm/gnunet-service-arm.c:831 #, c-format msgid "Preparing to stop `%s'\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1651 +#: src/arm/gnunet-service-arm.c:1100 #, c-format msgid "Restarting service `%s'.\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1812 +#: src/arm/gnunet-service-arm.c:1193 msgid "exit" msgstr "uscita" -#: src/arm/gnunet-service-arm.c:1817 +#: src/arm/gnunet-service-arm.c:1198 msgid "signal" msgstr "" -#: src/arm/gnunet-service-arm.c:1822 +#: src/arm/gnunet-service-arm.c:1203 msgid "unknown" msgstr "sconosciuto" -#: src/arm/gnunet-service-arm.c:1828 +#: src/arm/gnunet-service-arm.c:1209 #, c-format msgid "Service `%s' took %s to terminate\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1854 +#: src/arm/gnunet-service-arm.c:1231 #, c-format msgid "Service `%s' terminated normally, will restart at any time\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1870 +#: src/arm/gnunet-service-arm.c:1246 #, c-format msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" msgstr "" -#: src/arm/mockup-service.c:42 +#: src/arm/gnunet-service-arm.c:1500 +#, fuzzy, c-format +#| msgid "Starting service `%s'\n" +msgid "Starting default services `%s'\n" +msgstr "Avvio del servizio '%s' in corso\n" + +#: src/arm/gnunet-service-arm.c:1511 +#, c-format +msgid "Default service `%s' not configured correctly!\n" +msgstr "" + +#: src/arm/gnunet-service-arm.c:1524 +msgid "No default services configured, GNUnet will not really start right now.\n" +msgstr "" + +#: src/arm/mockup-service.c:41 msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#: src/ats/ats_api_performance.c:468 #, c-format -msgid "" -"Could not load quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" +msgid "Received %s message\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2799 +#: src/ats/ats_api_performance.c:511 #, c-format -msgid "" -"No outbound quota configured for network `%s', assigning default bandwidth " -"%llu\n" +msgid "Received last message for %s \n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2840 +#: src/ats/gnunet-ats-solver-eval.c:2199 src/ats/gnunet-ats-solver-eval.c:2233 +#: src/ats/gnunet-service-ats_addresses.c:1980 +#: src/ats/gnunet-service-ats_addresses.c:2024 #, c-format -msgid "" -"No outbound quota configure for network `%s', assigning default bandwidth " -"%llu\n" +msgid "Could not load quota for network `%s': `%s', assigning default bandwidth %llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 -msgid "solver to use" +#: src/ats/gnunet-ats-solver-eval.c:2205 +#: src/ats/gnunet-service-ats_addresses.c:1987 +#, c-format +msgid "Outbound quota configure for network `%s' is %llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 -msgid "experiment to use" +#: src/ats/gnunet-ats-solver-eval.c:2212 +#: src/ats/gnunet-service-ats_addresses.c:1995 +#, c-format +msgid "No outbound quota configured for network `%s', assigning default bandwidth %llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3306 -msgid "print logging" +#: src/ats/gnunet-ats-solver-eval.c:2239 +#: src/ats/gnunet-service-ats_addresses.c:2031 +#, c-format +msgid "Inbound quota configured for network `%s' is %llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3311 -msgid "save logging to disk" +#: src/ats/gnunet-ats-solver-eval.c:2246 +#: src/ats/gnunet-service-ats_addresses.c:2039 +#, c-format +msgid "No outbound quota configure for network `%s', assigning default bandwidth %llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3316 -msgid "disable normalization" +#: src/ats/gnunet-ats-solver-eval.c:2671 +#: src/ats-tests/gnunet-solver-eval.c:919 +msgid "solver to use" msgstr "" -#: src/ats/gnunet-service-ats-new.c:756 -#: src/ats/gnunet-service-ats_plugins.c:451 -#, c-format -msgid "Failed to initialize solver `%s'!\n" +#: src/ats/gnunet-ats-solver-eval.c:2674 src/ats/gnunet-ats-solver-eval.c:2677 +#: src/ats-tests/gnunet-solver-eval.c:922 +#: src/ats-tests/gnunet-solver-eval.c:925 +msgid "experiment to use" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:304 -#, c-format -msgid "" -"Could not load %s quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" +#: src/ats/gnunet-ats-solver-eval.c:2680 +msgid "print logging" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:314 +#: src/ats/gnunet-service-ats_addresses.c:2217 #, c-format -msgid "%s quota configured for network `%s' is %llu\n" +msgid "Initializing solver `%s '`%s'\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:359 +#: src/ats/gnunet-service-ats_addresses.c:2220 #, c-format -msgid "" -"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" +msgid "Failed to initialize solver `%s'!\n" msgstr "" -#: src/ats/plugin_ats2_common.c:90 -#, c-format -msgid "" -"Could not load %s quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" +#: src/ats/gnunet-service-ats_addresses.c:2243 +#, fuzzy +#| msgid "Failed to start HTTP server\n" +msgid "Failed to initialize solver!\n" +msgstr "Impossibile avviare il server HTTP\n" -#: src/ats/plugin_ats_mlp.c:1274 +#: src/ats/plugin_ats_mlp.c:892 msgid "Problem size too large, cannot allocate memory!\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:1870 +#: src/ats/plugin_ats_mlp.c:1329 #, c-format msgid "Adding address for peer `%s' multiple times\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:1914 +#: src/ats/plugin_ats_mlp.c:1376 #, c-format -msgid "Updating address property for peer `%s' %p not added before\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2476 -msgid "" -"MLP solver is not optimizing for anything, changing to feasibility check\n" +msgid "Updating address property `%s' for peer `%s' %p not added before\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533 -#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583 -#: src/ats/plugin_ats_mlp.c:2602 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#: src/ats/plugin_ats_mlp.c:2122 #, c-format -msgid "Invalid %s configuration %f \n" +msgid "Adjusting inconsistent outbound quota configuration for network `%s', is %llu must be at least %llu\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2671 +#: src/ats/plugin_ats_mlp.c:2131 #, c-format -msgid "" -"Adjusting inconsistent outbound quota configuration for network `%s', is " -"%llu must be at least %llu\n" +msgid "Adjusting inconsistent inbound quota configuration for network `%s', is %llu must be at least %llu\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2680 +#: src/ats/plugin_ats_mlp.c:2142 #, c-format -msgid "" -"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " -"must be at least %llu\n" +msgid "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2690 +#: src/ats/plugin_ats_mlp.c:2150 #, c-format -msgid "" -"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" +msgid "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2699 +#: src/ats/plugin_ats_mlp.c:2161 #, c-format -msgid "" -"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n" msgstr "" -#: src/ats/plugin_ats_proportional.c:1164 +#: src/ats/plugin_ats_proportional.c:1511 #, c-format -msgid "Invalid %s configuration %f\n" +msgid "Invalid network type `%u' `%s': Disconnect!\n" msgstr "" -#: src/ats-tests/ats-testing.c:422 +#: src/ats-tests/ats-testing.c:72 +msgid "Benchmarking done\n" +msgstr "Benchmark completato\n" + +#: src/ats-tests/ats-testing.c:105 +#, fuzzy, c-format +#| msgid "Failed to create statistics!\n" +msgid "Failed to connect peer 0 and %u\n" +msgstr "Generazione statistiche fallita\n" + +#: src/ats-tests/ats-testing.c:413 #, c-format msgid "Connected master [%u] with slave [%u]\n" msgstr "" -#: src/ats-tests/ats-testing.c:429 +#: src/ats-tests/ats-testing.c:419 #, c-format msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "" -#: src/ats-tests/ats-testing-log.c:837 -msgid "Stop logging\n" +#: src/ats-tests/ats-testing.c:450 +msgid "Connecting peers on CORE level\n" msgstr "" -#: src/ats-tests/ats-testing-log.c:892 +#: src/ats-tests/ats-testing.c:461 #, c-format -msgid "Start logging `%s'\n" +msgid "Connecting master [%u] with slave [%u]\n" msgstr "" -#: src/ats-tests/gnunet-ats-sim.c:90 +#: src/ats-tests/ats-testing.c:470 #, c-format -msgid "" -"Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. " -"= %u KiB/s\n" +msgid "Could not connect master [%u] and slave [%u]\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:307 -#, c-format -msgid "%u address resolutions had a timeout\n" +#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:671 +msgid "Initialization failed, shutdown\n" +msgstr "" + +#: src/ats-tests/ats-testing-log.c:842 +msgid "Stop logging\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:311 +#: src/ats-tests/ats-testing-log.c:893 #, c-format -msgid "ATS returned stat_results for %u addresses\n" +msgid "Start logging `%s'\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:395 +#: src/ats-tests/gnunet-ats-sim.c:86 #, c-format -msgid "" -"Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/" -"s, %s\n" +msgid "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. = %u KiB/s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:402 -msgid "active " +#: src/ats-tool/gnunet-ats.c:169 +#, c-format +msgid "%u address resolutions had a timeout\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:402 -msgid "inactive " +#: src/ats-tool/gnunet-ats.c:171 +#, c-format +msgid "ATS returned results for %u addresses\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:512 +#: src/ats-tool/gnunet-ats.c:232 #, c-format -msgid "Removed address of peer `%s' with plugin `%s'\n" +msgid "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/s, %s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:705 +#: src/ats-tool/gnunet-ats.c:413 #, c-format msgid "Quota for network `%11s' (in/out): %10s / %10s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761 +#: src/ats-tool/gnunet-ats.c:433 src/core/gnunet-core.c:163 +#: src/namestore/gnunet-namestore.c:550 src/transport/gnunet-transport.c:1246 +#, c-format +msgid "Service `%s' is not running\n" +msgstr "" + +#: src/ats-tool/gnunet-ats.c:445 src/transport/gnunet-transport.c:1255 #, c-format msgid "Failed to parse peer identity `%s'\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:773 +#: src/ats-tool/gnunet-ats.c:454 #, c-format -msgid "Please select one operation: %s or %s or %s or %s or %s\n" +msgid "Please select one operation : %s or %s or %s or %s or %s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820 -#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896 +#: src/ats-tool/gnunet-ats.c:470 src/ats-tool/gnunet-ats.c:489 +#: src/ats-tool/gnunet-ats.c:506 src/ats-tool/gnunet-ats.c:543 +#, c-format msgid "Cannot connect to ATS service, exiting...\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832 +#: src/ats-tool/gnunet-ats.c:478 src/ats-tool/gnunet-ats.c:495 +#, c-format msgid "Cannot issue request to ATS service, exiting...\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:862 +#: src/ats-tool/gnunet-ats.c:515 +#, c-format msgid "No preference type given!\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:869 +#: src/ats-tool/gnunet-ats.c:520 +#, c-format msgid "No peer given!\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:887 +#: src/ats-tool/gnunet-ats.c:536 msgid "Valid type required\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:950 +#: src/ats-tool/gnunet-ats.c:594 msgid "get list of active addresses currently used" msgstr "" -#: src/ats-tool/gnunet-ats.c:954 +#: src/ats-tool/gnunet-ats.c:596 msgid "get list of all active addresses" msgstr "" -#: src/ats-tool/gnunet-ats.c:960 -msgid "connect to PEER" -msgstr "" - -#: src/ats-tool/gnunet-ats.c:964 +#: src/ats-tool/gnunet-ats.c:599 msgid "do not resolve IP addresses to hostnames" msgstr "" -#: src/ats-tool/gnunet-ats.c:969 +#: src/ats-tool/gnunet-ats.c:601 msgid "monitor mode" -msgstr "" +msgstr "modalità monitor" -#: src/ats-tool/gnunet-ats.c:974 +#: src/ats-tool/gnunet-ats.c:603 msgid "set preference for the given peer" msgstr "" -#: src/ats-tool/gnunet-ats.c:979 +#: src/ats-tool/gnunet-ats.c:605 msgid "print all configured quotas" msgstr "" -#: src/ats-tool/gnunet-ats.c:984 +#: src/ats-tool/gnunet-ats.c:607 msgid "peer id" -msgstr "" +msgstr "id nodo" -#: src/ats-tool/gnunet-ats.c:990 +#: src/ats-tool/gnunet-ats.c:610 msgid "preference type to set: latency | bandwidth" msgstr "" -#: src/ats-tool/gnunet-ats.c:996 +#: src/ats-tool/gnunet-ats.c:612 msgid "preference value" msgstr "" -#: src/ats-tool/gnunet-ats.c:1001 +#: src/ats-tool/gnunet-ats.c:615 msgid "verbose output (include ATS address properties)" msgstr "" -#: src/ats-tool/gnunet-ats.c:1011 +#: src/ats-tool/gnunet-ats.c:622 msgid "Print information about ATS state" msgstr "" -#: src/auction/gnunet-auction-create.c:163 -msgid "description of the item to be sold" -msgstr "" - -#: src/auction/gnunet-auction-create.c:169 -msgid "mapping of possible prices" -msgstr "" - -#: src/auction/gnunet-auction-create.c:175 -msgid "max duration per round" -msgstr "" - -#: src/auction/gnunet-auction-create.c:181 -msgid "duration until auction starts" -msgstr "" - -#: src/auction/gnunet-auction-create.c:186 -msgid "" -"number of items to sell\n" -"0 for first price auction\n" -">0 for vickrey/M+1st price auction" -msgstr "" - -#: src/auction/gnunet-auction-create.c:193 -msgid "public auction outcome" -msgstr "" - -#: src/auction/gnunet-auction-create.c:198 -msgid "keep running in foreground until auction completes" -msgstr "" - -#: src/auction/gnunet-auction-create.c:209 -msgid "create a new auction and start listening for bidders" -msgstr "" - -#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76 -#: src/conversation/gnunet-conversation-test.c:254 -#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76 -msgid "help text" -msgstr "" - -#: src/cadet/gnunet-cadet.c:631 -#, c-format -msgid "Invalid peer ID `%s'\n" -msgstr "" - -#: src/cadet/gnunet-cadet.c:718 -msgid "Extra arguments are not applicable in combination with this option.\n" -msgstr "" - -#: src/cadet/gnunet-cadet.c:795 -#, c-format -msgid "Invalid target `%s'\n" -msgstr "" - -#: src/cadet/gnunet-cadet.c:832 -msgid "No action requested\n" -msgstr "" - -#: src/cadet/gnunet-cadet.c:857 -msgid "Provide information about a particular connection" -msgstr "" - -#: src/cadet/gnunet-cadet.c:861 -msgid "Activate echo mode" -msgstr "" - -#: src/cadet/gnunet-cadet.c:866 -msgid "Listen for connections using a shared secret among sender and recipient" -msgstr "" - -#: src/cadet/gnunet-cadet.c:871 -msgid "Provide information about a patricular peer" -msgstr "" - -#: src/cadet/gnunet-cadet.c:875 -msgid "Provide information about all peers" -msgstr "" - -#: src/cadet/gnunet-cadet.c:879 -msgid "Provide information about all tunnels" -msgstr "" - -#: src/consensus/gnunet-consensus-profiler.c:523 -#: src/secretsharing/gnunet-secretsharing-profiler.c:610 +#: src/consensus/gnunet-consensus-profiler.c:437 +#: src/secretsharing/gnunet-secretsharing-profiler.c:535 msgid "number of peers in consensus" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:529 -msgid "" -"how many peers (random selection without replacement) receive one value?" +#: src/consensus/gnunet-consensus-profiler.c:440 +msgid "how many peers receive one value?" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:535 -#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439 -#: src/set/gnunet-set-profiler.c:462 +#: src/consensus/gnunet-consensus-profiler.c:443 +#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289 +#: src/set/gnunet-set-profiler.c:292 msgid "number of values" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:541 +#: src/consensus/gnunet-consensus-profiler.c:446 msgid "consensus timeout" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:548 +#: src/consensus/gnunet-consensus-profiler.c:449 msgid "delay until consensus starts" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:554 -#: src/set/gnunet-set-profiler.c:480 -msgid "write statistics to file" -msgstr "" - -#: src/consensus/gnunet-consensus-profiler.c:559 -msgid "distribute elements to a static subset of good peers" -msgstr "" - -#: src/consensus/gnunet-consensus-profiler.c:564 +#: src/consensus/gnunet-consensus-profiler.c:452 +#: src/secretsharing/gnunet-secretsharing-profiler.c:550 msgid "be more verbose (print received values)" msgstr "" -#: src/conversation/conversation_api.c:515 -#: src/conversation/conversation_api_call.c:494 +#: src/conversation/conversation_api.c:557 +#: src/conversation/conversation_api_call.c:470 msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" -#: src/conversation/gnunet-conversation.c:277 +#: src/conversation/gnunet-conversation.c:264 #, c-format -msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" +msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:302 +#: src/conversation/gnunet-conversation.c:286 #, c-format msgid "Call from `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:337 +#: src/conversation/gnunet-conversation.c:319 #, c-format msgid "Call from `%s' suspended by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:342 +#: src/conversation/gnunet-conversation.c:324 #, c-format msgid "Call from `%s' resumed by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:360 +#: src/conversation/gnunet-conversation.c:342 #, c-format msgid "Ego `%s' no longer available, phone is now down.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:375 +#: src/conversation/gnunet-conversation.c:356 msgid "Failed to setup phone (internal error)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:387 +#: src/conversation/gnunet-conversation.c:368 #, c-format -msgid "Phone active at `%s'. Type `/help' for a list of available commands\n" +msgid "Phone active on line %u. Type `/help' for a list of available commands\n" msgstr "" -#: src/conversation/gnunet-conversation.c:411 +#: src/conversation/gnunet-conversation.c:390 #, c-format msgid "Resolved address of `%s'. Now ringing other party.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:418 +#: src/conversation/gnunet-conversation.c:397 #, c-format msgid "Connection established to `%s'\n" msgstr "Connessione stabilita con `%s'\n" -#: src/conversation/gnunet-conversation.c:425 +#: src/conversation/gnunet-conversation.c:404 #, c-format msgid "Failed to resolve `%s'\n" msgstr "" -#: src/conversation/gnunet-conversation.c:433 -#, c-format -msgid "Call to `%s' terminated\n" +#: src/conversation/gnunet-conversation.c:411 +msgid "Call terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:442 +#: src/conversation/gnunet-conversation.c:417 #, c-format msgid "Connection to `%s' suspended (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:448 +#: src/conversation/gnunet-conversation.c:423 #, c-format msgid "Connection to `%s' resumed (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:453 +#: src/conversation/gnunet-conversation.c:428 msgid "Error with the call, restarting it\n" msgstr "" -#: src/conversation/gnunet-conversation.c:524 +#: src/conversation/gnunet-conversation.c:495 #, c-format msgid "Unknown command `%s'\n" msgstr "Comando `%s' sconosciuto.\n" -#: src/conversation/gnunet-conversation.c:540 -#: src/conversation/gnunet-conversation.c:554 +#: src/conversation/gnunet-conversation.c:511 +#: src/conversation/gnunet-conversation.c:525 #, c-format msgid "Ego `%s' not available\n" msgstr "" -#: src/conversation/gnunet-conversation.c:547 -#: src/conversation/gnunet-conversation.c:603 +#: src/conversation/gnunet-conversation.c:518 +#: src/conversation/gnunet-conversation.c:575 msgid "You are calling someone else already, hang up first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:562 -#: src/conversation/gnunet-conversation.c:616 +#: src/conversation/gnunet-conversation.c:533 +#: src/conversation/gnunet-conversation.c:588 #, c-format msgid "You are answering call from `%s', hang up or suspend that call first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:572 +#: src/conversation/gnunet-conversation.c:544 msgid "Call recipient missing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:627 +#: src/conversation/gnunet-conversation.c:599 msgid "There is no incoming call to accept here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:644 +#: src/conversation/gnunet-conversation.c:616 #, c-format msgid "There is no incoming call `%s' to accept right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:675 +#: src/conversation/gnunet-conversation.c:647 msgid "We currently do not have an address.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:699 +#: src/conversation/gnunet-conversation.c:670 #, c-format msgid "We are currently trying to locate the private key for the ego `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:704 +#: src/conversation/gnunet-conversation.c:675 #, c-format -msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n" +msgid "We are listening for incoming calls for ego `%s' on line %u.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:710 -#: src/conversation/gnunet-conversation.c:734 +#: src/conversation/gnunet-conversation.c:681 +#: src/conversation/gnunet-conversation.c:705 #, c-format msgid "You are having a conversation with `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:715 -msgid "" -"We had an internal error setting up our phone line. You can still make " -"calls.\n" +#: src/conversation/gnunet-conversation.c:686 +msgid "We had an internal error setting up our phone line. You can still make calls.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:724 +#: src/conversation/gnunet-conversation.c:695 #, c-format msgid "We are trying to find the network address to call `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:729 +#: src/conversation/gnunet-conversation.c:700 #, c-format -msgid "We are calling `%s', their phone should be ringing.\n" +msgid "We are calling `%s', his phone should be ringing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:748 +#: src/conversation/gnunet-conversation.c:719 msgid "Calls waiting:\n" msgstr "" -#: src/conversation/gnunet-conversation.c:754 +#: src/conversation/gnunet-conversation.c:725 #, c-format msgid "#%u: `%s'\n" msgstr "" -#: src/conversation/gnunet-conversation.c:783 -#: src/conversation/gnunet-conversation.c:798 +#: src/conversation/gnunet-conversation.c:753 +#: src/conversation/gnunet-conversation.c:768 msgid "There is no call that could be suspended right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:831 -#: src/conversation/gnunet-conversation.c:847 +#: src/conversation/gnunet-conversation.c:801 +#: src/conversation/gnunet-conversation.c:817 msgid "There is no call that could be resumed right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:854 +#: src/conversation/gnunet-conversation.c:824 #, c-format msgid "Already talking with `%s', cannot resume a call right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:863 +#: src/conversation/gnunet-conversation.c:833 msgid "There is no incoming call to resume here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:880 +#: src/conversation/gnunet-conversation.c:850 #, c-format msgid "There is no incoming call `%s' to resume right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:915 +#: src/conversation/gnunet-conversation.c:885 msgid "There is no call that could be cancelled right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:923 +#: src/conversation/gnunet-conversation.c:893 msgid "There is no incoming call to refuse here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:940 +#: src/conversation/gnunet-conversation.c:910 #, c-format msgid "There is no incoming call `%s' to refuse right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:966 +#: src/conversation/gnunet-conversation.c:937 msgid "Use `/address' to find out which address this phone should have in GNS" msgstr "" -#: src/conversation/gnunet-conversation.c:968 +#: src/conversation/gnunet-conversation.c:939 msgid "Use `/call USER.gnu' to call USER" msgstr "" -#: src/conversation/gnunet-conversation.c:970 +#: src/conversation/gnunet-conversation.c:941 msgid "Use `/accept #NUM' to accept incoming call #NUM" msgstr "" -#: src/conversation/gnunet-conversation.c:972 +#: src/conversation/gnunet-conversation.c:943 msgid "Use `/suspend' to suspend the active call" msgstr "" -#: src/conversation/gnunet-conversation.c:974 -msgid "" -"Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming " -"calls, no argument is needed to resume the current outgoing call." +#: src/conversation/gnunet-conversation.c:945 +msgid "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming calls, no argument is needed to resume the current outgoing call." msgstr "" -#: src/conversation/gnunet-conversation.c:976 +#: src/conversation/gnunet-conversation.c:947 msgid "Use `/cancel' to reject or terminate a call" msgstr "" -#: src/conversation/gnunet-conversation.c:978 +#: src/conversation/gnunet-conversation.c:949 msgid "Use `/status' to print status information" msgstr "" -#: src/conversation/gnunet-conversation.c:980 +#: src/conversation/gnunet-conversation.c:951 msgid "Use `/quit' to terminate gnunet-conversation" msgstr "" -#: src/conversation/gnunet-conversation.c:982 +#: src/conversation/gnunet-conversation.c:953 msgid "Use `/help command' to get help for a specific command" msgstr "" -#: src/conversation/gnunet-conversation.c:1198 +#: src/conversation/gnunet-conversation.c:1151 #, c-format msgid "Name of our ego changed to `%s'\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1211 +#: src/conversation/gnunet-conversation.c:1164 #, c-format msgid "Our ego `%s' was deleted!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1249 +#: src/conversation/gnunet-conversation.c:1199 msgid "You must specify the NAME of an ego to use\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1273 +#: src/conversation/gnunet-conversation.c:1223 msgid "Failed to start gnunet-helper-w32-console\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1302 -msgid "sets the NAME of the ego to use for the caller ID" +#: src/conversation/gnunet-conversation.c:1249 +msgid "sets the NAME of the ego to use for the phone (and name resolution)" msgstr "" -#: src/conversation/gnunet-conversation.c:1307 +#: src/conversation/gnunet-conversation.c:1252 msgid "sets the LINE to use for the phone" msgstr "" -#: src/conversation/gnunet-conversation.c:1336 +#: src/conversation/gnunet-conversation.c:1276 msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-conversation-test.c:120 +#: src/conversation/gnunet-conversation-test.c:121 #, c-format msgid "" "\n" "End of transmission. Have a GNU day.\n" msgstr "" -#: src/conversation/gnunet-conversation-test.c:145 +#: src/conversation/gnunet-conversation-test.c:149 #, c-format msgid "" "\n" -"We are now playing your recording back. If you can hear it, your audio " -"settings are working..." +"We are now playing your recording back. If you can hear it, your audio settings are working..." msgstr "" -#: src/conversation/gnunet-conversation-test.c:216 +#: src/conversation/gnunet-conversation-test.c:215 #, c-format -msgid "" -"We will now be recording you for %s. After that time, the recording will be " -"played back to you..." +msgid "We will now be recording you for %s. After that time, the recording will be played back to you..." msgstr "" -#: src/conversation/gnunet_gst.c:622 -#: src/conversation/gnunet-helper-audio-playback-gst.c:361 -#, c-format -msgid "Read error from STDIN: %d %s\n" +#: src/conversation/gnunet-conversation-test.c:248 +#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522 +#: src/template/gnunet-template.c:70 +msgid "help text" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:325 +#: src/conversation/gnunet-helper-audio-playback.c:305 #, c-format msgid "pa_stream_write() failed: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:627 +#: src/conversation/gnunet-helper-audio-playback.c:587 msgid "gnunet-helper-audio-playback - Got signal, exiting\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:653 -#: src/conversation/gnunet-helper-audio-record.c:563 +#: src/conversation/gnunet-helper-audio-playback.c:612 +#: src/conversation/gnunet-helper-audio-record.c:545 msgid "Connection established.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:658 -#: src/conversation/gnunet-helper-audio-record.c:568 +#: src/conversation/gnunet-helper-audio-playback.c:617 +#: src/conversation/gnunet-helper-audio-record.c:550 #, c-format msgid "pa_stream_new() failed: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:672 +#: src/conversation/gnunet-helper-audio-playback.c:631 #, c-format msgid "pa_stream_connect_playback() failed: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:685 -#: src/conversation/gnunet-helper-audio-record.c:594 +#: src/conversation/gnunet-helper-audio-playback.c:644 +#: src/conversation/gnunet-helper-audio-record.c:576 #, c-format msgid "Connection failure: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:706 -#: src/conversation/gnunet-helper-audio-record.c:617 +#: src/conversation/gnunet-helper-audio-playback.c:665 +#: src/conversation/gnunet-helper-audio-record.c:599 msgid "Wrong Spec\n" -msgstr "" +msgstr "Specifiche errate\n" -#: src/conversation/gnunet-helper-audio-playback.c:712 -#: src/conversation/gnunet-helper-audio-record.c:623 +#: src/conversation/gnunet-helper-audio-playback.c:671 +#: src/conversation/gnunet-helper-audio-record.c:605 msgid "pa_mainloop_new() failed.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:726 -#: src/conversation/gnunet-helper-audio-record.c:638 +#: src/conversation/gnunet-helper-audio-playback.c:685 +#: src/conversation/gnunet-helper-audio-record.c:620 msgid "pa_context_new() failed.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:733 -#: src/conversation/gnunet-helper-audio-record.c:644 +#: src/conversation/gnunet-helper-audio-playback.c:692 +#: src/conversation/gnunet-helper-audio-record.c:626 #, c-format msgid "pa_context_connect() failed: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:739 -#: src/conversation/gnunet-helper-audio-record.c:650 +#: src/conversation/gnunet-helper-audio-playback.c:698 +#: src/conversation/gnunet-helper-audio-record.c:632 msgid "pa_mainloop_run() failed.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:818 +#: src/conversation/gnunet-helper-audio-playback.c:768 #, c-format msgid "Read error from STDIN: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:353 +#: src/conversation/gnunet-helper-audio-playback-gst.c:325 +#, c-format +msgid "Read error from STDIN: %d %s\n" +msgstr "" + +#: src/conversation/gnunet-helper-audio-record.c:344 #, c-format msgid "opus_encode_float() failed: %s. Aborting\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:432 +#: src/conversation/gnunet-helper-audio-record.c:420 #, c-format msgid "pa_stream_peek() failed: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:474 +#: src/conversation/gnunet-helper-audio-record.c:458 msgid "Got signal, exiting.\n" msgstr "Segnale ricevuto. Uscita in corso.\n" -#: src/conversation/gnunet-helper-audio-record.c:500 +#: src/conversation/gnunet-helper-audio-record.c:483 msgid "Stream successfully created.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:505 +#: src/conversation/gnunet-helper-audio-record.c:488 #, c-format msgid "pa_stream_get_buffer_attr() failed: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:513 +#: src/conversation/gnunet-helper-audio-record.c:496 #, c-format msgid "Buffer metrics: maxlength=%u, fragsize=%u\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:517 +#: src/conversation/gnunet-helper-audio-record.c:500 #, c-format msgid "Using sample spec '%s', channel map '%s'.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:524 +#: src/conversation/gnunet-helper-audio-record.c:507 #, c-format msgid "Connected to device %s (%u, %ssuspended).\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:533 +#: src/conversation/gnunet-helper-audio-record.c:516 #, c-format msgid "Stream error: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:581 +#: src/conversation/gnunet-helper-audio-record.c:563 #, c-format msgid "pa_stream_connect_record() failed: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:695 +#: src/conversation/gnunet-helper-audio-record.c:676 msgid "ogg_stream_init() failed.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:740 +#: src/conversation/gnunet-helper-audio-record.c:721 +#, fuzzy, c-format +#| msgid "Failed to create statistics!\n" +msgid "Failed to allocate %d bytes for second packet\n" +msgstr "Generazione statistiche fallita\n" + +#: src/conversation/gnunet-service-conversation.c:841 +msgid "Mesh audio channel not ready; audio data dropped\n" +msgstr "" + +#: src/conversation/gnunet-service-conversation.c:932 #, c-format -msgid "Failed to allocate %u bytes for second packet\n" +msgid "No available phone for incoming call on line %u, sending HANG_UP signal\n" msgstr "" -#: src/conversation/gnunet-service-conversation.c:1305 +#: src/conversation/gnunet-service-conversation.c:1338 #, c-format -msgid "Could not open line, port %s already in use!\n" +msgid "Received incoming channel on port %u\n" msgstr "" #: src/conversation/microphone.c:121 msgid "Could not start record audio helper\n" msgstr "" -#: src/conversation/plugin_gnsrecord_conversation.c:72 -#, c-format -msgid "PHONE version %u not supported\n" -msgstr "" - -#: src/conversation/plugin_gnsrecord_conversation.c:135 -#: src/conversation/plugin_gnsrecord_conversation.c:149 +#: src/conversation/plugin_gnsrecord_conversation.c:116 #, c-format msgid "Unable to parse PHONE record `%s'\n" msgstr "" @@ -1302,676 +1071,659 @@ msgstr "" msgid "Could not start playback audio helper.\n" msgstr "" -#: src/core/gnunet-core.c:90 -#, fuzzy -msgid "fresh connection" -msgstr "# connessioni attive" - -#: src/core/gnunet-core.c:93 -msgid "key sent" -msgstr "" - -#: src/core/gnunet-core.c:96 -msgid "key received" -msgstr "" - -#: src/core/gnunet-core.c:99 -#, fuzzy -msgid "connection established" -msgstr "Connessione stabilita con `%s'\n" - -#: src/core/gnunet-core.c:102 -msgid "rekeying" +#: src/core/core_api.c:767 +msgid "Client was disconnected from core service, trying to reconnect.\n" msgstr "" -#: src/core/gnunet-core.c:105 -msgid "disconnected" -msgstr "" +#: src/core/gnunet-core.c:80 +#, c-format +msgid "Peer `%s'\n" +msgstr "Peer `%s'\n" -#: src/core/gnunet-core.c:112 -msgid "Connection to CORE service lost (reconnecting)" +#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138 +#: src/transport/gnunet-transport.c:910 src/transport/gnunet-transport.c:930 +#, c-format +msgid "%24s: %-17s %4s (%u connections in total)\n" msgstr "" -#: src/core/gnunet-core.c:115 -#, fuzzy -msgid "unknown state" -msgstr "indirizzo sconosciuto" +#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:911 +msgid "Connected to" +msgstr "Connesso a" -#: src/core/gnunet-core.c:120 -#, c-format -msgid "%24s: %-30s %4s (timeout in %6s)\n" -msgstr "" +#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:931 +msgid "Disconnected from" +msgstr "Disconnesso da" -#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728 +#: src/core/gnunet-core.c:211 src/peerinfo-tool/gnunet-peerinfo.c:694 #, c-format msgid "Invalid command line argument `%s'\n" msgstr "" -#: src/core/gnunet-core.c:155 -msgid "Failed to connect to CORE service!\n" -msgstr "" - -#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449 +#: src/core/gnunet-core.c:233 src/transport/gnunet-transport.c:1486 msgid "provide information about all current connections (continuously)" msgstr "" -#: src/core/gnunet-core.c:186 +#: src/core/gnunet-core.c:244 msgid "Print information about connected peers." msgstr "" -#: src/core/gnunet-service-core.c:347 -msgid "# send requests dropped (disconnected)" +#: src/core/gnunet-service-core.c:105 +msgid "Core service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "" -#: src/core/gnunet-service-core.c:371 -msgid "# dequeuing CAR (duplicate request)" -msgstr "" +#: src/core/gnunet-service-core.c:126 +#, fuzzy, c-format +#| msgid "Starting service `%s'\n" +msgid "Core service of `%4s' ready.\n" +msgstr "Avvio del servizio '%s' in corso\n" -#: src/core/gnunet-service-core.c:443 -#, c-format -msgid "# bytes of messages of type %u received" +#: src/core/gnunet-service-core_clients.c:370 +msgid "# send requests dropped (disconnected)" msgstr "" -#: src/core/gnunet-service-core.c:541 +#: src/core/gnunet-service-core_clients.c:480 msgid "# messages discarded (session disconnected)" msgstr "" -#: src/core/gnunet-service-core.c:879 +#: src/core/gnunet-service-core_clients.c:526 #, c-format -msgid "# messages of type %u discarded (client busy)" -msgstr "" - -#: src/core/gnunet-service-core.c:988 -msgid "Core service is lacking HOSTKEY configuration setting. Exiting.\n" +msgid "# bytes of messages of type %u received" msgstr "" -#: src/core/gnunet-service-core.c:1009 -#, fuzzy, c-format -msgid "Core service of `%s' ready.\n" -msgstr "Avvio del servizio '%s' in corso\n" - -#: src/core/gnunet-service-core_kx.c:617 +#: src/core/gnunet-service-core_kx.c:535 msgid "# bytes encrypted" msgstr "# byte crittografati" -#: src/core/gnunet-service-core_kx.c:677 +#: src/core/gnunet-service-core_kx.c:586 msgid "# bytes decrypted" -msgstr "" - -#: src/core/gnunet-service-core_kx.c:779 -msgid "# PAYLOAD dropped (out of order)" -msgstr "" +msgstr "# byte decrittati" -#: src/core/gnunet-service-core_kx.c:829 +#: src/core/gnunet-service-core_kx.c:673 msgid "# key exchanges initiated" msgstr "" -#: src/core/gnunet-service-core_kx.c:891 +#: src/core/gnunet-service-core_kx.c:713 msgid "# key exchanges stopped" msgstr "" -#: src/core/gnunet-service-core_kx.c:925 -#, fuzzy -msgid "# PING messages transmitted" -msgstr "# messaggi PONG ricevuti" - -#: src/core/gnunet-service-core_kx.c:992 +#: src/core/gnunet-service-core_kx.c:810 msgid "# old ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:1005 -msgid "# duplicate ephemeral keys ignored" -msgstr "" - -#: src/core/gnunet-service-core_kx.c:1040 -msgid "# EPHEMERAL_KEYs rejected (bad signature)" -msgstr "" +#: src/core/gnunet-service-core_kx.c:816 +#, fuzzy +#| msgid "# PONG messages received" +msgid "# ephemeral keys received" +msgstr "# messaggi PONG ricevuti" -#: src/core/gnunet-service-core_kx.c:1054 +#: src/core/gnunet-service-core_kx.c:850 #, c-format -msgid "" -"EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match " -"our system time (%llu not in [%llu,%llu]).\n" -msgstr "" - -#: src/core/gnunet-service-core_kx.c:1060 -msgid "# EPHEMERAL_KEY messages rejected due to time" +msgid "Ephemeral key message from peer `%s' rejected as its validity range does not match our system time (%llu not in [%llu,%llu]).\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1080 +#: src/core/gnunet-service-core_kx.c:861 #, fuzzy -msgid "# valid ephemeral keys received" -msgstr "# messaggi PONG ricevuti" +#| msgid "# SYN messages received" +msgid "# EPHEMERAL_KEY messages received" +msgstr "# messaggi SYN ricevuti" -#: src/core/gnunet-service-core_kx.c:1180 -#: src/transport/gnunet-service-transport_validation.c:1129 +#: src/core/gnunet-service-core_kx.c:951 +#: src/transport/gnunet-service-transport_validation.c:1016 msgid "# PING messages received" msgstr "" -#: src/core/gnunet-service-core_kx.c:1189 +#: src/core/gnunet-service-core_kx.c:959 msgid "# PING messages dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1248 +#: src/core/gnunet-service-core_kx.c:986 +#, c-format +msgid "Received PING from `%s' for different identity: I am `%s', PONG identity: `%s'\n" +msgstr "" + +#: src/core/gnunet-service-core_kx.c:1003 msgid "# PONG messages created" msgstr "" -#: src/core/gnunet-service-core_kx.c:1274 +#: src/core/gnunet-service-core_kx.c:1029 msgid "# sessions terminated by timeout" msgstr "" -#: src/core/gnunet-service-core_kx.c:1287 +#: src/core/gnunet-service-core_kx.c:1039 msgid "# keepalive messages sent" msgstr "" -#: src/core/gnunet-service-core_kx.c:1351 -#: src/transport/gnunet-service-transport_validation.c:1462 +#: src/core/gnunet-service-core_kx.c:1096 +#: src/transport/gnunet-service-transport_validation.c:1328 msgid "# PONG messages received" msgstr "# messaggi PONG ricevuti" -#: src/core/gnunet-service-core_kx.c:1358 +#: src/core/gnunet-service-core_kx.c:1102 msgid "# PONG messages dropped (connection down)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1363 +#: src/core/gnunet-service-core_kx.c:1107 msgid "# PONG messages dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1398 +#: src/core/gnunet-service-core_kx.c:1137 msgid "# PONG messages decrypted" msgstr "# messaggi PONG decrittati" -#: src/core/gnunet-service-core_kx.c:1436 +#: src/core/gnunet-service-core_kx.c:1171 msgid "# session keys confirmed via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1447 +#: src/core/gnunet-service-core_kx.c:1181 msgid "# timeouts prevented via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1454 +#: src/core/gnunet-service-core_kx.c:1188 msgid "# rekey operations confirmed via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1642 +#: src/core/gnunet-service-core_kx.c:1328 msgid "# DATA message dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1650 +#: src/core/gnunet-service-core_kx.c:1335 #, c-format -msgid "" -"Session to peer `%s' went down due to key expiration (should not happen)\n" +msgid "Session to peer `%s' went down due to key expiration (should not happen)\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1653 +#: src/core/gnunet-service-core_kx.c:1338 msgid "# sessions terminated by key expiration" msgstr "" -#: src/core/gnunet-service-core_kx.c:1742 -#: src/core/gnunet-service-core_kx.c:1768 +#: src/core/gnunet-service-core_kx.c:1383 +#: src/core/gnunet-service-core_kx.c:1408 msgid "# bytes dropped (duplicates)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1755 +#: src/core/gnunet-service-core_kx.c:1395 msgid "# bytes dropped (out of sequence)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1797 +#: src/core/gnunet-service-core_kx.c:1437 msgid "# bytes dropped (ancient message)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1805 +#: src/core/gnunet-service-core_kx.c:1445 msgid "# bytes of payload decrypted" msgstr "" -#: src/core/gnunet-service-core_sessions.c:260 -#: src/core/gnunet-service-core_sessions.c:350 -#: src/dht/gnunet-service-dht_neighbours.c:741 -#: src/dht/gnunet-service-dht_neighbours.c:804 -#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1521 -#: src/topology/gnunet-daemon-topology.c:617 -#: src/topology/gnunet-daemon-topology.c:719 -#: src/transport/gnunet-service-transport_neighbours.c:720 -#: src/transport/gnunet-service-transport_neighbours.c:728 -msgid "# peers connected" +#: src/core/gnunet-service-core_kx.c:1480 +msgid "# PAYLOAD dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_sessions.c:296 -msgid "# type map refreshes sent" +#: src/core/gnunet-service-core_neighbours.c:168 +msgid "# sessions terminated by transport disconnect" +msgstr "" + +#: src/core/gnunet-service-core_neighbours.c:184 +#: src/core/gnunet-service-core_neighbours.c:335 +msgid "# neighbour entries allocated" +msgstr "" + +#: src/core/gnunet-service-core_neighbours.c:252 +msgid "# encrypted bytes given to transport" +msgstr "" + +#: src/core/gnunet-service-core_neighbours.c:418 +#, c-format +msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n" msgstr "" -#: src/core/gnunet-service-core_sessions.c:416 -msgid "# outdated typemap confirmations received" +#: src/core/gnunet-service-core_sessions.c:216 +#: src/core/gnunet-service-core_sessions.c:288 +#: src/dht/gnunet-service-dht_neighbours.c:662 +#: src/dht/gnunet-service-dht_neighbours.c:727 +#: src/dht/gnunet-service-xdht_neighbours.c:1304 +#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501 +#: src/topology/gnunet-daemon-topology.c:707 +#: src/topology/gnunet-daemon-topology.c:808 +#: src/transport/gnunet-service-transport_neighbours.c:917 +#: src/transport/gnunet-service-transport_neighbours.c:1141 +#: src/transport/gnunet-service-transport_neighbours.c:3142 +#: src/transport/gnunet-service-transport_neighbours.c:3438 +msgid "# peers connected" +msgstr "# nodi connessi" + +#: src/core/gnunet-service-core_sessions.c:255 +msgid "# type map refreshes sent" msgstr "" -#: src/core/gnunet-service-core_sessions.c:433 -msgid "# valid typemap confirmations received" +#: src/core/gnunet-service-core_sessions.c:426 +msgid "# messages discarded (expired prior to transmission)" msgstr "" -#: src/core/gnunet-service-core_typemap.c:169 -#: src/core/gnunet-service-core_typemap.c:181 +#: src/core/gnunet-service-core_typemap.c:110 +#: src/core/gnunet-service-core_typemap.c:121 msgid "# type maps received" msgstr "" -#: src/core/gnunet-service-core_typemap.c:212 +#: src/core/gnunet-service-core_typemap.c:151 msgid "# updates to my type map" msgstr "" -#: src/datacache/datacache.c:119 src/datacache/datacache.c:311 -#: src/datastore/gnunet-service-datastore.c:757 +#: src/datacache/datacache.c:115 src/datacache/datacache.c:266 +#: src/datastore/gnunet-service-datastore.c:838 msgid "# bytes stored" msgstr "" -#: src/datacache/datacache.c:123 src/datacache/datacache.c:315 +#: src/datacache/datacache.c:117 src/datacache/datacache.c:268 msgid "# items stored" msgstr "# elementi memorizzati" -#: src/datacache/datacache.c:206 +#: src/datacache/datacache.c:143 src/datacache/datacache.c:150 +#: src/datastore/gnunet-service-datastore.c:1487 +#: src/datastore/gnunet-service-datastore.c:1498 +#, c-format +msgid "No `%s' specified for `%s' in configuration!\n" +msgstr "" + +#: src/datacache/datacache.c:184 #, c-format msgid "Loading `%s' datacache plugin\n" msgstr "" -#: src/datacache/datacache.c:217 +#: src/datacache/datacache.c:192 #, c-format msgid "Failed to load datacache plugin for `%s'\n" msgstr "" -#: src/datacache/datacache.c:345 +#: src/datacache/datacache.c:295 msgid "# requests received" msgstr "" -#: src/datacache/datacache.c:355 +#: src/datacache/datacache.c:304 msgid "# requests filtered by bloom filter" msgstr "" -#: src/datacache/datacache.c:385 -msgid "# requests for random value received" -msgstr "" - -#: src/datacache/datacache.c:417 -msgid "# proximity search requests received" +#: src/datacache/plugin_datacache_heap.c:406 +msgid "Heap datacache running\n" msgstr "" -#: src/datacache/plugin_datacache_heap.c:553 -msgid "Heap datacache running\n" +#: src/datacache/plugin_datacache_postgres.c:392 +msgid "Postgres datacache running\n" msgstr "" -#: src/datacache/plugin_datacache_sqlite.c:118 -#: src/datacache/plugin_datacache_sqlite.c:127 -#: src/datastore/plugin_datastore_mysql.c:892 -#: src/datastore/plugin_datastore_sqlite.c:58 -#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:81 src/my/my.c:93 -#: src/mysql/mysql.c:42 src/mysql/mysql.c:49 +#: src/datacache/plugin_datacache_sqlite.c:69 +#: src/datacache/plugin_datacache_sqlite.c:72 +#: src/datastore/plugin_datastore_mysql.c:806 +#: src/datastore/plugin_datastore_mysql.c:820 +#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41 +#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531 +#: src/mysql/mysql.c:591 src/mysql/mysql.c:607 +#: src/namecache/plugin_namecache_postgres.c:52 #: src/namecache/plugin_namecache_sqlite.c:52 -#: src/namestore/plugin_namestore_sqlite.c:53 -#: src/peerstore/plugin_peerstore_sqlite.c:52 +#: src/namestore/plugin_namestore_postgres.c:52 +#: src/namestore/plugin_namestore_sqlite.c:52 #: src/testbed/generate-underlay-topology.c:47 #: src/testbed/gnunet-daemon-latency-logger.c:52 -#: src/testbed/gnunet-daemon-testbed-underlay.c:56 -#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53 -#: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39 -#: src/include/gnunet_common.h:840 src/include/gnunet_common.h:849 -#: src/scalarproduct/scalarproduct.h:35 +#: src/testbed/gnunet-daemon-testbed-underlay.c:55 +#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51 +#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602 +#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:50 #, c-format msgid "`%s' failed at %s:%d with error: %s\n" msgstr "" -#: src/datacache/plugin_datacache_sqlite.c:863 -#: src/datastore/plugin_datastore_sqlite.c:508 -#: src/namecache/plugin_namecache_sqlite.c:229 -#: src/namestore/plugin_namestore_sqlite.c:265 -msgid "Tried to close sqlite without finalizing all prepared statements.\n" +#: src/datacache/plugin_datacache_sqlite.c:450 +msgid "Sqlite datacache running\n" msgstr "" -#: src/datastore/datastore_api.c:348 -msgid "DATASTORE disconnected" +#: src/datacache/plugin_datacache_sqlite.c:484 +#: src/datastore/plugin_datastore_sqlite.c:404 +#: src/namecache/plugin_namecache_sqlite.c:295 +#: src/namestore/plugin_namestore_sqlite.c:327 +msgid "Tried to close sqlite without finalizing all prepared statements.\n" msgstr "" -#: src/datastore/datastore_api.c:468 -msgid "Disconnected from DATASTORE" +#: src/datacache/plugin_datacache_sqlite.c:491 +#, fuzzy, c-format +#| msgid "Failed to start service `%s'\n" +msgid "Failed to close statement %p: %d\n" +msgstr "Impossibile avviare il servizio ' %s'\n" + +#: src/datacache/plugin_datacache_template.c:125 +msgid "Template datacache running\n" msgstr "" -#: src/datastore/datastore_api.c:569 +#: src/datastore/datastore_api.c:310 +#, fuzzy +#| msgid "Failed to create statistics!\n" +msgid "Failed to transmit request to drop database.\n" +msgstr "Generazione statistiche fallita\n" + +#: src/datastore/datastore_api.c:394 +#, fuzzy +#| msgid "Request timed out" +msgid "# queue entry timeouts" +msgstr "Richiesta scaduta" + +#: src/datastore/datastore_api.c:443 msgid "# queue overflows" msgstr "" -#: src/datastore/datastore_api.c:599 +#: src/datastore/datastore_api.c:471 msgid "# queue entries created" msgstr "" -#: src/datastore/datastore_api.c:760 -msgid "# status messages received" -msgstr "" - -#: src/datastore/datastore_api.c:814 -msgid "# Results received" +#: src/datastore/datastore_api.c:491 +msgid "# Requests dropped from datastore queue" msgstr "" -#: src/datastore/datastore_api.c:920 +#: src/datastore/datastore_api.c:533 msgid "# datastore connections (re)created" msgstr "" -#: src/datastore/datastore_api.c:1034 -msgid "# PUT requests executed" +#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279 +msgid "# transmission request failures" msgstr "" -#: src/datastore/datastore_api.c:1095 -msgid "# RESERVE requests executed" -msgstr "" +#: src/datastore/datastore_api.c:638 +#, fuzzy +#| msgid "# bytes sent via SMTP" +msgid "# bytes sent to datastore" +msgstr "# byte inviati via SMTP" -#: src/datastore/datastore_api.c:1160 -msgid "# RELEASE RESERVE requests executed" +#: src/datastore/datastore_api.c:770 +msgid "Failed to receive status response from database." msgstr "" -#: src/datastore/datastore_api.c:1238 -msgid "# REMOVE requests executed" -msgstr "" +#: src/datastore/datastore_api.c:784 +#, fuzzy +#| msgid "Error reading from `%s': %s\n" +msgid "Error reading response from datastore service" +msgstr "Errore di lettura da '%s': %s\n" -#: src/datastore/datastore_api.c:1298 -msgid "# GET REPLICATION requests executed" +#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802 +msgid "Invalid error message received from datastore service" msgstr "" -#: src/datastore/datastore_api.c:1360 -msgid "# GET ZERO ANONYMITY requests executed" +#: src/datastore/datastore_api.c:806 +msgid "# status messages received" msgstr "" -#: src/datastore/datastore_api.c:1441 -msgid "# GET requests executed" +#: src/datastore/datastore_api.c:876 +msgid "# PUT requests executed" msgstr "" -#: src/datastore/gnunet-datastore.c:189 -#, c-format -msgid "Dumped % records\n" +#: src/datastore/datastore_api.c:944 +msgid "# RESERVE requests executed" msgstr "" -#: src/datastore/gnunet-datastore.c:217 src/datastore/gnunet-datastore.c:229 -#, c-format -msgid "Short write to file: %zd bytes expecting %zd\n" +#: src/datastore/datastore_api.c:1005 +msgid "# RELEASE RESERVE requests executed" msgstr "" -#: src/datastore/gnunet-datastore.c:261 -msgid "Error queueing datastore GET operation\n" -msgstr "" +#: src/datastore/datastore_api.c:1065 +msgid "# UPDATE requests executed" +msgstr "# richieste UPDATE eseguite" -#: src/datastore/gnunet-datastore.c:287 src/datastore/gnunet-datastore.c:412 -#, c-format -msgid "Unable to open dump file: %s\n" +#: src/datastore/datastore_api.c:1129 +msgid "# REMOVE requests executed" msgstr "" -#: src/datastore/gnunet-datastore.c:326 -#, c-format -msgid "Failed to store item: %s, aborting\n" -msgstr "" +#: src/datastore/datastore_api.c:1174 +#, fuzzy +#| msgid "Failed to create statistics!\n" +msgid "Failed to receive response from database.\n" +msgstr "Generazione statistiche fallita\n" -#: src/datastore/gnunet-datastore.c:340 -#, c-format -msgid "Inserted % records\n" +#: src/datastore/datastore_api.c:1233 +msgid "# Results received" msgstr "" -#: src/datastore/gnunet-datastore.c:349 src/datastore/gnunet-datastore.c:363 -#, c-format -msgid "Short read from file: %zd bytes expecting %zd\n" +#: src/datastore/datastore_api.c:1300 +msgid "# GET REPLICATION requests executed" msgstr "" -#: src/datastore/gnunet-datastore.c:389 -msgid "Error queueing datastore PUT operation\n" +#: src/datastore/datastore_api.c:1363 +msgid "# GET ZERO ANONYMITY requests executed" msgstr "" -#: src/datastore/gnunet-datastore.c:432 -msgid "Input file is not of a supported format\n" +#: src/datastore/datastore_api.c:1424 +msgid "# GET requests executed" msgstr "" -#: src/datastore/gnunet-datastore.c:458 -msgid "Failed connecting to the datastore.\n" +#: src/datastore/gnunet-datastore.c:114 +#, c-format +msgid "Failed to store item: %s, aborting\n" msgstr "" -#: src/datastore/gnunet-datastore.c:470 +#: src/datastore/gnunet-datastore.c:200 #, c-format -msgid "Please choose at least one operation: %s, %s\n" +msgid "Cannot use the same configuration for source and destination\n" msgstr "" -#: src/datastore/gnunet-datastore.c:493 -msgid "Dump all records from the datastore" +#: src/datastore/gnunet-datastore.c:246 +msgid "specifies the configuration to use to access an alternative datastore; will merge that datastore into our current datastore" msgstr "" -#: src/datastore/gnunet-datastore.c:497 -msgid "Insert records into the datastore" +#: src/datastore/gnunet-datastore.c:255 +msgid "Manipulate GNUnet datastore" msgstr "" -#: src/datastore/gnunet-datastore.c:502 -msgid "File to dump or insert" -msgstr "" +#: src/datastore/gnunet-service-datastore.c:351 +msgid "# bytes expired" +msgstr "# byte scaduti" -#: src/datastore/gnunet-datastore.c:511 -msgid "Manipulate GNUnet datastore" +#: src/datastore/gnunet-service-datastore.c:425 +msgid "# bytes purged (low-priority)" msgstr "" -#: src/datastore/gnunet-service-datastore.c:338 -msgid "# bytes expired" +#: src/datastore/gnunet-service-datastore.c:483 +#: src/gns/gnunet-gns-helper-service-w32.c:223 +msgid "Transmission to client failed!\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:420 -msgid "# bytes purged (low-priority)" +#: src/datastore/gnunet-service-datastore.c:514 +#: src/gns/gnunet-gns-helper-service-w32.c:262 +msgid "Shutdown in progress, aborting transmission.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:562 +#: src/datastore/gnunet-service-datastore.c:630 msgid "# results found" msgstr "" -#: src/datastore/gnunet-service-datastore.c:603 +#: src/datastore/gnunet-service-datastore.c:673 #, c-format -msgid "" -"Insufficient space (%llu bytes are available) to satisfy RESERVE request for " -"%llu bytes\n" +msgid "Insufficient space (%llu bytes are available) to satisfy `%s' request for %llu bytes\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:614 +#: src/datastore/gnunet-service-datastore.c:684 #, c-format -msgid "" -"The requested amount (%llu bytes) is larger than the cache size (%llu " -"bytes)\n" +msgid "The requested amount (%llu bytes) is larger than the cache size (%llu bytes)\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:620 -msgid "" -"Insufficient space to satisfy request and requested amount is larger than " -"cache size" +#: src/datastore/gnunet-service-datastore.c:688 +msgid "Insufficient space to satisfy request and requested amount is larger than cache size" msgstr "" -#: src/datastore/gnunet-service-datastore.c:627 +#: src/datastore/gnunet-service-datastore.c:694 msgid "Insufficient space to satisfy request" msgstr "" -#: src/datastore/gnunet-service-datastore.c:634 -#: src/datastore/gnunet-service-datastore.c:689 -#: src/datastore/gnunet-service-datastore.c:837 -#: src/datastore/gnunet-service-datastore.c:1469 +#: src/datastore/gnunet-service-datastore.c:699 +#: src/datastore/gnunet-service-datastore.c:751 +#: src/datastore/gnunet-service-datastore.c:964 +#: src/datastore/gnunet-service-datastore.c:1421 msgid "# reserved" msgstr "" -#: src/datastore/gnunet-service-datastore.c:707 +#: src/datastore/gnunet-service-datastore.c:764 msgid "Could not find matching reservation" msgstr "" -#: src/datastore/gnunet-service-datastore.c:773 +#: src/datastore/gnunet-service-datastore.c:850 #, c-format msgid "Need %llu bytes more space (%llu allowed, using %llu)\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:876 +#: src/datastore/gnunet-service-datastore.c:1010 msgid "# GET requests received" -msgstr "" - -#: src/datastore/gnunet-service-datastore.c:907 -#, fuzzy -msgid "# GET KEY requests received" -msgstr "# messaggi PONG ricevuti" +msgstr "# richieste GET ricevute" -#: src/datastore/gnunet-service-datastore.c:920 +#: src/datastore/gnunet-service-datastore.c:1022 msgid "# requests filtered by bloomfilter" msgstr "" -#: src/datastore/gnunet-service-datastore.c:956 +#: src/datastore/gnunet-service-datastore.c:1050 +msgid "# UPDATE requests received" +msgstr "# richieste UPDATE ricevute" + +#: src/datastore/gnunet-service-datastore.c:1080 msgid "# GET REPLICATION requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:989 +#: src/datastore/gnunet-service-datastore.c:1113 msgid "# GET ZERO ANONYMITY requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1036 +#: src/datastore/gnunet-service-datastore.c:1138 msgid "Content not found" msgstr "Contenuto non trovato" -#: src/datastore/gnunet-service-datastore.c:1043 +#: src/datastore/gnunet-service-datastore.c:1146 msgid "# bytes removed (explicit request)" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1088 +#: src/datastore/gnunet-service-datastore.c:1178 msgid "# REMOVE requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1137 -#, c-format -msgid "" -"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n" -msgstr "" - -#: src/datastore/gnunet-service-datastore.c:1143 -#: src/datastore/gnunet-service-datastore.c:1318 +#: src/datastore/gnunet-service-datastore.c:1220 #, c-format -msgid "New payload: %lld\n" +msgid "Datastore payload inaccurate (%lld < %lld). Trying to fix.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1197 +#: src/datastore/gnunet-service-datastore.c:1281 #, c-format msgid "Loading `%s' datastore plugin\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1209 +#: src/datastore/gnunet-service-datastore.c:1290 #, c-format msgid "Failed to load datastore plugin for `%s'\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1269 -msgid "Bloomfilter construction complete.\n" -msgstr "" - -#: src/datastore/gnunet-service-datastore.c:1325 -msgid "Rebuilding bloomfilter. Please be patient.\n" -msgstr "" - -#: src/datastore/gnunet-service-datastore.c:1336 -msgid "Plugin does not support get_keys function. Please fix!\n" -msgstr "" - -#: src/datastore/gnunet-service-datastore.c:1506 +#: src/datastore/gnunet-service-datastore.c:1492 #, c-format msgid "# bytes used in file-sharing datastore `%s'" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1522 +#: src/datastore/gnunet-service-datastore.c:1503 msgid "# quota" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1527 +#: src/datastore/gnunet-service-datastore.c:1505 msgid "# cache size" msgstr "# dimensione cache" -#: src/datastore/gnunet-service-datastore.c:1543 +#: src/datastore/gnunet-service-datastore.c:1518 #, c-format msgid "Could not use specified filename `%s' for bloomfilter.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1561 -#: src/datastore/gnunet-service-datastore.c:1577 +#: src/datastore/gnunet-service-datastore.c:1536 +#: src/datastore/gnunet-service-datastore.c:1552 #, c-format msgid "Failed to remove bogus bloomfilter file `%s'\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1609 +#: src/datastore/gnunet-service-datastore.c:1582 msgid "Failed to initialize bloomfilter.\n" msgstr "" -#: src/datastore/plugin_datastore_heap.c:893 -msgid "Heap database running\n" +#: src/datastore/gnunet-service-datastore.c:1611 +msgid "Rebuilding bloomfilter. Please be patient.\n" +msgstr "" + +#: src/datastore/gnunet-service-datastore.c:1616 +msgid "Plugin does not support get_keys function. Please fix!\n" msgstr "" -#: src/datastore/plugin_datastore_mysql.c:371 -#: src/datastore/plugin_datastore_mysql.c:423 -#: src/datastore/plugin_datastore_mysql.c:1075 -msgid "MySQL statement run failure" +#: src/datastore/gnunet-service-datastore.c:1619 +msgid "Bloomfilter construction complete.\n" msgstr "" -#: src/datastore/plugin_datastore_mysql.c:410 -#: src/datastore/plugin_datastore_sqlite.c:678 -msgid "Data too large" +#: src/datastore/plugin_datastore_heap.c:820 +msgid "Heap database running\n" msgstr "" -#: src/datastore/plugin_datastore_mysql.c:848 +#: src/datastore/plugin_datastore_mysql.c:783 +#, fuzzy, c-format +#| msgid "Failed to start service `%s'\n" +msgid "Failed to prepare statement `%s'\n" +msgstr "Impossibile avviare il servizio ' %s'\n" + +#: src/datastore/plugin_datastore_mysql.c:791 #, c-format msgid "`%s' for `%s' failed at %s:%d with error: %s\n" msgstr "" -#: src/datastore/plugin_datastore_mysql.c:1180 +#: src/datastore/plugin_datastore_mysql.c:1022 msgid "Mysql database running\n" msgstr "" -#: src/datastore/plugin_datastore_postgres.c:280 -#: src/datastore/plugin_datastore_postgres.c:897 -msgid "Postgress exec failure" -msgstr "" - -#: src/datastore/plugin_datastore_postgres.c:858 +#: src/datastore/plugin_datastore_postgres.c:824 msgid "Failed to drop table from database.\n" msgstr "" -#: src/datastore/plugin_datastore_postgres.c:956 +#: src/datastore/plugin_datastore_postgres.c:860 +#: src/namecache/plugin_namecache_postgres.c:414 +#: src/namestore/plugin_namestore_postgres.c:569 msgid "Postgres database running\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:66 +#: src/datastore/plugin_datastore_sqlite.c:57 #: src/testbed/generate-underlay-topology.c:50 #: src/testbed/gnunet-daemon-latency-logger.c:55 -#: src/testbed/gnunet-daemon-testbed-underlay.c:59 +#: src/testbed/gnunet-daemon-testbed-underlay.c:58 #, c-format msgid "`%s' failed at %s:%u with error: %s" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:271 -#: src/namecache/plugin_namecache_sqlite.c:173 -#: src/namestore/plugin_namestore_sqlite.c:206 -#: src/peerstore/plugin_peerstore_sqlite.c:535 +#: src/datastore/plugin_datastore_sqlite.c:255 +#: src/namecache/plugin_namecache_sqlite.c:193 +#: src/namestore/plugin_namestore_sqlite.c:204 +#: src/psycstore/plugin_psycstore_sqlite.c:319 #, c-format msgid "Unable to initialize SQLite: %s.\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:629 -msgid "sqlite bind failure" +#: src/datastore/plugin_datastore_sqlite.c:663 +msgid "Invalid data in database. Trying to fix (by deletion).\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1327 +#: src/datastore/plugin_datastore_sqlite.c:1156 msgid "sqlite version to old to determine size, assuming zero\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1361 +#: src/datastore/plugin_datastore_sqlite.c:1175 #, c-format -msgid "" -"Using sqlite page utilization to estimate payload (%llu pages of size %llu " -"bytes)\n" +msgid "Using sqlite page utilization to estimate payload (%llu pages of size %llu bytes)\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1405 -#: src/namecache/plugin_namecache_sqlite.c:557 -#: src/namestore/plugin_namestore_sqlite.c:751 +#: src/datastore/plugin_datastore_sqlite.c:1215 +#: src/namecache/plugin_namecache_sqlite.c:583 +#: src/namestore/plugin_namestore_sqlite.c:719 msgid "Sqlite database running\n" msgstr "" -#: src/datastore/plugin_datastore_template.c:253 +#: src/datastore/plugin_datastore_template.c:257 msgid "Template database running\n" msgstr "" -#: src/dht/gnunet-dht-get.c:158 +#: src/dht/dht_api.c:376 +#, fuzzy +#| msgid "Failed to start service.\n" +msgid "Failed to connect to the DHT service!\n" +msgstr "Impossibile avviare il servizio.\n" + +#: src/dht/gnunet-dht-get.c:133 #, c-format msgid "" "Result %d, type %d:\n" @@ -1979,829 +1731,1032 @@ msgid "" msgstr "" #: src/dht/gnunet-dht-get.c:159 -#, c-format -msgid "Result %d, type %d:\n" -msgstr "" - -#: src/dht/gnunet-dht-get.c:204 msgid "Must provide key for DHT GET!\n" msgstr "" -#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257 +#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225 msgid "Failed to connect to DHT service!\n" msgstr "" -#: src/dht/gnunet-dht-get.c:219 -msgid "Issuing DHT GET with key" +#: src/dht/gnunet-dht-get.c:173 +msgid "Issueing DHT GET with key" msgstr "" -#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307 +#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262 #: src/dht/gnunet-dht-put.c:198 msgid "the query key" msgstr "" -#: src/dht/gnunet-dht-get.c:253 +#: src/dht/gnunet-dht-get.c:192 msgid "how many parallel requests (replicas) to create" msgstr "" -#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313 +#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265 msgid "the type of data to look for" msgstr "" -#: src/dht/gnunet-dht-get.c:263 +#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210 msgid "how long to execute this query before giving up?" msgstr "" -#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202 +#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201 msgid "use DHT's demultiplex everywhere option" msgstr "" -#: src/dht/gnunet-dht-get.c:280 -msgid "Issue a GET request to the GNUnet DHT, prints results." -msgstr "" - -#: src/dht/gnunet-dht-monitor.c:319 -msgid "how long should the monitor command run" -msgstr "" - -#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372 -#: src/nse/gnunet-nse-profiler.c:878 +#: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271 +#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753 +#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877 +#: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168 +#: src/nse/gnunet-nse-profiler.c:873 msgid "be verbose (print progress information)" msgstr "" -#: src/dht/gnunet-dht-monitor.c:337 -msgid "Prints all packets that go through the DHT." -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 -#, c-format -msgid "Exiting as the number of peers is %u\n" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:949 src/rps/gnunet-rps-profiler.c:3083 -msgid "number of peers to start" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:954 -msgid "number of PUTs to perform per peer" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 -#: src/testbed/gnunet-testbed-profiler.c:300 -msgid "name of the file with the login information for the testbed" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:964 -msgid "delay between rounds for collecting statistics (default: 30 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:969 -msgid "delay to start doing PUTs (default: 1 sec)" +#: src/dht/gnunet-dht-get.c:225 +msgid "Issue a GET request to the GNUnet DHT, prints results." msgstr "" -#: src/dht/gnunet_dht_profiler.c:974 -msgid "delay to start doing GETs (default: 5 min)" +#: src/dht/gnunet-dht-monitor.c:268 +msgid "how long should the monitor command run" msgstr "" -#: src/dht/gnunet_dht_profiler.c:979 -msgid "replication degree for DHT PUTs" +#: src/dht/gnunet-dht-monitor.c:293 +msgid "Prints all packets that go through the DHT." msgstr "" -#: src/dht/gnunet_dht_profiler.c:984 -msgid "chance that a peer is selected at random for PUTs" +#: src/dht/gnunet-dht-put.c:118 +msgid "PUT request sent with key" msgstr "" -#: src/dht/gnunet_dht_profiler.c:989 -msgid "timeout for DHT PUT and GET requests (default: 1 min)" +#: src/dht/gnunet-dht-put.c:121 +msgid "Timeout sending PUT request!\n" msgstr "" -#: src/dht/gnunet_dht_profiler.c:1009 -msgid "Measure quality and performance of the DHT service." +#: src/dht/gnunet-dht-put.c:124 +msgid "PUT request not confirmed!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:134 +#: src/dht/gnunet-dht-put.c:153 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:142 -msgid "Could not connect to DHT service!\n" +#: src/dht/gnunet-dht-put.c:160 +#, c-format +msgid "Could not connect to %s service!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:153 +#: src/dht/gnunet-dht-put.c:176 #, c-format msgid "Issuing put request for `%s' with data `%s'!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:188 +#: src/dht/gnunet-dht-put.c:192 msgid "the data to insert under the key" msgstr "" -#: src/dht/gnunet-dht-put.c:193 +#: src/dht/gnunet-dht-put.c:195 msgid "how long to store this entry in the dht (in seconds)" msgstr "" -#: src/dht/gnunet-dht-put.c:207 +#: src/dht/gnunet-dht-put.c:204 msgid "how many replicas to create" msgstr "" -#: src/dht/gnunet-dht-put.c:211 -msgid "use DHT's record route option" -msgstr "" - -#: src/dht/gnunet-dht-put.c:216 +#: src/dht/gnunet-dht-put.c:207 msgid "the type to insert data as" msgstr "" -#: src/dht/gnunet-dht-put.c:233 +#: src/dht/gnunet-dht-put.c:236 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY." msgstr "" -#: src/dht/gnunet-service-dht_clients.c:369 +#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176 +#, fuzzy +#| msgid "Failed to start service.\n" +msgid "Failed to connect to transport service!\n" +msgstr "Impossibile avviare il servizio.\n" + +#: src/dht/gnunet-service-dht_clients.c:417 +#: src/dht/gnunet-service-xdht_clients.c:838 msgid "# GET requests from clients injected" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:483 +#: src/dht/gnunet-service-dht_clients.c:513 +#: src/dht/gnunet-service-xdht_clients.c:927 msgid "# PUT requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:616 +#: src/dht/gnunet-service-dht_clients.c:597 +#: src/dht/gnunet-service-xdht_clients.c:1013 msgid "# GET requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:842 +#: src/dht/gnunet-service-dht_clients.c:798 +#: src/dht/gnunet-service-xdht_clients.c:1214 msgid "# GET STOP requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1027 +#: src/dht/gnunet-service-dht_clients.c:1039 +#: src/dht/gnunet-service-xdht_clients.c:498 msgid "# Key match, type mismatches in REPLY to CLIENT" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1042 +#: src/dht/gnunet-service-dht_clients.c:1052 +#: src/dht/gnunet-service-xdht_clients.c:511 msgid "# Duplicate REPLIES to CLIENT request dropped" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1088 +#: src/dht/gnunet-service-dht_clients.c:1089 +#: src/dht/gnunet-service-xdht_clients.c:548 #, c-format msgid "Unsupported block type (%u) in request!\n" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1095 +#: src/dht/gnunet-service-dht_clients.c:1112 +#: src/dht/gnunet-service-xdht_clients.c:571 msgid "# RESULTS queued for clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1173 +#: src/dht/gnunet-service-dht_clients.c:1166 +#: src/dht/gnunet-service-dht_clients.c:1209 +#: src/dht/gnunet-service-xdht_clients.c:625 +#: src/dht/gnunet-service-xdht_clients.c:668 msgid "# REPLIES ignored for CLIENTS (no match)" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:73 +#: src/dht/gnunet-service-dht_clients.c:1176 +#: src/dht/gnunet-service-xdht_clients.c:635 +msgid "Could not pass reply to client, message too big!\n" +msgstr "" + +#: src/dht/gnunet-service-dht_datacache.c:68 +#: src/dht/gnunet-service-xdht_datacache.c:68 #, c-format msgid "%s request received, but have no datacache!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:83 +#: src/dht/gnunet-service-dht_datacache.c:78 +#: src/dht/gnunet-service-xdht_datacache.c:78 msgid "# ITEMS stored in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:207 +#: src/dht/gnunet-service-dht_datacache.c:165 +#: src/dht/gnunet-service-xdht_datacache.c:165 msgid "# Good RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:219 +#: src/dht/gnunet-service-dht_datacache.c:176 +#: src/dht/gnunet-service-xdht_datacache.c:176 msgid "# Duplicate RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:225 +#: src/dht/gnunet-service-dht_datacache.c:182 +#: src/dht/gnunet-service-xdht_datacache.c:182 msgid "# Invalid RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:231 +#: src/dht/gnunet-service-dht_datacache.c:188 +#: src/dht/gnunet-service-xdht_datacache.c:188 msgid "# Irrelevant RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:243 +#: src/dht/gnunet-service-dht_datacache.c:200 +#: src/dht/gnunet-service-xdht_datacache.c:200 msgid "# Unsupported RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:247 +#: src/dht/gnunet-service-dht_datacache.c:203 +#: src/dht/gnunet-service-xdht_datacache.c:203 #, c-format msgid "Unsupported block type (%u) in local response!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:282 +#: src/dht/gnunet-service-dht_datacache.c:234 +#: src/dht/gnunet-service-xdht_datacache.c:234 msgid "# GET requests given to datacache" msgstr "" -#: src/dht/gnunet-service-dht_hello.c:86 +#: src/dht/gnunet-service-dht_hello.c:84 +#: src/dht/gnunet-service-xdht_hello.c:82 msgid "# HELLOs obtained from peerinfo" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:679 +#: src/dht/gnunet-service-dht_neighbours.c:516 +msgid "# Preference updates given to core" +msgstr "" + +#: src/dht/gnunet-service-dht_neighbours.c:610 msgid "# FIND PEER messages initiated" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:852 +#: src/dht/gnunet-service-dht_neighbours.c:764 +msgid "# Queued messages discarded (peer disconnected)" +msgstr "" + +#: src/dht/gnunet-service-dht_neighbours.c:819 +#: src/dht/gnunet-service-xdht_neighbours.c:703 +msgid "# Bytes transmitted to other peers" +msgstr "" + +#: src/dht/gnunet-service-dht_neighbours.c:857 +#: src/dht/gnunet-service-xdht_neighbours.c:742 +msgid "# Bytes of bandwidth requested from core" +msgstr "" + +#: src/dht/gnunet-service-dht_neighbours.c:889 msgid "# requests TTL-dropped" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1055 -#: src/dht/gnunet-service-dht_neighbours.c:1098 +#: src/dht/gnunet-service-dht_neighbours.c:1093 +#: src/dht/gnunet-service-dht_neighbours.c:1130 msgid "# Peers excluded from routing due to Bloomfilter" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1072 -#: src/dht/gnunet-service-dht_neighbours.c:1114 +#: src/dht/gnunet-service-dht_neighbours.c:1108 +#: src/dht/gnunet-service-dht_neighbours.c:1145 msgid "# Peer selection failed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1271 +#: src/dht/gnunet-service-dht_neighbours.c:1287 msgid "# PUT requests routed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1304 +#: src/dht/gnunet-service-dht_neighbours.c:1316 msgid "# PUT messages queued for transmission" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1315 -#: src/dht/gnunet-service-dht_neighbours.c:1455 -#: src/dht/gnunet-service-dht_neighbours.c:1558 +#: src/dht/gnunet-service-dht_neighbours.c:1323 +#: src/dht/gnunet-service-dht_neighbours.c:1440 +#: src/dht/gnunet-service-dht_neighbours.c:1543 +#: src/dht/gnunet-service-xdht_neighbours.c:794 +#: src/dht/gnunet-service-xdht_neighbours.c:860 +#: src/dht/gnunet-service-xdht_neighbours.c:919 +#: src/dht/gnunet-service-xdht_neighbours.c:981 +#: src/dht/gnunet-service-xdht_neighbours.c:1041 msgid "# P2P messages dropped due to full queue" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1400 +#: src/dht/gnunet-service-dht_neighbours.c:1405 msgid "# GET requests routed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1443 +#: src/dht/gnunet-service-dht_neighbours.c:1432 msgid "# GET messages queued for transmission" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1573 +#: src/dht/gnunet-service-dht_neighbours.c:1550 msgid "# RESULT messages queued for transmission" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1676 -msgid "# Expired PUTs discarded" -msgstr "" - -#: src/dht/gnunet-service-dht_neighbours.c:1684 +#: src/dht/gnunet-service-dht_neighbours.c:1636 msgid "# P2P PUT requests received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1688 +#: src/dht/gnunet-service-dht_neighbours.c:1639 msgid "# P2P PUT bytes received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1914 +#: src/dht/gnunet-service-dht_neighbours.c:1803 msgid "# FIND PEER requests ignored due to Bloomfilter" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1922 +#: src/dht/gnunet-service-dht_neighbours.c:1811 msgid "# FIND PEER requests ignored due to lack of HELLO" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2084 +#: src/dht/gnunet-service-dht_neighbours.c:1904 msgid "# P2P GET requests received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2088 +#: src/dht/gnunet-service-dht_neighbours.c:1907 msgid "# P2P GET bytes received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2153 +#: src/dht/gnunet-service-dht_neighbours.c:1961 msgid "# P2P FIND PEER requests processed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2174 +#: src/dht/gnunet-service-dht_neighbours.c:1975 msgid "# P2P GET requests ONLY routed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2351 -msgid "# Expired results discarded" -msgstr "" - -#: src/dht/gnunet-service-dht_neighbours.c:2367 +#: src/dht/gnunet-service-dht_neighbours.c:2052 msgid "# P2P RESULTS received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2371 +#: src/dht/gnunet-service-dht_neighbours.c:2055 msgid "# P2P RESULT bytes received" msgstr "" -#: src/dht/gnunet-service-dht_nse.c:59 +#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59 msgid "# Network size estimates received" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:223 +#: src/dht/gnunet-service-dht_routing.c:211 msgid "# Good REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:237 +#: src/dht/gnunet-service-dht_routing.c:220 msgid "# Duplicate REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:243 +#: src/dht/gnunet-service-dht_routing.c:226 msgid "# Invalid REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:249 +#: src/dht/gnunet-service-dht_routing.c:232 msgid "# Irrelevant REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:261 +#: src/dht/gnunet-service-dht_routing.c:244 msgid "# Unsupported REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:339 +#: src/dht/gnunet-service-dht_routing.c:317 msgid "# Entries removed from routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:415 +#: src/dht/gnunet-service-dht_routing.c:399 msgid "# Entries added to routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:437 +#: src/dht/gnunet-service-dht_routing.c:417 msgid "# DHT requests combined" msgstr "" -#: src/dht/plugin_block_dht.c:189 +#: src/dht/gnunet-service-xdht_neighbours.c:1398 +#, c-format +msgid "" +"\n" +"SUPU %s, %s, %d,my_identity = %s" +msgstr "" + +#: src/dht/gnunet-service-xdht_neighbours.c:1514 +#: src/dht/gnunet-service-xdht_neighbours.c:1524 +#: src/dht/gnunet-service-xdht_neighbours.c:1530 +#: src/dht/gnunet-service-xdht_neighbours.c:1536 +#: src/dht/gnunet-service-xdht_neighbours.c:1545 +#, c-format +msgid "" +"\n" +"SUPU %s, %s, %d" +msgstr "" + +#: src/dht/plugin_block_dht.c:138 #, c-format msgid "Block not of type %u\n" msgstr "" -#: src/dht/plugin_block_dht.c:198 +#: src/dht/plugin_block_dht.c:145 msgid "Size mismatch for block\n" msgstr "" -#: src/dht/plugin_block_dht.c:209 +#: src/dht/plugin_block_dht.c:155 #, c-format msgid "Block of type %u is malformed\n" msgstr "" -#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358 -msgid "only monitor DNS queries" +#: src/dns/dnsparser.c:257 +#, c-format +msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n" msgstr "" -#: src/dns/gnunet-dns-monitor.c:370 -msgid "Monitor DNS queries." +#: src/dns/dnsparser.c:856 +#, c-format +msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n" msgstr "" -#: src/dns/gnunet-dns-redirector.c:237 -msgid "set A records" +#: src/dns/dnsstub.c:175 +#, c-format +msgid "Could not bind to any port: %s\n" msgstr "" -#: src/dns/gnunet-dns-redirector.c:243 +#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383 +#, fuzzy, c-format +#| msgid "Failed to create statistics!\n" +msgid "Failed to send DNS request to %s\n" +msgstr "Generazione statistiche fallita\n" + +#: src/dns/dnsstub.c:299 +#, c-format +msgid "Sent DNS request to %s\n" +msgstr "" + +#: src/dns/dnsstub.c:368 +#, c-format +msgid "Configured DNS exit `%s' is not working / valid.\n" +msgstr "" + +#: src/dns/dnsstub.c:440 +#, c-format +msgid "Received DNS response that is too small (%u bytes)" +msgstr "" + +#: src/dns/gnunet-dns-monitor.c:355 +msgid "only monitor DNS queries" +msgstr "" + +#: src/dns/gnunet-dns-monitor.c:358 +msgid "only monitor DNS replies" +msgstr "" + +#: src/dns/gnunet-dns-monitor.c:369 +msgid "Monitor DNS queries." +msgstr "" + +#: src/dns/gnunet-dns-redirector.c:236 +msgid "set A records" +msgstr "" + +#: src/dns/gnunet-dns-redirector.c:239 msgid "set AAAA records" msgstr "" -#: src/dns/gnunet-dns-redirector.c:256 +#: src/dns/gnunet-dns-redirector.c:251 msgid "Change DNS replies to point elsewhere." msgstr "" -#: src/dns/gnunet-service-dns.c:462 +#: src/dns/gnunet-service-dns.c:456 msgid "# DNS requests answered via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:610 +#: src/dns/gnunet-service-dns.c:603 msgid "# DNS exit failed (failed to open socket)" msgstr "" -#: src/dns/gnunet-service-dns.c:740 +#: src/dns/gnunet-service-dns.c:714 msgid "# External DNS response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:815 +#: src/dns/gnunet-service-dns.c:792 msgid "# Client response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:930 +#: src/dns/gnunet-service-dns.c:907 msgid "Received malformed IPv4-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:946 +#: src/dns/gnunet-service-dns.c:923 msgid "Received malformed IPv6-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:955 +#: src/dns/gnunet-service-dns.c:932 #, c-format msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n" msgstr "" -#: src/dns/gnunet-service-dns.c:965 -msgid "DNS interceptor got non-DNS packet (dropped)\n" -msgstr "" - -#: src/dns/gnunet-service-dns.c:967 +#: src/dns/gnunet-service-dns.c:942 msgid "# Non-DNS UDP packet received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1034 +#: src/dns/gnunet-service-dns.c:1009 msgid "# DNS requests received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565 +#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3514 +#, c-format +msgid "`%s' must be installed SUID, refusing to run\n" +msgstr "" + +#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3571 msgid "need a valid IPv4 or IPv6 address\n" msgstr "" -#: src/dns/gnunet-service-dns.c:1092 +#: src/dv/gnunet-dv.c:169 +msgid "verbose output" +msgstr "" + +#: src/dv/gnunet-dv.c:178 +msgid "Print information about DV state" +msgstr "" + +#: src/exit/gnunet-daemon-exit.c:802 #, c-format -msgid "`%s' must be installed SUID, will not run DNS interceptor\n" +msgid "Got duplicate service records for `%s:%u'\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:960 -msgid "# TCP packets sent via TUN" +#: src/exit/gnunet-daemon-exit.c:853 +msgid "# Bytes transmitted via mesh channels" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1061 -msgid "# ICMP packets sent via TUN" +#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397 +#: src/exit/gnunet-daemon-exit.c:2654 src/vpn/gnunet-service-vpn.c:1407 +#: src/vpn/gnunet-service-vpn.c:1797 src/vpn/gnunet-service-vpn.c:1960 +msgid "# ICMPv4 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1340 -msgid "# UDP packets sent via TUN" +#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2456 +#: src/exit/gnunet-daemon-exit.c:2713 src/vpn/gnunet-service-vpn.c:1463 +#: src/vpn/gnunet-service-vpn.c:1856 src/vpn/gnunet-service-vpn.c:1993 +msgid "# ICMPv6 packets dropped (type not allowed)" +msgstr "" + +#: src/exit/gnunet-daemon-exit.c:1047 +msgid "# ICMP packets dropped (not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572 -#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701 -#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953 -#: src/exit/gnunet-daemon-exit.c:2207 -msgid "# Bytes received from CADET" +#: src/exit/gnunet-daemon-exit.c:1054 +msgid "ICMP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1467 -msgid "# UDP IP-exit requests received via cadet" +#: src/exit/gnunet-daemon-exit.c:1130 +msgid "UDP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1575 -msgid "# UDP service requests received via cadet" +#: src/exit/gnunet-daemon-exit.c:1204 +msgid "TCP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1615 -msgid "# TCP service creation requests received via cadet" +#: src/exit/gnunet-daemon-exit.c:1256 +msgid "# Packets received from TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1704 -msgid "# TCP IP-exit creation requests received via cadet" +#: src/exit/gnunet-daemon-exit.c:1270 +msgid "# Bytes received from TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1788 -msgid "# TCP DATA requests dropped (no session)" +#: src/exit/gnunet-daemon-exit.c:1296 +msgid "IPv4 packet options received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1825 -msgid "# TCP data requests received via cadet" +#: src/exit/gnunet-daemon-exit.c:1323 +#, c-format +msgid "IPv4 packet with unsupported next header %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1956 -msgid "# ICMP IP-exit requests received via cadet" +#: src/exit/gnunet-daemon-exit.c:1369 +#, c-format +msgid "IPv6 packet with unsupported next header %d received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279 -#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828 -#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105 -msgid "# ICMPv4 packets dropped (type not allowed)" +#: src/exit/gnunet-daemon-exit.c:1377 +#, c-format +msgid "Packet from unknown protocol %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338 -#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887 -#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158 -msgid "# ICMPv6 packets dropped (type not allowed)" +#: src/exit/gnunet-daemon-exit.c:1759 +msgid "# TCP packets sent via TUN" +msgstr "" + +#: src/exit/gnunet-daemon-exit.c:1872 +#, fuzzy +#| msgid "# active connections" +msgid "# TCP service creation requests received via mesh" +msgstr "# connessioni attive" + +#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1968 +#: src/exit/gnunet-daemon-exit.c:2073 src/exit/gnunet-daemon-exit.c:2321 +#: src/exit/gnunet-daemon-exit.c:2570 src/exit/gnunet-daemon-exit.c:2859 +#: src/exit/gnunet-daemon-exit.c:2966 +msgid "# Bytes received from MESH" +msgstr "" + +#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990 +#, c-format +msgid "No service %s found for %s on port %d!\n" +msgstr "" + +#: src/exit/gnunet-daemon-exit.c:1914 +msgid "# TCP requests dropped (no such service)" +msgstr "" + +#: src/exit/gnunet-daemon-exit.c:1971 +msgid "# TCP IP-exit creation requests received via mesh" +msgstr "" + +#: src/exit/gnunet-daemon-exit.c:2076 +#, fuzzy +#| msgid "# PONG messages received" +msgid "# TCP data requests received via mesh" +msgstr "# messaggi PONG ricevuti" + +#: src/exit/gnunet-daemon-exit.c:2090 +msgid "# TCP DATA requests dropped (no session)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2210 -msgid "# ICMP service requests received via cadet" +#: src/exit/gnunet-daemon-exit.c:2150 +msgid "# ICMP packets sent via TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985 -#: src/vpn/gnunet-service-vpn.c:2096 +#: src/exit/gnunet-daemon-exit.c:2324 +#, fuzzy +#| msgid "# PONG messages received" +msgid "# ICMP IP-exit requests received via mesh" +msgstr "# messaggi PONG ricevuti" + +#: src/exit/gnunet-daemon-exit.c:2573 +#, fuzzy +#| msgid "# PONG messages received" +msgid "# ICMP service requests received via mesh" +msgstr "# messaggi PONG ricevuti" + +#: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397 +#: src/vpn/gnunet-service-vpn.c:1954 msgid "# ICMPv4 packets dropped (impossible PT to v6)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875 -#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141 +#: src/exit/gnunet-daemon-exit.c:2698 src/vpn/gnunet-service-vpn.c:1433 +#: src/vpn/gnunet-service-vpn.c:1445 src/vpn/gnunet-service-vpn.c:1844 msgid "# ICMPv6 packets dropped (impossible PT to v4)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068 -msgid "# Inbound CADET channels created" +#: src/exit/gnunet-daemon-exit.c:2748 +msgid "# UDP packets sent via TUN" +msgstr "" + +#: src/exit/gnunet-daemon-exit.c:2862 +#, fuzzy +#| msgid "# PONG messages received" +msgid "# UDP IP-exit requests received via mesh" +msgstr "# messaggi PONG ricevuti" + +#: src/exit/gnunet-daemon-exit.c:2969 +#, fuzzy +#| msgid "# PONG messages received" +msgid "# UDP service requests received via mesh" +msgstr "# messaggi PONG ricevuti" + +#: src/exit/gnunet-daemon-exit.c:2995 +msgid "# UDP requests dropped (no such service)" +msgstr "" + +#: src/exit/gnunet-daemon-exit.c:3031 +msgid "# Inbound MESH channels created" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2522 +#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245 #, c-format -msgid "Got duplicate service records for `%s:%u'\n" +msgid "Option `%s' for domain `%s' is not formatted correctly!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2541 -msgid "# Messages transmitted via cadet channels" +#: src/exit/gnunet-daemon-exit.c:3259 src/exit/gnunet-daemon-exit.c:3267 +#, c-format +msgid "`%s' is not a valid port number (for domain `%s')!" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2719 -msgid "# ICMP packets dropped (not allowed)" +#: src/exit/gnunet-daemon-exit.c:3300 +#, c-format +msgid "No addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2727 -msgid "ICMP Packet dropped, have no matching connection information\n" +#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326 +#, c-format +msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2801 -msgid "UDP Packet dropped, have no matching connection information\n" +#: src/exit/gnunet-daemon-exit.c:3337 +#, c-format +msgid "No IP addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2873 -msgid "TCP Packet dropped, have no matching connection information\n" +#: src/exit/gnunet-daemon-exit.c:3527 +msgid "This system does not support IPv4, will disable IPv4 functions despite them being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2921 -msgid "# Packets received from TUN" +#: src/exit/gnunet-daemon-exit.c:3535 +msgid "This system does not support IPv6, will disable IPv6 functions despite them being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2935 -msgid "# Bytes received from TUN" +#: src/exit/gnunet-daemon-exit.c:3542 +msgid "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use ENABLE_IPv4=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2961 -msgid "IPv4 packet options received. Ignored.\n" +#: src/exit/gnunet-daemon-exit.c:3548 +msgid "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use ENABLE_IPv6=YES\n" +msgstr "" + +#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717 +#: src/pt/gnunet-daemon-pt.c:1247 +msgid "No useful service enabled. Exiting.\n" +msgstr "" + +#: src/exit/gnunet-daemon-exit.c:3664 +msgid "Must be a number" +msgstr "Deve essere un numero" + +#: src/exit/gnunet-daemon-exit.c:3813 +msgid "Daemon to run to provide an IP exit node for the VPN" +msgstr "" + +#: src/experimentation/gnunet-daemon-experimentation.c:55 +msgid "Experimentation daemon shutting down ...\n" +msgstr "" + +#: src/experimentation/gnunet-daemon-experimentation.c:77 +msgid "Experimentation daemon starting ...\n" +msgstr "" + +#: src/experimentation/gnunet-daemon-experimentation.c:83 +#, fuzzy +#| msgid "Failed to create statistics!\n" +msgid "Failed to create statistics!\n" +msgstr "Generazione statistiche fallita\n" + +#: src/experimentation/gnunet-daemon-experimentation.c:120 +msgid "GNUnet experimentation daemon" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2988 +#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241 #, c-format -msgid "IPv4 packet with unsupported next header %u received. Ignored.\n" +msgid "Experiment `%s': Experiment signature is invalid\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3034 +#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250 #, c-format -msgid "IPv6 packet with unsupported next header %d received. Ignored.\n" +msgid "Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu sec. \n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3042 +#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303 #, c-format -msgid "Packet from unknown protocol %u received. Ignored.\n" +msgid "Experiment `%s': Issuer missing\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255 +#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312 #, c-format -msgid "Option `%s' for domain `%s' is not formatted correctly!\n" +msgid "Experiment `%s': Issuer invalid\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277 +#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320 #, c-format -msgid "`%s' is not a valid port number (for domain `%s')!" +msgid "Experiment `%s': Issuer not accepted!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3318 +#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330 #, c-format -msgid "No addresses found for hostname `%s' of service `%s'!\n" +msgid "Experiment `%s': Version missing or invalid \n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345 +#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339 #, c-format -msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n" +msgid "Experiment `%s': Required capabilities missing \n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3357 +#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345 #, c-format -msgid "No IP addresses found for hostname `%s' of service `%s'!\n" +msgid "Experiment `%s': Required capabilities invalid \n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3501 -msgid "" -"This system does not support IPv4, will disable IPv4 functions despite them " -"being enabled in the configuration\n" +#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390 +#, fuzzy, c-format +#| msgid "Failed to start service `%s'\n" +msgid "Failed to parse file `%s'\n" +msgstr "Impossibile avviare il servizio ' %s'\n" + +#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420 +#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452 +msgid "No valid experiment issuers configured! Set value to public keys of issuers! Exiting.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3509 -msgid "" -"This system does not support IPv6, will disable IPv6 functions despite them " -"being enabled in the configuration\n" +#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435 +msgid "Invalid value for public key\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3516 -msgid "" -"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use " -"ENABLE_IPv4=YES\n" +#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473 +#, c-format +msgid "Cannot read experiments file `%s'\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3522 -msgid "" -"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use " -"ENABLE_IPv6=YES\n" +#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221 +#, c-format +msgid "Cannot send message to peer `%s' for experiment `%s'\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3690 -msgid "Must be a number" +#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309 +#, c-format +msgid "Sending experimentation request to peer %s\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3805 +#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453 #, c-format -msgid "`%s' must be installed SUID, EXIT will not work\n" +msgid "Added peer `%s' as active node\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204 -msgid "No useful service enabled. Exiting.\n" +#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891 +#, fuzzy, c-format +#| msgid "Connection established to `%s'\n" +msgid "Connected to peer %s\n" +msgstr "Connessione stabilita con `%s'\n" + +#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921 +#, c-format +msgid "Disconnected from peer %s\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3966 -msgid "Daemon to run to provide an IP exit node for the VPN" +#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104 +msgid "Failed to connect to CORE service!\n" +msgstr "" + +#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108 +#, c-format +msgid "Peer `%s' did not respond to request for experiment `%s'\n" +msgstr "" + +#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143 +#, c-format +msgid "Starting inbound experiment `%s' with peer `%s'\n" +msgstr "" + +#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276 +#, c-format +msgid "Starting outbound experiment `%s' with peer `%s'\n" +msgstr "" + +#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294 +#, c-format +msgid "Received %s message from peer %s for experiment `%s'\n" msgstr "" -#: src/fragmentation/defragmentation.c:275 +#: src/fragmentation/defragmentation.c:270 msgid "# acknowledgements sent for fragment" msgstr "" -#: src/fragmentation/defragmentation.c:468 -#: src/transport/plugin_transport_wlan.c:1554 +#: src/fragmentation/defragmentation.c:456 msgid "# fragments received" msgstr "" -#: src/fragmentation/defragmentation.c:538 +#: src/fragmentation/defragmentation.c:521 msgid "# duplicate fragments received" msgstr "" -#: src/fragmentation/defragmentation.c:556 +#: src/fragmentation/defragmentation.c:534 msgid "# messages defragmented" msgstr "" -#: src/fragmentation/fragmentation.c:240 +#: src/fragmentation/fragmentation.c:208 msgid "# fragments transmitted" msgstr "" -#: src/fragmentation/fragmentation.c:245 +#: src/fragmentation/fragmentation.c:211 msgid "# fragments retransmitted" msgstr "" -#: src/fragmentation/fragmentation.c:278 +#: src/fragmentation/fragmentation.c:237 msgid "# fragments wrap arounds" msgstr "" -#: src/fragmentation/fragmentation.c:325 +#: src/fragmentation/fragmentation.c:281 msgid "# messages fragmented" msgstr "" -#: src/fragmentation/fragmentation.c:331 +#: src/fragmentation/fragmentation.c:284 msgid "# total size of fragmented messages" msgstr "" -#: src/fragmentation/fragmentation.c:456 +#: src/fragmentation/fragmentation.c:405 msgid "# fragment acknowledgements received" msgstr "" -#: src/fragmentation/fragmentation.c:463 +#: src/fragmentation/fragmentation.c:411 msgid "# bits removed from fragmentation ACKs" msgstr "" -#: src/fragmentation/fragmentation.c:487 +#: src/fragmentation/fragmentation.c:435 msgid "# fragmentation transmissions completed" msgstr "" -#: src/fs/fs_api.c:499 +#: src/fs/fs_api.c:465 #, c-format msgid "Could not open file `%s': %s" msgstr "" -#: src/fs/fs_api.c:510 +#: src/fs/fs_api.c:474 #, c-format msgid "Could not read file `%s': %s" msgstr "" -#: src/fs/fs_api.c:518 +#: src/fs/fs_api.c:480 #, c-format msgid "Short read reading from file `%s'!" msgstr "" -#: src/fs/fs_api.c:1126 +#: src/fs/fs_api.c:1066 #, c-format msgid "Failed to resume publishing information `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:1646 +#: src/fs/fs_api.c:1571 #, c-format msgid "Failure while resuming publishing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:1662 +#: src/fs/fs_api.c:1585 #, c-format msgid "Failed to resume publishing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2322 +#: src/fs/fs_api.c:2242 #, c-format msgid "Failure while resuming unindexing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2332 +#: src/fs/fs_api.c:2252 #, c-format msgid "Failed to resume unindexing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706 +#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2619 #, c-format msgid "Failed to resume sub-download `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2478 +#: src/fs/fs_api.c:2395 #, c-format msgid "Failed to resume sub-search `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016 +#: src/fs/fs_api.c:2409 src/fs/fs_api.c:2428 src/fs/fs_api.c:2911 #, c-format msgid "Failure while resuming search operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2696 +#: src/fs/fs_api.c:2610 #, c-format msgid "Failed to resume sub-download `%s': could not open file `%s'\n" msgstr "" -#: src/fs/fs_api.c:2959 +#: src/fs/fs_api.c:2855 msgid "Could not resume running search, will resume as paused search\n" msgstr "" -#: src/fs/fs_api.c:3054 +#: src/fs/fs_api.c:2949 #, c-format msgid "Failure while resuming download operation `%s': %s\n" msgstr "" -#: src/fs/fs_directory.c:213 +#: src/fs/fs_directory.c:208 msgid "MAGIC mismatch. This is not a GNUnet directory.\n" msgstr "" -#: src/fs/fs_download.c:310 -msgid "" -"Recursive downloads of directories larger than 4 GB are not supported on 32-" -"bit systems\n" +#: src/fs/fs_download.c:322 +msgid "Recursive downloads of directories larger than 4 GB are not supported on 32-bit systems\n" msgstr "" -#: src/fs/fs_download.c:335 +#: src/fs/fs_download.c:342 msgid "Directory too large for system address space\n" msgstr "" -#: src/fs/fs_download.c:347 -#, c-format -msgid "" -"Failed to access full directroy contents of `%s' for recursive download\n" -msgstr "" - -#: src/fs/fs_download.c:534 src/fs/fs_download.c:546 +#: src/fs/fs_download.c:523 src/fs/fs_download.c:535 #, c-format msgid "Failed to open file `%s' for writing" msgstr "" -#: src/fs/fs_download.c:956 +#: src/fs/fs_download.c:905 #, c-format msgid "Failed to create directory for recursive download of `%s'\n" msgstr "" -#: src/fs/fs_download.c:1047 +#: src/fs/fs_download.c:987 #, c-format -msgid "" -"Internal error or bogus download URI (expected %u bytes at depth %u and " -"offset %llu/%llu, got %u bytes)" +msgid "Internal error or bogus download URI (expected %u bytes at depth %u and offset %llu/%llu, got %u bytes)" msgstr "" -#: src/fs/fs_download.c:1075 +#: src/fs/fs_download.c:1013 msgid "internal error decrypting content" msgstr "" -#: src/fs/fs_download.c:1099 +#: src/fs/fs_download.c:1036 #, c-format msgid "Download failed: could not open file `%s': %s" msgstr "" -#: src/fs/fs_download.c:1111 +#: src/fs/fs_download.c:1046 #, c-format msgid "Failed to seek to offset %llu in file `%s': %s" msgstr "" -#: src/fs/fs_download.c:1120 +#: src/fs/fs_download.c:1055 #, c-format msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s" msgstr "" -#: src/fs/fs_download.c:1220 +#: src/fs/fs_download.c:1153 msgid "internal error decoding tree" msgstr "" -#: src/fs/fs_download.c:1885 +#: src/fs/fs_download.c:1944 msgid "Invalid URI" msgstr "" -#: src/fs/fs_getopt.c:235 +#: src/fs/fs_getopt.c:192 #, c-format -msgid "" -"Unknown metadata type in metadata option `%s'. Using metadata type " -"`unknown' instead.\n" +msgid "Unknown metadata type in metadata option `%s'. Using metadata type `unknown' instead.\n" +msgstr "" + +#: src/fs/fs_list_indexed.c:90 +#, c-format +msgid "Failed to receive response for `%s' request from `%s' service.\n" msgstr "" -#: src/fs/fs_list_indexed.c:152 +#: src/fs/fs_list_indexed.c:113 #, c-format -msgid "Failed to receive response from `%s' service.\n" +msgid "Failed to receive valid response for `%s' request from `%s' service.\n" msgstr "" -#: src/fs/fs_list_indexed.c:196 +#: src/fs/fs_list_indexed.c:151 #, c-format msgid "Failed to not connect to `%s' service.\n" msgstr "" -#: src/fs/fs_misc.c:128 +#: src/fs/fs_misc.c:126 #, c-format msgid "Did not find mime type `%s' in extension list.\n" msgstr "" @@ -2811,981 +2766,943 @@ msgstr "" msgid "Failed to open `%s' for writing: %s\n" msgstr "" -#: src/fs/fs_namespace.c:232 +#: src/fs/fs_namespace.c:229 #, c-format msgid "Failed to write `%s': %s\n" msgstr "" -#: src/fs/fs_namespace.c:324 +#: src/fs/fs_namespace.c:320 #, c-format msgid "Failed to read `%s': %s\n" msgstr "" -#: src/fs/fs_namespace.c:470 +#: src/fs/fs_namespace.c:466 msgid "Failed to connect to datastore." msgstr "" -#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438 +#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415 #, c-format msgid "Publishing failed: %s" msgstr "" -#: src/fs/fs_publish.c:725 -#, fuzzy, c-format -msgid "Can not index file `%s': %s.\n" -msgstr "Connessione stabilita con `%s'\n" - -#: src/fs/fs_publish.c:782 src/fs/fs_publish.c:827 src/fs/fs_publish.c:848 -#: src/fs/fs_publish.c:878 src/fs/fs_publish.c:1144 +#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723 +#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914 #, c-format msgid "Can not index file `%s': %s. Will try to insert instead.\n" msgstr "" -#: src/fs/fs_publish.c:784 -msgid "error on index-start request to `fs' service" +#: src/fs/fs_publish.c:669 +msgid "timeout on index-start request to `fs' service" msgstr "" -#: src/fs/fs_publish.c:829 +#: src/fs/fs_publish.c:681 +msgid "unknown error" +msgstr "errore sconosciuto" + +#: src/fs/fs_publish.c:725 msgid "failed to compute hash" -msgstr "" +msgstr "impossibile calcolare l'hash" -#: src/fs/fs_publish.c:849 +#: src/fs/fs_publish.c:745 msgid "filename too long" -msgstr "" +msgstr "nome file troppo lungo" -#: src/fs/fs_publish.c:880 +#: src/fs/fs_publish.c:770 msgid "could not connect to `fs' service" msgstr "" -#: src/fs/fs_publish.c:906 +#: src/fs/fs_publish.c:793 #, c-format msgid "Failed to get file identifiers for `%s'\n" msgstr "" -#: src/fs/fs_publish.c:995 src/fs/fs_publish.c:1031 -msgid "Can not create LOC URI. Will continue with CHK instead.\n" -msgstr "" - -#: src/fs/fs_publish.c:1098 +#: src/fs/fs_publish.c:862 #, c-format msgid "Recursive upload failed at `%s': %s" msgstr "" -#: src/fs/fs_publish.c:1106 +#: src/fs/fs_publish.c:868 #, c-format msgid "Recursive upload failed: %s" msgstr "" -#: src/fs/fs_publish.c:1146 +#: src/fs/fs_publish.c:915 msgid "needs to be an actual file" msgstr "" -#: src/fs/fs_publish.c:1385 +#: src/fs/fs_publish.c:1151 #, c-format -msgid "Datastore failure: %s" +msgid "Insufficient space for publishing: %s" msgstr "" -#: src/fs/fs_publish.c:1476 +#: src/fs/fs_publish.c:1243 #, c-format msgid "Reserving space for %u entries and %llu bytes for publication\n" msgstr "" -#: src/fs/fs_publish_ksk.c:220 +#: src/fs/fs_publish_ksk.c:219 msgid "Could not connect to datastore." msgstr "" -#: src/fs/fs_publish_ublock.c:241 +#: src/fs/fs_publish_ublock.c:219 msgid "Internal error." -msgstr "" +msgstr "Errore interno." -#: src/fs/fs_search.c:822 src/fs/fs_search.c:892 +#: src/fs/fs_search.c:813 #, c-format msgid "Failed to parse URI `%s': %s\n" msgstr "" -#: src/fs/fs_search.c:979 +#: src/fs/fs_search.c:872 #, c-format msgid "Got result with unknown block type `%d', ignoring" msgstr "" -#: src/fs/fs_unindex.c:63 +#: src/fs/fs_unindex.c:59 msgid "Failed to find given position in file" msgstr "" -#: src/fs/fs_unindex.c:68 +#: src/fs/fs_unindex.c:64 msgid "Failed to read file" +msgstr "Impossibile leggere il file" + +#: src/fs/fs_unindex.c:234 +msgid "Unexpected time for a response from `fs' service." +msgstr "" + +#: src/fs/fs_unindex.c:242 +msgid "Timeout waiting for `fs' service." msgstr "" -#: src/fs/fs_unindex.c:275 -msgid "Error communicating with `fs' service." +#: src/fs/fs_unindex.c:250 +msgid "Invalid response from `fs' service." msgstr "" -#: src/fs/fs_unindex.c:326 +#: src/fs/fs_unindex.c:291 msgid "Failed to connect to FS service for unindexing." msgstr "" -#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388 +#: src/fs/fs_unindex.c:347 src/fs/fs_unindex.c:359 msgid "Failed to get KSKs from directory scan." msgstr "" -#: src/fs/fs_unindex.c:384 +#: src/fs/fs_unindex.c:355 #, c-format msgid "Internal error scanning `%s'.\n" msgstr "" -#: src/fs/fs_unindex.c:443 +#: src/fs/fs_unindex.c:414 #, c-format msgid "Failed to remove UBlock: %s\n" msgstr "" -#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652 +#: src/fs/fs_unindex.c:562 src/fs/fs_unindex.c:626 msgid "Failed to connect to `datastore' service." msgstr "" -#: src/fs/fs_unindex.c:665 +#: src/fs/fs_unindex.c:639 msgid "Failed to open file for unindexing." msgstr "" -#: src/fs/fs_unindex.c:704 +#: src/fs/fs_unindex.c:673 msgid "Failed to compute hash of file." -msgstr "" +msgstr "Impossibile calcolare l'hash del file." -#: src/fs/fs_uri.c:236 +#: src/fs/fs_uri.c:222 #, no-c-format -msgid "Malformed KSK URI (`%' must be followed by HEX number)" +msgid "`%' must be followed by HEX number" msgstr "" -#: src/fs/fs_uri.c:295 +#: src/fs/fs_uri.c:281 msgid "Malformed KSK URI (must not begin or end with `+')" msgstr "" -#: src/fs/fs_uri.c:313 -msgid "Malformed KSK URI (`++' not allowed)" -msgstr "" - -#: src/fs/fs_uri.c:320 -msgid "Malformed KSK URI (quotes not balanced)" -msgstr "" - -#: src/fs/fs_uri.c:390 -msgid "Malformed SKS URI (wrong syntax)" -msgstr "" - -#: src/fs/fs_uri.c:431 -msgid "Malformed CHK URI (wrong syntax)" +#: src/fs/fs_uri.c:299 +msgid "`++' not allowed in KSK URI" msgstr "" -#: src/fs/fs_uri.c:446 -msgid "Malformed CHK URI (failed to decode CHK)" +#: src/fs/fs_uri.c:306 +msgid "Quotes not balanced in KSK URI" msgstr "" -#: src/fs/fs_uri.c:525 -msgid "LOC URI malformed (wrong syntax)" +#: src/fs/fs_uri.c:376 +msgid "Malformed SKS URI" msgstr "" -#: src/fs/fs_uri.c:540 -msgid "LOC URI malformed (no CHK)" +#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434 +msgid "Malformed CHK URI" msgstr "" -#: src/fs/fs_uri.c:550 -msgid "LOC URI malformed (missing LOC)" +#: src/fs/fs_uri.c:512 src/fs/fs_uri.c:580 +msgid "SKS URI malformed" msgstr "" -#: src/fs/fs_uri.c:558 -msgid "LOC URI malformed (wrong syntax for public key)" +#: src/fs/fs_uri.c:527 src/fs/fs_uri.c:537 +msgid "LOC URI malformed" msgstr "" -#: src/fs/fs_uri.c:566 +#: src/fs/fs_uri.c:545 src/fs/fs_uri.c:553 msgid "LOC URI malformed (could not decode public key)" msgstr "" -#: src/fs/fs_uri.c:572 -msgid "LOC URI malformed (could not find signature)" -msgstr "" - -#: src/fs/fs_uri.c:578 -msgid "LOC URI malformed (wrong syntax for signature)" +#: src/fs/fs_uri.c:559 +msgid "SKS URI malformed (could not find signature)" msgstr "" -#: src/fs/fs_uri.c:587 -msgid "LOC URI malformed (could not decode signature)" +#: src/fs/fs_uri.c:565 src/fs/fs_uri.c:574 +msgid "SKS URI malformed (could not decode signature)" msgstr "" -#: src/fs/fs_uri.c:593 -msgid "LOC URI malformed (wrong syntax for expiration time)" +#: src/fs/fs_uri.c:586 +msgid "SKS URI malformed (could not parse expiration time)" msgstr "" -#: src/fs/fs_uri.c:599 -msgid "LOC URI malformed (could not parse expiration time)" +#: src/fs/fs_uri.c:598 +msgid "SKS URI malformed (signature failed validation)" msgstr "" -#: src/fs/fs_uri.c:611 -msgid "LOC URI malformed (signature failed validation)" +#: src/fs/fs_uri.c:636 +msgid "Unrecognized URI type" msgstr "" -#: src/fs/fs_uri.c:645 -msgid "invalid argument" +#: src/fs/fs_uri.c:860 +msgid "Lacking key configuration settings.\n" msgstr "" -#: src/fs/fs_uri.c:657 -msgid "Unrecognized URI type" +#: src/fs/fs_uri.c:866 +#, c-format +msgid "Could not access hostkey file `%s'.\n" msgstr "" -#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088 +#: src/fs/fs_uri.c:1050 src/fs/fs_uri.c:1077 msgid "No keywords specified!\n" msgstr "" -#: src/fs/fs_uri.c:1094 +#: src/fs/fs_uri.c:1083 msgid "Number of double-quotes not balanced!\n" msgstr "" -#: src/fs/gnunet-auto-share.c:232 +#: src/fs/gnunet-auto-share.c:236 #, c-format msgid "Failed to load state: %s\n" msgstr "" -#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295 -#: src/fs/gnunet-auto-share.c:305 +#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299 +#: src/fs/gnunet-auto-share.c:309 #, c-format msgid "Failed to save state to file %s\n" msgstr "" -#: src/fs/gnunet-auto-share.c:407 +#: src/fs/gnunet-auto-share.c:401 #, c-format msgid "Publication of `%s' done\n" msgstr "" -#: src/fs/gnunet-auto-share.c:494 +#: src/fs/gnunet-auto-share.c:488 #, c-format msgid "Publishing `%s'\n" msgstr "" -#: src/fs/gnunet-auto-share.c:504 +#: src/fs/gnunet-auto-share.c:497 #, c-format msgid "Failed to run `%s'\n" msgstr "" -#: src/fs/gnunet-auto-share.c:713 +#: src/fs/gnunet-auto-share.c:686 #, c-format -msgid "" -"You must specify one and only one directory name for automatic publication.\n" +msgid "You must specify one and only one directory name for automatic publication.\n" msgstr "" -#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:903 +#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824 msgid "set the desired LEVEL of sender-anonymity" msgstr "" -#: src/fs/gnunet-auto-share.c:772 +#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828 msgid "disable adding the creation time to the metadata of the uploaded file" msgstr "" -#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:907 +#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831 msgid "do not use libextractor to add keywords or metadata" msgstr "" -#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944 +#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855 msgid "specify the priority of the content" msgstr "" -#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:955 +#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862 msgid "set the desired replication LEVEL" msgstr "" -#: src/fs/gnunet-auto-share.c:813 +#: src/fs/gnunet-auto-share.c:770 msgid "Automatically publish files from a directory on GNUnet" msgstr "" -#: src/fs/gnunet-daemon-fsprofiler.c:648 +#: src/fs/gnunet-daemon-fsprofiler.c:660 msgid "Daemon to use file-sharing to measure its performance." msgstr "" -#: src/fs/gnunet-directory.c:53 +#: src/fs/gnunet-directory.c:49 #, c-format msgid "\t\n" msgstr "" -#: src/fs/gnunet-directory.c:105 +#: src/fs/gnunet-directory.c:94 #, c-format msgid "Directory `%s' meta data:\n" msgstr "" -#: src/fs/gnunet-directory.c:108 +#: src/fs/gnunet-directory.c:97 #, c-format msgid "Directory `%s' contents:\n" msgstr "" -#: src/fs/gnunet-directory.c:143 +#: src/fs/gnunet-directory.c:132 msgid "You must specify a filename to inspect.\n" msgstr "" -#: src/fs/gnunet-directory.c:156 +#: src/fs/gnunet-directory.c:145 #, c-format msgid "Failed to read directory `%s'\n" msgstr "" -#: src/fs/gnunet-directory.c:165 +#: src/fs/gnunet-directory.c:154 #, c-format msgid "`%s' is not a GNUnet directory\n" msgstr "" -#: src/fs/gnunet-directory.c:194 +#: src/fs/gnunet-directory.c:183 msgid "Display contents of a GNUnet directory" msgstr "" -#: src/fs/gnunet-download.c:139 +#: src/fs/gnunet-download.c:137 #, c-format msgid "Starting download `%s'.\n" msgstr "" -#: src/fs/gnunet-download.c:149 +#: src/fs/gnunet-download.c:147 msgid "" msgstr "" -#: src/fs/gnunet-download.c:158 +#: src/fs/gnunet-download.c:157 #, c-format -msgid "" -"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to " -"download\n" +msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to download\n" msgstr "" -#: src/fs/gnunet-download.c:184 +#: src/fs/gnunet-download.c:179 #, c-format msgid "Error downloading: %s.\n" msgstr "" -#: src/fs/gnunet-download.c:201 +#: src/fs/gnunet-download.c:194 #, c-format msgid "Downloading `%s' done (%s/s).\n" msgstr "" -#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295 -#: src/fs/gnunet-search.c:215 src/fs/gnunet-unindex.c:107 +#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286 +#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108 #, c-format msgid "Unexpected status: %d\n" msgstr "" -#: src/fs/gnunet-download.c:246 +#: src/fs/gnunet-download.c:234 msgid "You need to specify a URI argument.\n" msgstr "" -#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:727 +#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665 #, c-format msgid "Failed to parse URI: %s\n" msgstr "" -#: src/fs/gnunet-download.c:264 +#: src/fs/gnunet-download.c:247 msgid "Only CHK or LOC URIs supported.\n" msgstr "" -#: src/fs/gnunet-download.c:273 +#: src/fs/gnunet-download.c:254 msgid "Target filename must be specified.\n" msgstr "" -#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:872 -#: src/fs/gnunet-search.c:273 src/fs/gnunet-unindex.c:139 +#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797 +#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140 #, c-format msgid "Could not initialize `%s' subsystem.\n" msgstr "" -#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:315 +#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289 msgid "set the desired LEVEL of receiver-anonymity" msgstr "" -#: src/fs/gnunet-download.c:344 +#: src/fs/gnunet-download.c:308 msgid "delete incomplete downloads (when aborted with CTRL-C)" msgstr "" -#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319 +#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292 msgid "only search the local peer (no P2P network search)" msgstr "" -#: src/fs/gnunet-download.c:354 +#: src/fs/gnunet-download.c:314 msgid "write the file to FILENAME" msgstr "" -#: src/fs/gnunet-download.c:359 +#: src/fs/gnunet-download.c:318 msgid "set the maximum number of parallel downloads that is allowed" msgstr "" -#: src/fs/gnunet-download.c:364 +#: src/fs/gnunet-download.c:322 msgid "set the maximum number of parallel requests for blocks that is allowed" msgstr "" -#: src/fs/gnunet-download.c:368 +#: src/fs/gnunet-download.c:325 msgid "download a GNUnet directory recursively" msgstr "" -#: src/fs/gnunet-download.c:386 -msgid "" -"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/" -"chk/...)" +#: src/fs/gnunet-download.c:339 +msgid "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/chk/...)" msgstr "" -#: src/fs/gnunet-fs.c:119 +#: src/fs/gnunet-fs.c:117 msgid "print a list of all indexed files" msgstr "" -#: src/fs/gnunet-fs.c:130 +#: src/fs/gnunet-fs.c:127 msgid "Special file-sharing operations" msgstr "" -#: src/fs/gnunet-fs-profiler.c:211 +#: src/fs/gnunet-fs-profiler.c:193 msgid "run the experiment with COUNT peers" msgstr "" -#: src/fs/gnunet-fs-profiler.c:217 +#: src/fs/gnunet-fs-profiler.c:196 msgid "specifies name of a file with the HOSTS the testbed should use" msgstr "" -#: src/fs/gnunet-fs-profiler.c:223 +#: src/fs/gnunet-fs-profiler.c:199 msgid "automatically terminate experiment after DELAY" msgstr "" -#: src/fs/gnunet-fs-profiler.c:233 +#: src/fs/gnunet-fs-profiler.c:208 msgid "run a testbed to measure file-sharing performance" msgstr "" -#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 +#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" msgstr "" -#: src/fs/gnunet-publish.c:239 +#: src/fs/gnunet-publish.c:250 #, c-format msgid "Error publishing: %s.\n" msgstr "" -#: src/fs/gnunet-publish.c:246 +#: src/fs/gnunet-publish.c:260 #, c-format msgid "Publishing `%s' done.\n" msgstr "" -#: src/fs/gnunet-publish.c:251 +#: src/fs/gnunet-publish.c:264 #, c-format msgid "URI is `%s'.\n" msgstr "" "L'URI è `%s'.\n" "\n" -#: src/fs/gnunet-publish.c:259 -#, fuzzy, c-format -msgid "Namespace URI is `%s'.\n" -msgstr "" -"L'URI è `%s'.\n" -"\n" - -#: src/fs/gnunet-publish.c:275 -msgid "Starting cleanup after abort\n" +#: src/fs/gnunet-publish.c:283 +msgid "Cleanup after abort complete.\n" msgstr "" -#: src/fs/gnunet-publish.c:282 -msgid "Cleanup after abort completed.\n" -msgstr "" - -#: src/fs/gnunet-publish.c:288 -msgid "Cleanup after abort failed.\n" -msgstr "" - -#: src/fs/gnunet-publish.c:430 +#: src/fs/gnunet-publish.c:401 #, c-format msgid "Meta data for file `%s' (%s)\n" msgstr "" -#: src/fs/gnunet-publish.c:435 +#: src/fs/gnunet-publish.c:403 #, c-format msgid "Keywords for file `%s' (%s)\n" msgstr "" -#: src/fs/gnunet-publish.c:590 +#: src/fs/gnunet-publish.c:542 msgid "Could not publish\n" msgstr "" -#: src/fs/gnunet-publish.c:615 +#: src/fs/gnunet-publish.c:565 msgid "Could not start publishing.\n" msgstr "" -#: src/fs/gnunet-publish.c:649 +#: src/fs/gnunet-publish.c:598 #, c-format msgid "Scanning directory `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:653 +#: src/fs/gnunet-publish.c:600 #, c-format msgid "Scanning file `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:659 +#: src/fs/gnunet-publish.c:605 #, c-format msgid "There was trouble processing file `%s', skipping it.\n" msgstr "" -#: src/fs/gnunet-publish.c:666 +#: src/fs/gnunet-publish.c:610 msgid "Preprocessing complete.\n" msgstr "" -#: src/fs/gnunet-publish.c:671 +#: src/fs/gnunet-publish.c:614 #, c-format msgid "Extracting meta data from file `%s' complete.\n" msgstr "" -#: src/fs/gnunet-publish.c:678 +#: src/fs/gnunet-publish.c:618 msgid "Meta data extraction has finished.\n" msgstr "" -#: src/fs/gnunet-publish.c:687 -msgid "Error scanning directory.\n" -msgstr "" +#: src/fs/gnunet-publish.c:625 +#, fuzzy +#| msgid "Internal error." +msgid "Internal error scanning directory.\n" +msgstr "Errore interno." -#: src/fs/gnunet-publish.c:715 +#: src/fs/gnunet-publish.c:656 #, c-format msgid "Selected pseudonym `%s' unknown\n" msgstr "" -#: src/fs/gnunet-publish.c:749 +#: src/fs/gnunet-publish.c:682 #, c-format msgid "Failed to access `%s': %s\n" msgstr "" -#: src/fs/gnunet-publish.c:763 -msgid "" -"Failed to start meta directory scanner. Is gnunet-helper-publish-fs " -"installed?\n" +#: src/fs/gnunet-publish.c:695 +msgid "Failed to start meta directory scanner. Is gnunet-helper-publish-fs installed?\n" msgstr "" -#: src/fs/gnunet-publish.c:819 +#: src/fs/gnunet-publish.c:747 #, c-format msgid "Cannot extract metadata from a URI!\n" msgstr "" -#: src/fs/gnunet-publish.c:826 +#: src/fs/gnunet-publish.c:754 #, c-format msgid "You must specify one and only one filename for insertion.\n" msgstr "" -#: src/fs/gnunet-publish.c:832 +#: src/fs/gnunet-publish.c:760 #, c-format msgid "You must NOT specify an URI and a filename.\n" msgstr "" -#: src/fs/gnunet-publish.c:840 src/vpn/gnunet-vpn.c:210 +#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209 #, c-format msgid "Option `%s' is required when using option `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:851 src/fs/gnunet-publish.c:859 -#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309 +#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785 +#: src/transport/gnunet-transport.c:1284 src/transport/gnunet-transport.c:1314 +#: src/transport/gnunet-transport.c:1344 #, c-format msgid "Option `%s' makes no sense without option `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:911 -msgid "enable adding the creation time to the metadata of the uploaded file" -msgstr "" - -#: src/fs/gnunet-publish.c:916 -msgid "" -"print list of extracted keywords that would be used, but do not perform " -"upload" +#: src/fs/gnunet-publish.c:835 +msgid "print list of extracted keywords that would be used, but do not perform upload" msgstr "" -#: src/fs/gnunet-publish.c:922 -msgid "" -"add an additional keyword for the top-level file or directory (this option " -"can be specified multiple times)" +#: src/fs/gnunet-publish.c:839 +msgid "add an additional keyword for the top-level file or directory (this option can be specified multiple times)" msgstr "" -#: src/fs/gnunet-publish.c:928 +#: src/fs/gnunet-publish.c:843 msgid "set the meta-data for the given TYPE to the given VALUE" msgstr "" -#: src/fs/gnunet-publish.c:932 -msgid "" -"do not index, perform full insertion (stores entire file in encrypted form " -"in GNUnet database)" +#: src/fs/gnunet-publish.c:846 +msgid "do not index, perform full insertion (stores entire file in encrypted form in GNUnet database)" msgstr "" -#: src/fs/gnunet-publish.c:938 -msgid "" -"specify ID of an updated version to be published in the future (for " -"namespace insertions only)" +#: src/fs/gnunet-publish.c:851 +msgid "specify ID of an updated version to be published in the future (for namespace insertions only)" msgstr "" -#: src/fs/gnunet-publish.c:949 +#: src/fs/gnunet-publish.c:859 msgid "publish the files under the pseudonym NAME (place file into namespace)" msgstr "" -#: src/fs/gnunet-publish.c:959 -msgid "" -"only simulate the process but do not do any actual publishing (useful to " -"compute URIs)" +#: src/fs/gnunet-publish.c:865 +msgid "only simulate the process but do not do any actual publishing (useful to compute URIs)" msgstr "" -#: src/fs/gnunet-publish.c:965 -msgid "" -"set the ID of this version of the publication (for namespace insertions only)" +#: src/fs/gnunet-publish.c:869 +msgid "set the ID of this version of the publication (for namespace insertions only)" msgstr "" -#: src/fs/gnunet-publish.c:971 -msgid "" -"URI to be published (can be used instead of passing a file to add keywords " -"to the file with the respective URI)" +#: src/fs/gnunet-publish.c:873 +msgid "URI to be published (can be used instead of passing a file to add keywords to the file with the respective URI)" msgstr "" -#: src/fs/gnunet-publish.c:989 +#: src/fs/gnunet-publish.c:889 msgid "Publish a file or directory on GNUnet" msgstr "" -#: src/fs/gnunet-search.c:127 +#: src/fs/gnunet-search.c:114 #, c-format msgid "Failed to write directory with search results to `%s'\n" msgstr "" -#: src/fs/gnunet-search.c:207 +#: src/fs/gnunet-search.c:191 #, c-format msgid "Error searching: %s.\n" msgstr "" -#: src/fs/gnunet-search.c:263 +#: src/fs/gnunet-search.c:240 msgid "Could not create keyword URI from arguments.\n" msgstr "" -#: src/fs/gnunet-search.c:287 +#: src/fs/gnunet-search.c:264 msgid "Could not start searching.\n" msgstr "" -#: src/fs/gnunet-search.c:324 +#: src/fs/gnunet-search.c:295 msgid "write search results to file starting with PREFIX" msgstr "" -#: src/fs/gnunet-search.c:329 +#: src/fs/gnunet-search.c:298 msgid "automatically terminate search after DELAY" msgstr "" -#: src/fs/gnunet-search.c:335 +#: src/fs/gnunet-search.c:305 msgid "automatically terminate search after VALUE results are found" msgstr "" -#: src/fs/gnunet-search.c:351 +#: src/fs/gnunet-search.c:316 msgid "Search GNUnet for files that were published on GNUnet" msgstr "" -#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882 -msgid "# client searches active" -msgstr "" - -#: src/fs/gnunet-service-fs.c:436 -msgid "# replies received for local clients" -msgstr "" - -#: src/fs/gnunet-service-fs.c:605 +#: src/fs/gnunet-service-fs.c:271 msgid "# running average P2P latency (ms)" msgstr "" -#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564 +#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539 msgid "# Loopback routes suppressed" msgstr "" -#: src/fs/gnunet-service-fs.c:836 -msgid "# client searches received" +#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288 +#: src/topology/gnunet-daemon-topology.c:1254 +#: src/topology/gnunet-daemon-topology.c:1261 +#, c-format +msgid "Failed to connect to `%s' service.\n" msgstr "" -#: src/fs/gnunet-service-fs.c:875 -msgid "# client searches updated (merged content seen list)" +#: src/fs/gnunet-service-fs_cp.c:682 +msgid "# migration stop messages received" msgstr "" -#: src/fs/gnunet-service-fs.c:1040 +#: src/fs/gnunet-service-fs_cp.c:686 #, c-format -msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n" +msgid "Migration of content to peer `%s' blocked for %s\n" msgstr "" -#: src/fs/gnunet-service-fs.c:1280 -msgid "FS service is lacking HOSTKEY configuration setting. Exiting.\n" +#: src/fs/gnunet-service-fs_cp.c:721 +msgid "# replies transmitted to other peers" msgstr "" -#: src/fs/gnunet-service-fs.c:1305 src/hostlist/gnunet-daemon-hostlist.c:355 -#: src/topology/gnunet-daemon-topology.c:1202 -#, c-format -msgid "Failed to connect to `%s' service.\n" +#: src/fs/gnunet-service-fs_cp.c:727 +msgid "# replies dropped" msgstr "" -#: src/fs/gnunet-service-fs_cadet_client.c:370 -msgid "# replies received via cadet" +#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301 +msgid "# P2P searches active" msgstr "" -#: src/fs/gnunet-service-fs_cadet_client.c:384 -msgid "# replies received via cadet dropped" +#: src/fs/gnunet-service-fs_cp.c:845 +msgid "# artificial delays introduced (ms)" msgstr "" -#: src/fs/gnunet-service-fs_cadet_server.c:265 -msgid "# queries received via CADET not answered" +#: src/fs/gnunet-service-fs_cp.c:898 +msgid "# replies dropped due to type mismatch" msgstr "" -#: src/fs/gnunet-service-fs_cadet_server.c:320 -msgid "# Blocks transferred via cadet" +#: src/fs/gnunet-service-fs_cp.c:906 +msgid "# replies received for other peers" msgstr "" -#: src/fs/gnunet-service-fs_cadet_server.c:346 -msgid "# queries received via cadet" +#: src/fs/gnunet-service-fs_cp.c:920 +msgid "# replies dropped due to insufficient cover traffic" msgstr "" -#: src/fs/gnunet-service-fs_cadet_server.c:388 -#, fuzzy -msgid "# cadet client connections rejected" -msgstr "# connessioni attive" - -#: src/fs/gnunet-service-fs_cadet_server.c:395 -#: src/fs/gnunet-service-fs_cadet_server.c:435 -#, fuzzy -msgid "# cadet connections active" -msgstr "# connessioni attive" - -#: src/fs/gnunet-service-fs_cp.c:685 -msgid "# migration stop messages received" +#: src/fs/gnunet-service-fs_cp.c:958 +msgid "# P2P searches destroyed due to ultimate reply" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:689 -#, c-format -msgid "Migration of content to peer `%s' blocked for %s\n" +#: src/fs/gnunet-service-fs_cp.c:1026 +msgid "# requests done for free (low load)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:722 src/fs/gnunet-service-fs_cp.c:1344 -msgid "# P2P searches active" +#: src/fs/gnunet-service-fs_cp.c:1051 +msgid "# request dropped, priority insufficient" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:817 -msgid "# artificial delays introduced (ms)" -msgstr "" - -#: src/fs/gnunet-service-fs_cp.c:874 -msgid "# replies dropped due to type mismatch" -msgstr "" - -#: src/fs/gnunet-service-fs_cp.c:882 -msgid "# replies received for other peers" -msgstr "" - -#: src/fs/gnunet-service-fs_cp.c:896 -msgid "# replies dropped due to insufficient cover traffic" -msgstr "" - -#: src/fs/gnunet-service-fs_cp.c:943 -msgid "# P2P searches destroyed due to ultimate reply" -msgstr "" - -#: src/fs/gnunet-service-fs_cp.c:1014 -msgid "# requests done for free (low load)" -msgstr "" - -#: src/fs/gnunet-service-fs_cp.c:1039 -msgid "# request dropped, priority insufficient" -msgstr "" - -#: src/fs/gnunet-service-fs_cp.c:1049 +#: src/fs/gnunet-service-fs_cp.c:1061 msgid "# requests done for a price (normal load)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1147 -msgid "# requests dropped due to higher-TTL request" +#: src/fs/gnunet-service-fs_cp.c:1139 +msgid "# GET requests received (from other peers)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1204 -msgid "# GET requests received (from other peers)" +#: src/fs/gnunet-service-fs_cp.c:1173 +msgid "# requests dropped due to initiator not being connected" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1227 +#: src/fs/gnunet-service-fs_cp.c:1195 msgid "# requests dropped due to missing reverse route" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1240 -msgid "# requests dropped due to full reply queue" +#: src/fs/gnunet-service-fs_cp.c:1246 +msgid "# requests dropped due TTL underflow" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1296 -msgid "# requests dropped due TTL underflow" +#: src/fs/gnunet-service-fs_cp.c:1270 +msgid "# requests dropped due to higher-TTL request" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1340 +#: src/fs/gnunet-service-fs_cp.c:1299 msgid "# P2P query messages received and processed" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1707 +#: src/fs/gnunet-service-fs_cp.c:1670 msgid "# migration stop messages sent" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:134 -#: src/fs/gnunet-service-fs_indexing.c:195 +#: src/fs/gnunet-service-fs_indexing.c:130 +#: src/fs/gnunet-service-fs_indexing.c:181 #, c-format msgid "Could not open `%s'.\n" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:151 +#: src/fs/gnunet-service-fs_indexing.c:142 #, c-format msgid "Error writing `%s'.\n" +msgstr "Errore durante la scrittura di `%s'.\n" + +#: src/fs/gnunet-service-fs_indexing.c:237 +#, c-format +msgid "Index request received for file `%s' is already indexed as `%s'. Permitting anyway.\n" +msgstr "" + +#: src/fs/gnunet-service-fs_indexing.c:275 +#, c-format +msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:253 +#: src/fs/gnunet-service-fs_indexing.c:477 #, c-format msgid "Failed to delete bogus block: %s\n" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:331 +#: src/fs/gnunet-service-fs_indexing.c:542 msgid "# index blocks removed: original file inaccessible" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:357 +#: src/fs/gnunet-service-fs_indexing.c:557 #, c-format msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:361 +#: src/fs/gnunet-service-fs_indexing.c:559 msgid "not indexed" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:394 +#: src/fs/gnunet-service-fs_indexing.c:574 #, c-format msgid "Indexed file `%s' changed at offset %llu\n" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:518 -#, c-format -msgid "" -"Index request received for file `%s' is already indexed as `%s'. Permitting " -"anyway.\n" +#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368 +msgid "# client searches active" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:265 -msgid "# average retransmission delay (ms)" +#: src/fs/gnunet-service-fs_lc.c:256 +msgid "# replies received for local clients" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:427 -msgid "# delay heap timeout (ms)" +#: src/fs/gnunet-service-fs_lc.c:327 +msgid "# client searches received" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:438 -msgid "# query plans executed" +#: src/fs/gnunet-service-fs_lc.c:362 +msgid "# client searches updated (merged content seen list)" +msgstr "" + +#: src/fs/gnunet-service-fs_mesh_client.c:484 +msgid "# replies received via mesh" +msgstr "" + +#: src/fs/gnunet-service-fs_mesh_client.c:498 +msgid "# replies received via mesh dropped" +msgstr "" + +#: src/fs/gnunet-service-fs_mesh_server.c:260 +msgid "# Blocks transferred via mesh" +msgstr "" + +#: src/fs/gnunet-service-fs_mesh_server.c:352 +msgid "# queries received via mesh not answered" +msgstr "" + +#: src/fs/gnunet-service-fs_mesh_server.c:432 +msgid "# queries received via mesh" +msgstr "" + +#: src/fs/gnunet-service-fs_mesh_server.c:476 +#, fuzzy +#| msgid "# active connections" +msgid "# mesh client connections rejected" +msgstr "# connessioni attive" + +#: src/fs/gnunet-service-fs_mesh_server.c:482 +#: src/fs/gnunet-service-fs_mesh_server.c:522 +#, fuzzy +#| msgid "# active connections" +msgid "# mesh connections active" +msgstr "# connessioni attive" + +#: src/fs/gnunet-service-fs_pe.c:269 +msgid "# average retransmission delay (ms)" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:466 +#: src/fs/gnunet-service-fs_pe.c:400 +msgid "# transmission failed (core has no bandwidth)" +msgstr "" + +#: src/fs/gnunet-service-fs_pe.c:433 msgid "# query messages sent to other peers" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:536 +#: src/fs/gnunet-service-fs_pe.c:484 +msgid "# delay heap timeout (ms)" +msgstr "" + +#: src/fs/gnunet-service-fs_pe.c:492 +msgid "# query plans executed" +msgstr "" + +#: src/fs/gnunet-service-fs_pe.c:552 msgid "# requests merged" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:546 +#: src/fs/gnunet-service-fs_pe.c:560 msgid "# requests refreshed" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709 -#: src/fs/gnunet-service-fs_pe.c:788 +#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700 +#: src/fs/gnunet-service-fs_pe.c:771 msgid "# query plan entries" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:330 +#: src/fs/gnunet-service-fs_pr.c:311 msgid "# Pending requests created" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677 +#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645 msgid "# Pending requests active" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:858 +#: src/fs/gnunet-service-fs_pr.c:814 msgid "# replies received and matched" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:894 +#: src/fs/gnunet-service-fs_pr.c:844 msgid "# duplicate replies discarded (bloomfilter)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:903 +#: src/fs/gnunet-service-fs_pr.c:853 msgid "# irrelevant replies discarded" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:918 +#: src/fs/gnunet-service-fs_pr.c:867 #, c-format msgid "Unsupported block type %u\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:935 +#: src/fs/gnunet-service-fs_pr.c:880 msgid "# results found locally" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1065 +#: src/fs/gnunet-service-fs_pr.c:1001 msgid "# Datastore `PUT' failures" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1093 +#: src/fs/gnunet-service-fs_pr.c:1029 msgid "# storage requests dropped due to high load" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1131 +#: src/fs/gnunet-service-fs_pr.c:1064 msgid "# Replies received from DHT" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1262 -msgid "# Replies received from CADET" +#: src/fs/gnunet-service-fs_pr.c:1192 +msgid "# Replies received from MESH" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1314 +#: src/fs/gnunet-service-fs_pr.c:1244 #, c-format msgid "Datastore lookup already took %s!\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1335 +#: src/fs/gnunet-service-fs_pr.c:1264 #, c-format msgid "On-demand lookup already took %s!\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1395 -msgid "# requested DBLOCK or IBLOCK not found" -msgstr "" - -#: src/fs/gnunet-service-fs_pr.c:1454 -msgid "# Datastore lookups concluded (error queueing)" -msgstr "" - -#: src/fs/gnunet-service-fs_pr.c:1509 +#: src/fs/gnunet-service-fs_pr.c:1311 msgid "# Datastore lookups concluded (no results)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1524 +#: src/fs/gnunet-service-fs_pr.c:1326 msgid "# Datastore lookups concluded (seen all)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1548 +#: src/fs/gnunet-service-fs_pr.c:1335 msgid "# Datastore lookups aborted (more than MAX_RESULTS)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1562 +#: src/fs/gnunet-service-fs_pr.c:1350 +msgid "# requested DBLOCK or IBLOCK not found" +msgstr "" + +#: src/fs/gnunet-service-fs_pr.c:1364 msgid "# on-demand blocks matched requests" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1583 +#: src/fs/gnunet-service-fs_pr.c:1377 msgid "# on-demand lookups performed successfully" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1588 +#: src/fs/gnunet-service-fs_pr.c:1382 msgid "# on-demand lookups failed" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1626 +#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449 +#: src/fs/gnunet-service-fs_pr.c:1590 +msgid "# Datastore lookups concluded (error queueing)" +msgstr "" + +#: src/fs/gnunet-service-fs_pr.c:1467 msgid "# Datastore lookups concluded (found last result)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1639 +#: src/fs/gnunet-service-fs_pr.c:1478 msgid "# Datastore lookups concluded (load too high)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1693 +#: src/fs/gnunet-service-fs_pr.c:1566 msgid "# Datastore lookups initiated" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1749 +#: src/fs/gnunet-service-fs_pr.c:1651 msgid "# GAP PUT messages received" msgstr "" -#: src/fs/gnunet-service-fs_push.c:646 +#: src/fs/gnunet-service-fs_push.c:631 msgid "time required, content pushing disabled" msgstr "" @@ -3803,2434 +3720,2284 @@ msgstr "" msgid "Unindexing done.\n" msgstr "" -#: src/fs/gnunet-unindex.c:129 +#: src/fs/gnunet-unindex.c:130 #, c-format msgid "You must specify one and only one filename for unindexing.\n" msgstr "" -#: src/fs/gnunet-unindex.c:146 +#: src/fs/gnunet-unindex.c:147 msgid "Could not start unindex operation.\n" msgstr "" -#: src/fs/gnunet-unindex.c:178 +#: src/fs/gnunet-unindex.c:179 msgid "Unindex a file that was previously indexed with gnunet-publish." msgstr "" -#: src/gns/gns_tld_api.c:348 -msgid "Expected a base32-encoded public zone key\n" +#: src/gns/gns_api.c:393 +msgid "Failed to deserialize lookup reply from GNS service!\n" msgstr "" -#: src/gns/gnunet-bcd.c:127 +#: src/gns/gnunet-bcd.c:123 #, c-format msgid "Refusing `%s' request to HTTP server\n" msgstr "" -#: src/gns/gnunet-bcd.c:357 +#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567 #, c-format -msgid "Invalid port number %u. Exiting.\n" +msgid "Invalid port number %llu. Exiting.\n" msgstr "" -#: src/gns/gnunet-bcd.c:362 +#: src/gns/gnunet-bcd.c:360 #, c-format -msgid "Businesscard HTTP server starts on %u\n" +msgid "Businesscard HTTP server starts on %llu\n" msgstr "" -#: src/gns/gnunet-bcd.c:376 +#: src/gns/gnunet-bcd.c:374 #, c-format msgid "Could not start businesscard HTTP server on port %u\n" msgstr "" -#: src/gns/gnunet-bcd.c:523 +#: src/gns/gnunet-bcd.c:519 msgid "Run HTTP serve on port PORT (default is 8888)" msgstr "" -#: src/gns/gnunet-bcd.c:536 +#: src/gns/gnunet-bcd.c:531 msgid "GNUnet HTTP server to create business cards" msgstr "" -#: src/gns/gnunet-dns2gns.c:214 +#: src/gns/gnunet-dns2gns.c:228 msgid "Failed to pack DNS response into UDP packet!\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:416 +#: src/gns/gnunet-dns2gns.c:400 #, c-format msgid "Cannot parse DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:432 +#: src/gns/gnunet-dns2gns.c:416 #, c-format msgid "Received malformed DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:440 +#: src/gns/gnunet-dns2gns.c:424 #, c-format msgid "Received unsupported DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:600 +#: src/gns/gnunet-dns2gns.c:701 +msgid "No ego configured for `dns2gns` subsystem\n" +msgstr "" + +#: src/gns/gnunet-dns2gns.c:727 msgid "No DNS server specified!\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:748 +#: src/gns/gnunet-dns2gns.c:749 +msgid "No valid GNS zone specified!\n" +msgstr "" + +#: src/gns/gnunet-dns2gns.c:770 msgid "IP of recursive DNS resolver to use (required)" msgstr "" -#: src/gns/gnunet-dns2gns.c:753 -msgid "UDP port to listen on for inbound DNS requests; default: 2853" +#: src/gns/gnunet-dns2gns.c:773 +msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu" msgstr "" -#: src/gns/gnunet-dns2gns.c:770 +#: src/gns/gnunet-dns2gns.c:776 +msgid "Authoritative DNS suffix to use (optional); default: zkey.eu" +msgstr "" + +#: src/gns/gnunet-dns2gns.c:779 +msgid "UDP port to listen on for inbound DNS requests; default: 53" +msgstr "" + +#: src/gns/gnunet-dns2gns.c:782 +msgid "Public key of the GNS zone to use (overrides default)" +msgstr "" + +#: src/gns/gnunet-dns2gns.c:795 msgid "GNUnet DNS-to-GNS proxy (a DNS server)" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:582 -msgid "how long to wait between queries" +#: src/gns/gnunet-gns.c:227 +#, c-format +msgid "Please specify name to lookup!\n" +msgstr "" + +#: src/gns/gnunet-gns.c:308 +#, c-format +msgid "Ego for `%s' not found, cannot perform lookup.\n" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:587 -msgid "how long to wait for an answer" +#: src/gns/gnunet-gns.c:347 src/gns/gnunet-gns-helper-service-w32.c:798 +#, c-format +msgid "Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-gns-import.sh?\n" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:591 -msgid "look for GNS2DNS records instead of ANY" +#: src/gns/gnunet-gns.c:386 src/gns/gnunet-gns-helper-service-w32.c:828 +#, c-format +msgid "Failed to connect to GNS\n" msgstr "" -#: src/gns/gnunet-gns.c:199 +#: src/gns/gnunet-gns.c:399 #, c-format -msgid "Invalid typename specified, assuming `ANY'\n" +msgid "Public key `%s' is not well-formed\n" msgstr "" -#: src/gns/gnunet-gns.c:233 +#: src/gns/gnunet-gns.c:449 msgid "Lookup a record for the given name" msgstr "" -#: src/gns/gnunet-gns.c:238 +#: src/gns/gnunet-gns.c:452 msgid "Specify the type of the record to lookup" msgstr "" -#: src/gns/gnunet-gns.c:242 +#: src/gns/gnunet-gns.c:455 +msgid "Specify timeout for the lookup" +msgstr "" + +#: src/gns/gnunet-gns.c:458 msgid "No unneeded output" msgstr "" -#: src/gns/gnunet-gns.c:258 -msgid "GNUnet GNS resolver tool" +#: src/gns/gnunet-gns.c:461 +msgid "Specify the public key of the zone to lookup the record in" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:602 -msgid "Not ready to process requests, lacking ego data\n" +#: src/gns/gnunet-gns.c:464 +msgid "Specify the name of the ego of the zone to lookup the record in" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:701 -msgid "" -"Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-" -"gns-import.sh?\n" +#: src/gns/gnunet-gns.c:478 +msgid "GNUnet GNS resolver tool" +msgstr "" + +#: src/gns/gnunet-gns-helper-service-w32.c:768 +#, c-format +msgid "Ego for `gns-short' not found. This is not really fatal, but i'll pretend that it is and refuse to perform a lookup. Did you run gnunet-gns-import.sh?\n" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:739 +#: src/gns/gnunet-gns-helper-service-w32.c:838 #, c-format msgid "Failed to connect to identity service\n" msgstr "" -#: src/gns/gnunet-gns-import.c:452 +#: src/gns/gnunet-gns-import.c:479 msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" -#: src/gns/gnunet-gns-proxy.c:118 -#: src/hostlist/gnunet-daemon-hostlist_client.c:535 -#: src/hostlist/gnunet-daemon-hostlist_client.c:753 -#: src/hostlist/gnunet-daemon-hostlist_client.c:759 -#: src/hostlist/gnunet-daemon-hostlist_client.c:811 -#: src/hostlist/gnunet-daemon-hostlist_client.c:820 -#: src/hostlist/gnunet-daemon-hostlist_client.c:931 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1026 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1031 -#: src/transport/plugin_transport_http_client.c:598 -#: src/transport/plugin_transport_http_client.c:616 +#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469 +#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689 +#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750 +#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963 +#: src/hostlist/hostlist-client.c:968 +#: src/transport/plugin_transport_http_client.c:1062 +#: src/transport/plugin_transport_http_client.c:1077 #, c-format msgid "%s failed at %s:%d: `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:989 +#: src/gns/gnunet-gns-proxy.c:833 #, c-format -msgid "Unsupported CURL TLS backend %d\n" +msgid "Unsupported CURL SSL backend %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1014 +#: src/gns/gnunet-gns-proxy.c:856 #, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1035 +#: src/gns/gnunet-gns-proxy.c:879 #, c-format msgid "Failed to initialize DANE: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1050 +#: src/gns/gnunet-gns-proxy.c:892 #, c-format msgid "Failed to parse DANE record: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1065 +#: src/gns/gnunet-gns-proxy.c:907 #, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1075 +#: src/gns/gnunet-gns-proxy.c:917 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1099 +#: src/gns/gnunet-gns-proxy.c:941 #, c-format -msgid "TLS certificate subject name (%s) does not match `%s': %d\n" +msgid "SSL certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1230 +#: src/gns/gnunet-gns-proxy.c:1086 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2131 +#: src/gns/gnunet-gns-proxy.c:1602 #, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2652 +#: src/gns/gnunet-gns-proxy.c:1973 #, c-format msgid "Unable to import private key from file `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2684 -#, c-format -msgid "Unable to import certificate from `%s'\n" -msgstr "" +#: src/gns/gnunet-gns-proxy.c:2003 +#, fuzzy, c-format +#| msgid "Failed to create statistics!\n" +msgid "Unable to import certificate %s\n" +msgstr "Generazione statistiche fallita\n" -#: src/gns/gnunet-gns-proxy.c:2885 +#: src/gns/gnunet-gns-proxy.c:2177 #, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2907 src/rest/gnunet-rest-server.c:668 +#: src/gns/gnunet-gns-proxy.c:2196 msgid "Failed to pass client to MHD\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3243 +#: src/gns/gnunet-gns-proxy.c:2504 #, c-format msgid "Unsupported socks version %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3272 +#: src/gns/gnunet-gns-proxy.c:2533 #, c-format msgid "Unsupported socks command %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3355 +#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580 +msgid "SSL connection to plain IPv4 address requested\n" +msgstr "" + +#: src/gns/gnunet-gns-proxy.c:2631 #, c-format msgid "Unsupported socks address type %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3693 +#: src/gns/gnunet-gns-proxy.c:2970 +msgid "No ego configured for `shorten-zone`\n" +msgstr "" + +#: src/gns/gnunet-gns-proxy.c:3010 #, c-format -msgid "Failed to load X.509 key and certificate from `%s'\n" +msgid "No ego configured for `%s`\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3821 -msgid "listen on specified port (default: 7777)" +#: src/gns/gnunet-gns-proxy.c:3072 +#, c-format +msgid "Failed to load SSL/TLS key and certificate from `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3826 -msgid "pem file to use as CA" +#: src/gns/gnunet-gns-proxy.c:3113 +msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3830 -msgid "disable use of IPv6" +#: src/gns/gnunet-gns-proxy.c:3116 +msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3856 +#: src/gns/gnunet-gns-proxy.c:3135 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-service-gns.c:506 -msgid "Properly base32-encoded public key required" +#: src/gns/gnunet-service-gns.c:862 +msgid "Failed to connect to the namestore!\n" msgstr "" -#: src/gns/gnunet-service-gns.c:542 +#: src/gns/gnunet-service-gns.c:870 msgid "Failed to connect to the namecache!\n" msgstr "" -#: src/gns/gnunet-service-gns.c:561 -#: src/zonemaster/gnunet-service-zonemaster.c:875 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 +#: src/gns/gnunet-service-gns.c:903 msgid "Could not connect to DHT!\n" msgstr "" -#: src/gns/gnunet-service-gns_interceptor.c:259 +#: src/gns/gnunet-service-gns.c:919 +#, fuzzy +#| msgid "# PONG messages received" +msgid "valid public key required" +msgstr "# messaggi PONG ricevuti" + +#: src/gns/gnunet-service-gns_interceptor.c:263 msgid "Error converting GNS response to DNS response!\n" msgstr "" -#: src/gns/gnunet-service-gns_interceptor.c:366 +#: src/gns/gnunet-service-gns_interceptor.c:369 msgid "Failed to connect to the DNS service!\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:700 -#, c-format -msgid "Protocol `%s' unknown, skipping labels.\n" -msgstr "" - -#: src/gns/gnunet-service-gns_resolver.c:711 -#, c-format -msgid "Service `%s' unknown for protocol `%s', skipping labels.\n" -msgstr "" - -#: src/gns/gnunet-service-gns_resolver.c:914 +#: src/gns/gnunet-service-gns_resolver.c:816 msgid "Failed to parse DNS response\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1095 +#: src/gns/gnunet-service-gns_resolver.c:958 #, c-format msgid "Skipping record of unsupported type %d\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1365 -#, c-format -msgid "VPN returned empty result for `%s'\n" -msgstr "" - -#: src/gns/gnunet-service-gns_resolver.c:1806 +#: src/gns/gnunet-service-gns_resolver.c:1317 #, c-format msgid "GNS lookup resulted in DNS name that is too long (`%s')\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1849 -#, c-format -msgid "GNS lookup failed (zero records found for `%s')\n" -msgstr "" - -#: src/gns/gnunet-service-gns_resolver.c:2264 +#: src/gns/gnunet-service-gns_resolver.c:1817 msgid "GNS lookup recursion failed (no delegation record found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2287 +#: src/gns/gnunet-service-gns_resolver.c:1841 #, c-format msgid "Failed to cache GNS resolution: %s\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2450 +#: src/gns/gnunet-service-gns_resolver.c:2123 #, c-format -msgid "GNS namecache returned empty result for `%s'\n" +msgid "Zone %s was revoked, resolution fails\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2585 +#: src/gns/gnunet-service-gns_resolver.c:2272 #, c-format -msgid "Zone %s was revoked, resolution fails\n" +msgid "Hostname `%s' is not well-formed, resolution fails\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:181 +#: src/gns/plugin_gnsrecord_gns.c:151 #, c-format msgid "Unable to parse PKEY record `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:212 +#: src/gns/plugin_gnsrecord_gns.c:180 #, c-format msgid "Unable to parse GNS2DNS record `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:233 +#: src/gns/plugin_gnsrecord_gns.c:201 #, c-format msgid "Failed to serialize GNS2DNS record with value `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:258 +#: src/gns/plugin_gnsrecord_gns.c:217 #, c-format msgid "Unable to parse VPN record string `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:294 -#, c-format -msgid "Unable to parse BOX record string `%s'\n" -msgstr "" - -#: src/gns/plugin_rest_gns.c:452 -msgid "Gns REST API initialized\n" -msgstr "" - -#: src/gnsrecord/plugin_gnsrecord_dns.c:359 +#: src/gnsrecord/plugin_gnsrecord_dns.c:293 #, c-format msgid "Unable to parse IPv4 address `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:380 +#: src/gnsrecord/plugin_gnsrecord_dns.c:314 #, c-format msgid "Failed to serialize NS record with value `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:402 +#: src/gnsrecord/plugin_gnsrecord_dns.c:336 #, c-format msgid "Failed to serialize CNAME record with value `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:487 +#: src/gnsrecord/plugin_gnsrecord_dns.c:420 #, c-format msgid "Failed to serialize CERT record with %u bytes\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:523 +#: src/gnsrecord/plugin_gnsrecord_dns.c:452 #, c-format msgid "Unable to parse SOA record `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:542 +#: src/gnsrecord/plugin_gnsrecord_dns.c:471 #, c-format msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:565 +#: src/gnsrecord/plugin_gnsrecord_dns.c:494 #, c-format msgid "Failed to serialize PTR record with value `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:588 +#: src/gnsrecord/plugin_gnsrecord_dns.c:514 #, c-format msgid "Unable to parse MX record `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:603 +#: src/gnsrecord/plugin_gnsrecord_dns.c:529 #, c-format msgid "Failed to serialize MX record with hostname `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:630 -#, c-format -msgid "Unable to parse SRV record `%s'\n" -msgstr "" - -#: src/gnsrecord/plugin_gnsrecord_dns.c:646 -#, c-format -msgid "Failed to serialize SRV record with target `%s'\n" -msgstr "" - -#: src/gnsrecord/plugin_gnsrecord_dns.c:663 +#: src/gnsrecord/plugin_gnsrecord_dns.c:549 #, c-format msgid "Unable to parse IPv6 address `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:687 -#: src/gnsrecord/plugin_gnsrecord_dns.c:703 +#: src/gnsrecord/plugin_gnsrecord_dns.c:567 #, c-format msgid "Unable to parse TLSA record string `%s'\n" msgstr "" -#: src/hello/gnunet-hello.c:126 +#: src/hello/gnunet-hello.c:123 msgid "Call with name of HELLO file to modify.\n" msgstr "" -#: src/hello/gnunet-hello.c:132 +#: src/hello/gnunet-hello.c:129 #, c-format msgid "Error accessing file `%s': %s\n" msgstr "" -#: src/hello/gnunet-hello.c:140 +#: src/hello/gnunet-hello.c:137 #, c-format msgid "File `%s' is too big to be a HELLO\n" msgstr "" -#: src/hello/gnunet-hello.c:147 +#: src/hello/gnunet-hello.c:144 #, c-format msgid "File `%s' is too small to be a HELLO\n" msgstr "" -#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:198 +#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183 #, c-format msgid "Error opening file `%s': %s\n" msgstr "" -#: src/hello/gnunet-hello.c:174 +#: src/hello/gnunet-hello.c:170 #, c-format msgid "Did not find well-formed HELLO in file `%s'\n" msgstr "" -#: src/hello/gnunet-hello.c:210 +#: src/hello/gnunet-hello.c:195 #, c-format msgid "Error writing HELLO to file `%s': %s\n" msgstr "" -#: src/hello/gnunet-hello.c:219 +#: src/hello/gnunet-hello.c:203 #, c-format -msgid "Modified %u addresses, wrote %u bytes\n" +msgid "Modified %u addresses \n" msgstr "" -#: src/hello/hello.c:1110 +#: src/hello/hello.c:944 msgid "Failed to parse HELLO message: missing expiration time\n" msgstr "" -#: src/hello/hello.c:1119 +#: src/hello/hello.c:953 msgid "Failed to parse HELLO message: invalid expiration time\n" msgstr "" -#: src/hello/hello.c:1129 +#: src/hello/hello.c:963 msgid "Failed to parse HELLO message: malformed\n" msgstr "" -#: src/hello/hello.c:1140 +#: src/hello/hello.c:973 msgid "Failed to parse HELLO message: missing transport plugin\n" msgstr "" -#: src/hello/hello.c:1158 +#: src/hello/hello.c:990 #, c-format -msgid "Plugin `%s' not found, skipping address\n" +msgid "Plugin `%s' not found\n" msgstr "" -#: src/hello/hello.c:1166 +#: src/hello/hello.c:999 #, c-format msgid "Plugin `%s' does not support URIs yet\n" msgstr "" -#: src/hello/hello.c:1181 +#: src/hello/hello.c:1018 #, c-format msgid "Failed to parse `%s' as an address for plugin `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:316 -msgid "" -"None of the functions for the hostlist daemon were enabled. I have no " -"reason to run!\n" +#: src/hostlist/gnunet-daemon-hostlist.c:259 +msgid "None of the functions for the hostlist daemon were enabled. I have no reason to run!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:376 +#: src/hostlist/gnunet-daemon-hostlist.c:308 msgid "advertise our hostlist to other peers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:381 -msgid "" -"bootstrap using hostlists (it is highly recommended that you always use this " -"option)" +#: src/hostlist/gnunet-daemon-hostlist.c:313 +msgid "bootstrap using hostlists (it is highly recommended that you always use this option)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:385 +#: src/hostlist/gnunet-daemon-hostlist.c:316 msgid "enable learning about hostlist servers from other peers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:390 +#: src/hostlist/gnunet-daemon-hostlist.c:320 msgid "provide a hostlist server" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:406 +#: src/hostlist/gnunet-daemon-hostlist.c:335 msgid "GNUnet hostlist server and client" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:349 +#: src/hostlist/hostlist-client.c:288 msgid "# bytes downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:370 -#: src/hostlist/gnunet-daemon-hostlist_client.c:403 +#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339 msgid "# invalid HELLOs downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:373 -#: src/hostlist/gnunet-daemon-hostlist_client.c:406 +#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342 #, c-format msgid "Invalid `%s' message received from hostlist at `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:391 +#: src/hostlist/hostlist-client.c:330 msgid "# valid HELLOs downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:661 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1407 +#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333 msgid "# advertised hostlist URIs" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:691 +#: src/hostlist/hostlist-client.c:622 #, c-format msgid "# advertised URI `%s' downloaded" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:734 +#: src/hostlist/hostlist-client.c:664 #, c-format -msgid "" -"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI " -"gets dismissed.\n" +msgid "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI gets dismissed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:862 +#: src/hostlist/hostlist-client.c:802 #, c-format msgid "Timeout trying to download hostlist from `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:876 +#: src/hostlist/hostlist-client.c:816 #, c-format msgid "Download limit of %u bytes exceeded, stopping download\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:896 +#: src/hostlist/hostlist-client.c:836 #, c-format msgid "Download of hostlist from `%s' failed: `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:902 +#: src/hostlist/hostlist-client.c:842 #, c-format msgid "Download of hostlist `%s' completed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:910 +#: src/hostlist/hostlist-client.c:850 #, c-format msgid "Adding successfully tested hostlist `%s' datastore.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:963 +#: src/hostlist/hostlist-client.c:903 #, c-format msgid "Bootstrapping using hostlist at `%s'.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:971 +#: src/hostlist/hostlist-client.c:911 msgid "# hostlist downloads initiated" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1098 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1665 +#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506 msgid "# milliseconds between hostlist downloads" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1107 +#: src/hostlist/hostlist-client.c:1049 #, c-format msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1166 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1187 +#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125 msgid "# active connections" msgstr "# connessioni attive" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 +#: src/hostlist/hostlist-client.c:1280 #, c-format msgid "Loading saved hostlist entries from file `%s' \n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1358 +#: src/hostlist/hostlist-client.c:1285 #, c-format msgid "Hostlist file `%s' does not exist\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1367 +#: src/hostlist/hostlist-client.c:1296 #, c-format msgid "Could not open file `%s' for reading to load hostlists: %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 +#: src/hostlist/hostlist-client.c:1329 #, c-format msgid "%u hostlist URIs loaded from file\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1404 +#: src/hostlist/hostlist-client.c:1331 msgid "# hostlist URIs read from file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1450 +#: src/hostlist/hostlist-client.c:1376 #, c-format msgid "Could not open file `%s' for writing to save hostlists: %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1457 +#: src/hostlist/hostlist-client.c:1381 #, c-format msgid "Writing %u hostlist URIs to `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1481 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1498 +#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422 #, c-format msgid "Error writing hostlist URIs to file `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 +#: src/hostlist/hostlist-client.c:1417 msgid "# hostlist URIs written to file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1595 -#: src/transport/plugin_transport_http_client.c:2274 -#, c-format -msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n" -msgstr "" - -#: src/hostlist/gnunet-daemon-hostlist_client.c:1624 +#: src/hostlist/hostlist-client.c:1471 msgid "Learning is enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1638 +#: src/hostlist/hostlist-client.c:1483 msgid "Learning is not enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1651 +#: src/hostlist/hostlist-client.c:1495 #, c-format -msgid "" -"Since learning is not enabled on this peer, hostlist file `%s' was removed\n" +msgid "Since learning is not enabled on this peer, hostlist file `%s' was removed\n" +msgstr "" + +#: src/hostlist/hostlist-client.c:1499 +#, c-format +msgid "Hostlist file `%s' could not be removed\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:176 +#: src/hostlist/hostlist-server.c:137 msgid "bytes in hostlist" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:201 +#: src/hostlist/hostlist-server.c:161 msgid "expired addresses encountered" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:237 -#: src/hostlist/gnunet-daemon-hostlist_server.c:531 -#: src/peerinfo-tool/gnunet-peerinfo.c:385 -#: src/peerinfo-tool/gnunet-peerinfo.c:534 -#: src/topology/gnunet-daemon-topology.c:862 +#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425 +#: src/peerinfo-tool/gnunet-peerinfo.c:350 +#: src/peerinfo-tool/gnunet-peerinfo.c:419 +#: src/peerinfo-tool/gnunet-peerinfo.c:490 +#: src/topology/gnunet-daemon-topology.c:925 #, c-format msgid "Error in communication with PEERINFO service: %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:261 +#: src/hostlist/hostlist-server.c:210 msgid "HELLOs without addresses encountered (ignored)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:278 +#: src/hostlist/hostlist-server.c:224 msgid "bytes not included in hostlist (size limit)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:382 +#: src/hostlist/hostlist-server.c:268 #, c-format msgid "Refusing `%s' request to hostlist server\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:385 +#: src/hostlist/hostlist-server.c:271 msgid "hostlist requests refused (not HTTP GET)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:397 +#: src/hostlist/hostlist-server.c:284 #, c-format msgid "Refusing `%s' request with %llu bytes of upload data\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:401 +#: src/hostlist/hostlist-server.c:288 msgid "hostlist requests refused (upload data)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:408 +#: src/hostlist/hostlist-server.c:296 msgid "Could not handle hostlist request since I do not have a response yet\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:411 +#: src/hostlist/hostlist-server.c:299 msgid "hostlist requests refused (not ready)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:416 +#: src/hostlist/hostlist-server.c:303 msgid "Received request for our hostlist\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:418 +#: src/hostlist/hostlist-server.c:304 msgid "hostlist requests processed" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:466 +#: src/hostlist/hostlist-server.c:346 msgid "# hostlist advertisements send" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:679 -#: src/transport/gnunet-service-transport.c:2827 -msgid "Could not access PEERINFO service. Exiting.\n" +#: src/hostlist/hostlist-server.c:390 +msgid "Advertisement message could not be queued by core\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:691 -#, c-format -msgid "Invalid port number %llu. Exiting.\n" +#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639 +#: src/transport/gnunet-service-transport.c:1114 +msgid "Could not access PEERINFO service. Exiting.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:703 +#: src/hostlist/hostlist-server.c:576 #, c-format msgid "Hostlist service starts on %s:%llu\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:718 +#: src/hostlist/hostlist-server.c:590 #, c-format msgid "Address to obtain hostlist: `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:731 -msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n" -msgstr "" - -#: src/hostlist/gnunet-daemon-hostlist_server.c:748 -msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n" -msgstr "" - -#: src/hostlist/gnunet-daemon-hostlist_server.c:769 -#, fuzzy, c-format -msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n" -msgstr "`%s' non è un indirizzo IP valido.\n" - -#: src/hostlist/gnunet-daemon-hostlist_server.c:789 +#: src/hostlist/hostlist-server.c:630 #, fuzzy, c-format -msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" +#| msgid "`%s' is not a valid IP address.\n" +msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n" msgstr "`%s' non è un indirizzo IP valido.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:829 +#: src/hostlist/hostlist-server.c:673 #, c-format msgid "Could not start hostlist HTTP server on port %u\n" msgstr "" -#: src/identity/gnunet-identity.c:179 +#: src/identity/gnunet-identity.c:165 #, c-format msgid "Failed to create ego: %s\n" msgstr "" -#: src/identity/gnunet-identity.c:201 +#: src/identity/gnunet-identity.c:184 #, c-format msgid "Failed to set default ego: %s\n" msgstr "" -#: src/identity/gnunet-identity.c:356 +#: src/identity/gnunet-identity.c:327 msgid "create ego NAME" msgstr "" -#: src/identity/gnunet-identity.c:362 +#: src/identity/gnunet-identity.c:330 msgid "delete ego NAME " msgstr "" -#: src/identity/gnunet-identity.c:367 +#: src/identity/gnunet-identity.c:333 msgid "display all egos" msgstr "" -#: src/identity/gnunet-identity.c:373 -msgid "" -"set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)" +#: src/identity/gnunet-identity.c:336 +msgid "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)" msgstr "" -#: src/identity/gnunet-identity.c:378 +#: src/identity/gnunet-identity.c:339 msgid "run in monitor mode egos" msgstr "" -#: src/identity/gnunet-identity.c:384 -msgid "" -"set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)" +#: src/identity/gnunet-identity.c:342 +msgid "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)" msgstr "" -#: src/identity/gnunet-identity.c:398 +#: src/identity/gnunet-identity.c:351 msgid "Maintain egos" msgstr "" -#: src/identity/gnunet-service-identity.c:391 +#: src/identity/gnunet-service-identity.c:338 msgid "no default known" msgstr "" -#: src/identity/gnunet-service-identity.c:416 +#: src/identity/gnunet-service-identity.c:362 msgid "default configured, but ego unknown (internal error)" msgstr "" -#: src/identity/gnunet-service-identity.c:507 -#: src/identity/gnunet-service-identity.c:790 -#: src/identity/gnunet-service-identity.c:918 +#: src/identity/gnunet-service-identity.c:439 +#: src/identity/gnunet-service-identity.c:670 +#: src/identity/gnunet-service-identity.c:778 #, c-format msgid "Failed to write subsystem default identifier map to `%s'.\n" msgstr "" -#: src/identity/gnunet-service-identity.c:515 +#: src/identity/gnunet-service-identity.c:446 msgid "Unknown ego specified for service (internal error)" msgstr "" -#: src/identity/gnunet-service-identity.c:610 +#: src/identity/gnunet-service-identity.c:516 msgid "identifier already in use for another ego" msgstr "" -#: src/identity/gnunet-service-identity.c:765 +#: src/identity/gnunet-service-identity.c:647 msgid "target name already exists" msgstr "" -#: src/identity/gnunet-service-identity.c:808 -#: src/identity/gnunet-service-identity.c:936 +#: src/identity/gnunet-service-identity.c:686 +#: src/identity/gnunet-service-identity.c:795 msgid "no matching ego found" msgstr "" -#: src/identity/gnunet-service-identity.c:971 +#: src/identity/gnunet-service-identity.c:829 #, c-format msgid "Failed to parse ego information in `%s'\n" msgstr "" -#: src/identity/gnunet-service-identity.c:1029 +#: src/identity/gnunet-service-identity.c:902 #, c-format msgid "Failed to parse subsystem identity configuration file `%s'\n" msgstr "" -#: src/identity/gnunet-service-identity.c:1039 +#: src/identity/gnunet-service-identity.c:914 #, c-format msgid "Failed to create directory `%s' for storing egos\n" msgstr "" -#: src/identity/plugin_rest_identity.c:1297 -msgid "Identity REST API initialized\n" +#: src/mesh/gnunet-mesh.c:357 +#, c-format +msgid "Invalid target `%s'\n" msgstr "" -#: src/json/json.c:123 +#: src/mesh/gnunet-mesh.c:607 #, c-format -msgid "Failed to parse JSON in option `%s': %s (%s)\n" +msgid "Invalid peer ID `%s'\n" msgstr "" -#: src/my/my.c:196 src/my/my.c:215 +#: src/mesh/gnunet-mesh.c:650 #, c-format -msgid "%s failed at %s:%d with error: %s\n" +msgid "Invalid tunnel owner `%s'\n" +msgstr "" + +#: src/mesh/gnunet-mesh.c:716 +msgid "You must NOT give a TARGETwhen using 'request all' options\n" +msgstr "" + +#: src/mesh/gnunet-mesh.c:807 +msgid "provide information about a particular connection" +msgstr "" + +#: src/mesh/gnunet-mesh.c:810 +msgid "activate echo mode" +msgstr "" + +#: src/mesh/gnunet-mesh.c:816 +msgid "port to listen to (default; 0)" +msgstr "" + +#: src/mesh/gnunet-mesh.c:819 src/mesh/gnunet-mesh.c:822 +msgid "provide information about all peers" +msgstr "" + +#: src/mesh/gnunet-mesh.c:825 +msgid "provide information about a particular tunnel" +msgstr "" + +#: src/mesh/gnunet-mesh.c:828 +msgid "provide information about all tunnels" +msgstr "" + +#: src/mesh/gnunet-service-mesh_peer.c:390 +msgid "Wrong CORE service\n" msgstr "" -#: src/mysql/mysql.c:180 +#: src/mysql/mysql.c:174 #, c-format msgid "Trying to use file `%s' for MySQL configuration.\n" msgstr "" -#: src/mysql/mysql.c:187 +#: src/mysql/mysql.c:181 #, c-format msgid "Could not access file `%s': %s\n" msgstr "" -#: src/namecache/gnunet-namecache.c:107 +#: src/namecache/gnunet-namecache.c:109 #, c-format msgid "No records found for `%s'" msgstr "" -#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:454 +#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397 #, c-format msgid "\tCorrupt or unsupported record of type %u\n" msgstr "" -#: src/namecache/gnunet-namecache.c:183 +#: src/namecache/gnunet-namecache.c:185 #, c-format msgid "You must specify which zone should be accessed\n" msgstr "" -#: src/namecache/gnunet-namecache.c:193 +#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695 #, c-format -msgid "Invalid public key for zone `%s'\n" +msgid "Invalid public key for reverse lookup `%s'\n" msgstr "" -#: src/namecache/gnunet-namecache.c:201 +#: src/namecache/gnunet-namecache.c:203 #, c-format msgid "You must specify a name\n" msgstr "È necessario specificare un nome\n" -#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1575 +#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931 msgid "name of the record to add/delete/display" msgstr "" -#: src/namecache/gnunet-namecache.c:238 +#: src/namecache/gnunet-namecache.c:237 msgid "spezifies the public key of the zone to look in" msgstr "" -#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1632 +#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963 msgid "GNUnet zone manipulation tool" msgstr "" -#: src/namecache/namecache_api.c:296 +#: src/namecache/namecache_api.c:276 msgid "Namecache failed to cache block" msgstr "" -#: src/namecache/namecache_api.c:383 -msgid "Error communicating with namecache service" +#: src/namecache/plugin_namecache_postgres.c:89 +#: src/namestore/plugin_namestore_postgres.c:96 +#, fuzzy +#| msgid "Failed to create statistics!\n" +msgid "Failed to create indices\n" +msgstr "Generazione statistiche fallita\n" + +#: src/namestore/gnunet-namestore.c:303 +#, c-format +msgid "Adding record failed: %s\n" msgstr "" -#: src/namecache/plugin_namecache_flat.c:121 -#: src/namecache/plugin_namecache_flat.c:255 -#: src/namestore/plugin_namestore_heap.c:179 -#: src/namestore/plugin_namestore_heap.c:412 -#: src/peerstore/plugin_peerstore_flat.c:379 -#: src/peerstore/plugin_peerstore_flat.c:538 +#: src/namestore/gnunet-namestore.c:332 #, c-format -msgid "Unable to initialize file: %s.\n" +msgid "Deleting record failed, record does not exist%s%s\n" msgstr "" -#: src/namecache/plugin_namecache_flat.c:132 -#: src/namestore/plugin_namestore_heap.c:190 -#: src/peerstore/plugin_peerstore_flat.c:394 +#: src/namestore/gnunet-namestore.c:339 #, c-format -msgid "Unable to get filesize: %s.\n" +msgid "Deleting record failed%s%s\n" msgstr "" -#: src/namecache/plugin_namecache_flat.c:151 -#: src/namestore/plugin_namestore_heap.c:203 -#: src/peerstore/plugin_peerstore_flat.c:406 +#: src/namestore/gnunet-namestore.c:558 #, c-format -msgid "Unable to read file: %s.\n" +msgid "No options given\n" msgstr "" -#: src/namecache/plugin_namecache_flat.c:410 -msgid "flat plugin running\n" +#: src/namestore/gnunet-namestore.c:569 +#: src/namestore/gnunet-namestore-fcfsd.c:970 +msgid "Failed to connect to namestore\n" msgstr "" -#: src/namecache/plugin_namecache_sqlite.c:183 -#: src/namecache/plugin_namecache_sqlite.c:197 -#: src/namestore/plugin_namestore_sqlite.c:219 -#: src/namestore/plugin_namestore_sqlite.c:230 +#: src/namestore/gnunet-namestore.c:577 src/namestore/gnunet-namestore.c:586 +#: src/namestore/gnunet-namestore.c:603 src/namestore/gnunet-namestore.c:625 +#: src/namestore/gnunet-namestore.c:665 #, c-format -msgid "Failed to setup database at `%s'\n" +msgid "Missing option `%s' for operation `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:341 -#, c-format -msgid "Adding record failed: %s\n" +#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587 +#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626 +msgid "add" msgstr "" -#: src/namestore/gnunet-namestore.c:371 +#: src/namestore/gnunet-namestore.c:595 #, c-format -msgid "Deleting record failed, record does not exist%s%s\n" +msgid "Unsupported type `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:378 +#: src/namestore/gnunet-namestore.c:615 #, c-format -msgid "Deleting record failed%s%s\n" +msgid "Value `%s' invalid for record type `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:660 src/namestore/gnunet-namestore.c:668 +#: src/namestore/gnunet-namestore.c:651 #, c-format -msgid "A %s record exists already under `%s', no other records can be added.\n" +msgid "Invalid time format `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:682 src/namestore/gnunet-namestore.c:694 -#, c-format -msgid "Records already exist under `%s', cannot add `%s' record.\n" +#: src/namestore/gnunet-namestore.c:666 +msgid "del" msgstr "" -#: src/namestore/gnunet-namestore.c:707 +#: src/namestore/gnunet-namestore.c:715 +#: src/peerinfo-tool/gnunet-peerinfo.c:723 #, c-format -msgid "" -"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n" +msgid "Invalid URI `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:837 +#: src/namestore/gnunet-namestore.c:750 #, c-format -msgid "There are no records under label `%s' that could be deleted.\n" +msgid "Invalid nick `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:878 +#: src/namestore/gnunet-namestore.c:790 #, c-format -msgid "" -"There are no records under label `%s' that match the request for deletion.\n" +msgid "Ego `%s' not known to identity service\n" msgstr "" -#: src/namestore/gnunet-namestore.c:965 +#: src/namestore/gnunet-namestore.c:817 #, c-format -msgid "Failed to replace records: %s\n" +msgid "No default ego configured in identity service\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1009 +#: src/namestore/gnunet-namestore.c:853 #, c-format -msgid "No options given\n" +msgid "Identity service is not running\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1032 src/namestore/gnunet-namestore.c:1065 -#: src/namestore/gnunet-namestore.c:1074 src/namestore/gnunet-namestore.c:1093 -#: src/namestore/gnunet-namestore.c:1116 src/namestore/gnunet-namestore.c:1148 +#: src/namestore/gnunet-namestore.c:865 #, c-format -msgid "Missing option `%s' for operation `%s'\n" +msgid "Cannot connect to identity service\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1033 -msgid "replace" +#: src/namestore/gnunet-namestore.c:913 +msgid "add record" msgstr "" -#: src/namestore/gnunet-namestore.c:1066 src/namestore/gnunet-namestore.c:1075 -#: src/namestore/gnunet-namestore.c:1094 src/namestore/gnunet-namestore.c:1118 -msgid "add" +#: src/namestore/gnunet-namestore.c:916 +msgid "delete record" msgstr "" -#: src/namestore/gnunet-namestore.c:1084 -#, c-format -msgid "Unsupported type `%s'\n" +#: src/namestore/gnunet-namestore.c:919 +msgid "display records" msgstr "" -#: src/namestore/gnunet-namestore.c:1106 -#, c-format -msgid "Value `%s' invalid for record type `%s'\n" +#: src/namestore/gnunet-namestore.c:922 +msgid "expiration time for record to use (for adding only), \"never\" is possible" msgstr "" -#: src/namestore/gnunet-namestore.c:1129 -#, c-format -msgid "Invalid time format `%s'\n" +#: src/namestore/gnunet-namestore.c:925 +msgid "set the desired nick name for the zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1149 -msgid "del" +#: src/namestore/gnunet-namestore.c:928 +msgid "monitor changes in the namestore" msgstr "" -#: src/namestore/gnunet-namestore.c:1192 -#, c-format -msgid "Invalid public key for reverse lookup `%s'\n" +#: src/namestore/gnunet-namestore.c:934 +msgid "determine our name for the given PKEY" msgstr "" -#: src/namestore/gnunet-namestore.c:1221 -#: src/peerinfo-tool/gnunet-peerinfo.c:775 -#, c-format -msgid "Invalid URI `%s'\n" +#: src/namestore/gnunet-namestore.c:937 +msgid "type of the record to add/delete/display" msgstr "" -#: src/namestore/gnunet-namestore.c:1249 -#, c-format -msgid "Invalid nick `%s'\n" +#: src/namestore/gnunet-namestore.c:940 +msgid "URI to import into our zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1289 -#, c-format -msgid "No default ego configured in identity service\n" +#: src/namestore/gnunet-namestore.c:943 +msgid "value of the record to add/delete" msgstr "" -#: src/namestore/gnunet-namestore.c:1341 -#, c-format -msgid "Superfluous command line arguments (starting with `%s') ignored\n" +#: src/namestore/gnunet-namestore.c:946 +msgid "create or list public record" msgstr "" -#: src/namestore/gnunet-namestore.c:1357 -#, c-format -msgid "Cannot connect to identity service\n" +#: src/namestore/gnunet-namestore.c:949 +msgid "create shadow record (only valid if all other records of the same type have expired" msgstr "" -#: src/namestore/gnunet-namestore.c:1407 -msgid "Empty record line argument is not allowed.\n" +#: src/namestore/gnunet-namestore.c:952 +msgid "name of the ego controlling the zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1423 -#, c-format -msgid "Invalid expiration time `%s' (must be without unit)\n" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1435 src/namestore/gnunet-namestore.c:1453 -#: src/namestore/gnunet-namestore.c:1470 -#, c-format -msgid "Missing entries in record line `%s'.\n" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1444 -#, fuzzy, c-format -msgid "Unknown record type `%s'\n" -msgstr "Comando `%s' sconosciuto.\n" - -#: src/namestore/gnunet-namestore.c:1484 -#, c-format -msgid "Invalid record data for type %s: `%s'.\n" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1548 -msgid "add record" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1552 -msgid "delete record" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1556 -msgid "display records" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1561 -msgid "" -"expiration time for record to use (for adding only), \"never\" is possible" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1566 -msgid "set the desired nick name for the zone" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1570 -msgid "monitor changes in the namestore" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1580 -msgid "determine our name for the given PKEY" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1585 -msgid "" -"set record set to values given by (possibly multiple) RECORDLINES; can be " -"specified multiple times" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1590 -msgid "type of the record to add/delete/display" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1595 -msgid "URI to import into our zone" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1600 -msgid "value of the record to add/delete" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1604 -msgid "create or list public record" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1608 -msgid "" -"create shadow record (only valid if all other records of the same type have " -"expired" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1613 -msgid "name of the ego controlling the zone" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:549 +#: src/namestore/gnunet-namestore-fcfsd.c:464 #, c-format msgid "Unsupported form value `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:576 +#: src/namestore/gnunet-namestore-fcfsd.c:491 #, c-format msgid "Failed to create record for domain `%s': %s\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:597 -msgid "Error when mapping zone to name\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:629 +#: src/namestore/gnunet-namestore-fcfsd.c:525 #, c-format msgid "Found existing name `%s' for the given key\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:689 +#: src/namestore/gnunet-namestore-fcfsd.c:534 +msgid "Error when mapping zone to name\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:596 #, c-format msgid "Found %u existing records for domain `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:777 +#: src/namestore/gnunet-namestore-fcfsd.c:652 #, c-format msgid "Failed to create page for `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:796 +#: src/namestore/gnunet-namestore-fcfsd.c:668 #, c-format msgid "Failed to setup post processor for `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:832 +#: src/namestore/gnunet-namestore-fcfsd.c:704 msgid "Domain name must not contain `.'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:841 +#: src/namestore/gnunet-namestore-fcfsd.c:712 msgid "Domain name must not contain `+'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1071 +#: src/namestore/gnunet-namestore-fcfsd.c:910 msgid "No ego configured for `fcfsd` subsystem\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1099 +#: src/namestore/gnunet-namestore-fcfsd.c:936 msgid "Failed to start HTTP server\n" -msgstr "" +msgstr "Impossibile avviare il server HTTP\n" -#: src/namestore/gnunet-namestore-fcfsd.c:1147 +#: src/namestore/gnunet-namestore-fcfsd.c:978 msgid "Failed to connect to identity\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1173 -msgid "name of the zone that is to be managed by FCFSD" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1192 +#: src/namestore/gnunet-namestore-fcfsd.c:1011 msgid "GNU Name System First Come First Serve name registration service" msgstr "" -#: src/namestore/gnunet-service-namestore.c:900 +#: src/namestore/gnunet-service-namestore.c:655 #, c-format msgid "Failed to replicate block in namecache: %s\n" msgstr "" -#: src/namestore/gnunet-zoneimport.c:2038 -msgid "size to use for the main hash map" -msgstr "" - -#: src/namestore/gnunet-zoneimport.c:2043 -msgid "minimum expiration time we assume for imported records" -msgstr "" - -#: src/namestore/namestore_api.c:391 +#: src/namestore/namestore_api.c:275 msgid "Namestore failed to store record\n" msgstr "" -#: src/namestore/plugin_namestore_heap.c:773 -msgid "heap file database running\n" -msgstr "" - -#: src/namestore/plugin_rest_namestore.c:1079 -msgid "Namestore REST API initialized\n" -msgstr "" - -#: src/nat-auto/gnunet-nat-auto.c:193 -msgid "Suggested configuration changes:\n" -msgstr "" - -#: src/nat-auto/gnunet-nat-auto.c:219 -#, c-format -msgid "Failed to write configuration to `%s'\n" -msgstr "" - -#: src/nat-auto/gnunet-nat-auto.c:226 -#, c-format -msgid "Wrote updated configuration to `%s'\n" -msgstr "" - -#: src/nat-auto/gnunet-nat-auto.c:345 -msgid "run autoconfiguration" -msgstr "" - -#: src/nat-auto/gnunet-nat-auto.c:351 -msgid "section name providing the configuration for the adapter" -msgstr "" - -#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:459 -msgid "use TCP" -msgstr "" - -#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:464 -msgid "use UDP" -msgstr "" - -#: src/nat-auto/gnunet-nat-auto.c:366 -msgid "write configuration file (for autoconfiguration)" -msgstr "" - -#: src/nat-auto/gnunet-nat-auto.c:378 -msgid "GNUnet NAT traversal autoconfiguration" -msgstr "" - -#: src/nat-auto/gnunet-nat-auto_legacy.c:403 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681 -#: src/nat-auto/nat_auto_api_test.c:409 -msgid "Failed to connect to `gnunet-nat-server'\n" -msgstr "" - -#: src/nat-auto/gnunet-nat-auto_legacy.c:518 +#: src/nat/gnunet-nat-server.c:279 #, c-format -msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n" +msgid "Please pass valid port number as the first argument! (got `%s')\n" msgstr "" -#: src/nat-auto/gnunet-nat-auto_legacy.c:568 -#: src/nat-auto/nat_auto_api_test.c:575 -msgid "NAT test failed to start NAT library\n" +#: src/nat/gnunet-nat-server.c:321 +msgid "GNUnet NAT traversal test helper daemon" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto.c:342 -msgid "UPnP client `upnpc` command not found, disabling UPnP\n" +#: src/nat/nat_auto.c:170 +msgid "NAT traversal with ICMP Server timed out.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385 +#: src/nat/nat_auto.c:203 msgid "NAT traversal with ICMP Server succeeded.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386 +#: src/nat/nat_auto.c:204 msgid "NAT traversal with ICMP Server failed.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405 +#: src/nat/nat_auto.c:225 msgid "Testing connection reversal with ICMP server.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437 +#: src/nat/nat_auto.c:274 #, c-format msgid "Detected external IP `%s'\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572 +#: src/nat/nat_auto.c:344 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590 +#: src/nat/nat_auto.c:360 #, c-format msgid "Detected internal network address `%s'.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724 +#: src/nat/nat_auto.c:413 msgid "upnpc found, enabling its use\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725 +#: src/nat/nat_auto.c:414 msgid "upnpc not found\n" -msgstr "" +msgstr "upnpc non trovato\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762 -msgid "test_icmp_server not possible, as we have no public IPv4 address\n" +#: src/nat/nat_auto.c:447 +msgid "gnunet-helper-nat-server found, testing it\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834 -msgid "test_icmp_server not possible, as we are not behind NAT\n" -msgstr "" - -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846 +#: src/nat/nat_auto.c:448 msgid "No working gnunet-helper-nat-server found\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823 -msgid "test_icmp_client not possible, as we have no internal IPv4 address\n" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:76 -msgid "Operation Successful" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:78 -msgid "IPC failure" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:80 -msgid "Failure in network subsystem, check permissions." -msgstr "" - -#: src/nat-auto/nat_auto_api.c:82 -msgid "Encountered timeout while performing operation" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:84 -msgid "detected that we are offline" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:86 -msgid "`upnpc` command not found" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:88 -msgid "Failed to run `upnpc` command" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:90 -msgid "`upnpc' command took too long, process killed" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:92 -msgid "`upnpc' command failed to establish port mapping" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:94 -msgid "`external-ip' command not found" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:96 -msgid "Failed to run `external-ip` command" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:98 -msgid "`external-ip' command output invalid" +#: src/nat/nat_auto.c:482 +msgid "gnunet-helper-nat-client found, enabling it\n" msgstr "" -#: src/nat-auto/nat_auto_api.c:100 -msgid "no valid address was returned by `external-ip'" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:102 -msgid "Could not determine interface with internal/local network address" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:104 -msgid "No functioning gnunet-helper-nat-server installation found" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:106 -msgid "NAT test could not be initialized" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:108 -msgid "NAT test timeout reached" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:110 -msgid "could not register NAT" -msgstr "" - -#: src/nat-auto/nat_auto_api.c:112 -msgid "No working gnunet-helper-nat-client installation found" +#: src/nat/nat_auto.c:483 +msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n" msgstr "" -#: src/nat-auto/nat_auto_api_test.c:481 +#: src/nat/nat.c:867 #, c-format -msgid "Failed to find valid PORT in section `%s'\n" +msgid "gnunet-helper-nat-server generated malformed address `%s'\n" msgstr "" -#: src/nat-auto/nat_auto_api_test.c:526 +#: src/nat/nat.c:917 #, c-format -msgid "Failed to create socket bound to `%s' for NAT test: %s\n" +msgid "Failed to start %s\n" msgstr "" -#: src/nat/gnunet-nat.c:437 -msgid "which IP and port are we locally using to bind/listen to" +#: src/nat/nat.c:1205 +msgid "malformed" msgstr "" -#: src/nat/gnunet-nat.c:443 -msgid "which remote IP and port should be asked for connection reversal" +#: src/nat/nat.c:1276 src/nat/nat.c:1288 +#, c-format +msgid "Configuration requires `%s', but binary is not installed properly (SUID bit not set). Option disabled.\n" msgstr "" -#: src/nat/gnunet-nat.c:449 -msgid "" -"name of configuration section to find additional options, such as manual " -"host punching data" +#: src/nat/nat.c:1426 +msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n" msgstr "" -#: src/nat/gnunet-nat.c:454 -msgid "enable STUN processing" +#: src/nat/nat.c:1442 +#, c-format +msgid "Running gnunet-helper-nat-client %s %s %u\n" msgstr "" -#: src/nat/gnunet-nat.c:469 -msgid "watch for connection reversal requests" +#: src/nat/nat_mini.c:155 +msgid "no valid address was returned by `external-ip'" msgstr "" -#: src/nat/gnunet-nat.c:481 -msgid "GNUnet NAT traversal autoconfigure daemon" +#: src/nat/nat_mini.c:175 +msgid "`external-ip' command not found" msgstr "" -#: src/nat/gnunet-service-nat.c:1339 -#, c-format -msgid "Malformed punched hole specification `%s' (lacks port)\n" +#: src/nat/nat_mini.c:201 +msgid "`external-ip' command not found\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1349 -#, c-format -msgid "Invalid port number in punched hole specification `%s' (lacks port)\n" +#: src/nat/nat_mini.c:366 +msgid "Failed to run `upnpc` command" msgstr "" -#: src/nat/gnunet-service-nat.c:1365 -#, c-format -msgid "Malformed punched hole specification `%s' (lacks `]')\n" +#: src/nat/nat_mini.c:512 +msgid "`upnpc' command took too long, process killed" msgstr "" -#: src/nat/gnunet-service-nat.c:1376 -#, c-format -msgid "Malformed punched hole specification `%s' (IPv6 address invalid)" +#: src/nat/nat_mini.c:540 +msgid "`upnpc' command failed to establish port mapping" msgstr "" -#: src/nat/gnunet-service-nat.c:1841 -msgid "Connection reversal request failed\n" +#: src/nat/nat_mini.c:604 +msgid "`upnpc' command not found\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1914 -msgid "" -"UPnP enabled in configuration, but UPnP client `upnpc` command not found, " -"disabling UPnP\n" +#: src/nat/nat_mini.c:608 +msgid "`upnpc` command not found" msgstr "" -#: src/nat/gnunet-service-nat_helper.c:186 -#, c-format -msgid "gnunet-helper-nat-server generated malformed address `%s'\n" +#: src/nat/nat_test.c:351 +msgid "Failed to connect to `gnunet-nat-server'\n" msgstr "" -#: src/nat/gnunet-service-nat_helper.c:273 +#: src/nat/nat_test.c:423 #, c-format -msgid "Failed to start %s\n" +msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n" msgstr "" -#: src/nat/gnunet-service-nat_mini.c:196 -msgid "`external-ip' command not found\n" +#: src/nse/gnunet-nse.c:117 +msgid "NSE service is not running\n" msgstr "" -#: src/nat/gnunet-service-nat_mini.c:656 -msgid "`upnpc' command not found\n" +#: src/nse/gnunet-nse.c:122 +msgid "Error while checking if NSE service is running or not\n" msgstr "" -#: src/nse/gnunet-nse.c:122 +#: src/nse/gnunet-nse.c:168 msgid "Show network size estimates from NSE service." msgstr "" -#: src/nse/gnunet-nse-profiler.c:849 +#: src/nse/gnunet-nse-profiler.c:858 msgid "limit to the number of connections to NSE services, 0 for none" msgstr "" -#: src/nse/gnunet-nse-profiler.c:854 +#: src/nse/gnunet-nse-profiler.c:861 msgid "name of the file for writing connection information and statistics" msgstr "" -#: src/nse/gnunet-nse-profiler.c:866 +#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306 +msgid "name of the file with the login information for the testbed" +msgstr "" + +#: src/nse/gnunet-nse-profiler.c:867 msgid "name of the file for writing the main results" msgstr "" -#: src/nse/gnunet-nse-profiler.c:873 +#: src/nse/gnunet-nse-profiler.c:870 msgid "Number of peers to run in each round, separated by commas" msgstr "" -#: src/nse/gnunet-nse-profiler.c:884 +#: src/nse/gnunet-nse-profiler.c:876 msgid "delay between rounds" msgstr "" -#: src/nse/gnunet-nse-profiler.c:893 +#: src/nse/gnunet-nse-profiler.c:885 msgid "Measure quality and performance of the NSE service." msgstr "" -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +#: src/nse/gnunet-service-nse.c:1517 +#: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248 msgid "Value is too large.\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:178 +#: src/peerinfo/gnunet-service-peerinfo.c:215 #, c-format msgid "Removing expired address of transport `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:313 +#: src/peerinfo/gnunet-service-peerinfo.c:352 #, c-format msgid "Failed to parse HELLO in file `%s': %s\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:334 -#: src/peerinfo/gnunet-service-peerinfo.c:365 +#: src/peerinfo/gnunet-service-peerinfo.c:371 +#: src/peerinfo/gnunet-service-peerinfo.c:388 #, c-format msgid "Failed to parse HELLO in file `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:449 +#: src/peerinfo/gnunet-service-peerinfo.c:466 msgid "# peers known" msgstr "# peer conosciuti" -#: src/peerinfo/gnunet-service-peerinfo.c:492 +#: src/peerinfo/gnunet-service-peerinfo.c:503 #, c-format -msgid "" -"File `%s' in directory `%s' does not match naming convention. Removed.\n" +msgid "File `%s' in directory `%s' does not match naming convention. Removed.\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:659 +#: src/peerinfo/gnunet-service-peerinfo.c:653 #, c-format msgid "Scanning directory `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:667 +#: src/peerinfo/gnunet-service-peerinfo.c:658 #, c-format msgid "Still no peers found in `%s'!\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#: src/peerinfo/gnunet-service-peerinfo.c:994 #, c-format msgid "Cleaning up directory `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#: src/peerinfo/gnunet-service-peerinfo.c:1287 #, c-format msgid "Importing HELLOs from `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1451 +#: src/peerinfo/gnunet-service-peerinfo.c:1298 msgid "Skipping import of included HELLOs\n" msgstr "" -#: src/peerinfo/peerinfo_api.c:220 +#: src/peerinfo/peerinfo_api.c:236 +msgid "aborted due to explicit disconnect request" +msgstr "" + +#: src/peerinfo/peerinfo_api.c:356 +#, fuzzy +#| msgid "Failed to start service.\n" +msgid "failed to transmit request (service down?)" +msgstr "Impossibile avviare il servizio.\n" + +#: src/peerinfo/peerinfo_api.c:506 msgid "Failed to receive response from `PEERINFO' service." msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:239 +#: src/peerinfo/peerinfo_api.c:547 src/peerinfo/peerinfo_api.c:566 +#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592 +#: src/peerinfo/peerinfo_api.c:603 +msgid "Received invalid message from `PEERINFO' service." +msgstr "" + +#: src/peerinfo/peerinfo_api.c:678 +msgid "Timeout transmitting iteration request to `PEERINFO' service." +msgstr "" + +#: src/peerinfo/peerinfo_api_notify.c:268 #, c-format -msgid "%sPeer `%s'\n" +msgid "Could not connect to `%s' service.\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:246 +#: src/peerinfo-tool/gnunet-peerinfo.c:232 #, c-format -msgid "\tExpires: %s \t %s\n" +msgid "%sPeer `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:299 -#: src/peerinfo-tool/plugin_rest_peerinfo.c:501 +#: src/peerinfo-tool/gnunet-peerinfo.c:239 #, c-format -msgid "Failure: Cannot convert address to string for peer `%s'\n" +msgid "\tExpires: %s \t %s\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:466 +#: src/peerinfo-tool/gnunet-peerinfo.c:428 +#, fuzzy, c-format +#| msgid "Failed to create statistics!\n" +msgid "Failure: Did not receive %s\n" +msgstr "Generazione statistiche fallita\n" + +#: src/peerinfo-tool/gnunet-peerinfo.c:436 #, c-format msgid "Failure: Received invalid %s\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:480 +#: src/peerinfo-tool/gnunet-peerinfo.c:445 #, c-format msgid "Failed to write HELLO with %u bytes to file `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:499 +#: src/peerinfo-tool/gnunet-peerinfo.c:458 #, c-format msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:799 +#: src/peerinfo-tool/gnunet-peerinfo.c:522 +#, c-format +msgid "Failure adding HELLO: %s\n" +msgstr "" + +#: src/peerinfo-tool/gnunet-peerinfo.c:633 +#, c-format +msgid "Service `%s' is not running, please start GNUnet\n" +msgstr "" + +#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224 +#, c-format +msgid "Loading hostkey from `%s' failed.\n" +msgstr "" + +#: src/peerinfo-tool/gnunet-peerinfo.c:745 #, c-format msgid "I am peer `%s'.\n" msgstr "Io sono il peer '%s''.\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:843 +#: src/peerinfo-tool/gnunet-peerinfo.c:789 msgid "don't resolve host names" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:848 +#: src/peerinfo-tool/gnunet-peerinfo.c:792 msgid "output only the identity strings" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:852 +#: src/peerinfo-tool/gnunet-peerinfo.c:795 msgid "include friend-only information" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:857 +#: src/peerinfo-tool/gnunet-peerinfo.c:798 msgid "output our own identity only" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:862 +#: src/peerinfo-tool/gnunet-peerinfo.c:801 msgid "list all known peers" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:868 +#: src/peerinfo-tool/gnunet-peerinfo.c:804 msgid "dump hello to file" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:873 +#: src/peerinfo-tool/gnunet-peerinfo.c:807 msgid "also output HELLO uri(s)" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:879 +#: src/peerinfo-tool/gnunet-peerinfo.c:810 msgid "add given HELLO uri to the database" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:897 +#: src/peerinfo-tool/gnunet-peerinfo.c:821 msgid "Print information about peers." msgstr "" #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105 -#: src/transport/gnunet-service-transport_plugins.c:168 +#: src/transport/gnunet-service-transport_plugins.c:128 #, c-format msgid "Starting transport plugins `%s'\n" msgstr "" #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109 -#: src/transport/gnunet-service-transport_plugins.c:173 +#: src/transport/gnunet-service-transport_plugins.c:133 #, c-format msgid "Loading `%s' transport plugin\n" msgstr "" #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129 -#: src/transport/gnunet-service-transport_plugins.c:208 +#: src/transport/gnunet-service-transport_plugins.c:165 #, c-format msgid "Failed to load transport plugin for `%s'\n" msgstr "" -#: src/peerinfo-tool/plugin_rest_peerinfo.c:796 -msgid "Peerinfo REST API initialized\n" +#: src/postgres/postgres.c:59 +#, c-format +msgid "`%s:%s' failed at %s:%d with error: %s" msgstr "" -#: src/peerstore/gnunet-peerstore.c:91 -msgid "peerstore" +#: src/postgres/postgres.c:148 +#, fuzzy, c-format +#| msgid "Failed to create statistics!\n" +msgid "Unable to initialize Postgres: %s" +msgstr "Generazione statistiche fallita\n" + +#: src/psycstore/gnunet-service-psycstore.c:200 +msgid "Failed to store membership information!\n" msgstr "" -#: src/peerstore/gnunet-service-peerstore.c:598 -#, c-format -msgid "Could not load database backend `%s'\n" +#: src/psycstore/gnunet-service-psycstore.c:224 +#, fuzzy +#| msgid "Failed to start service.\n" +msgid "Failed to test membership!\n" +msgstr "Impossibile avviare il servizio.\n" + +#: src/psycstore/gnunet-service-psycstore.c:246 +#, fuzzy +#| msgid "Failed to start service.\n" +msgid "Failed to store fragment!\n" +msgstr "Impossibile avviare il servizio.\n" + +#: src/psycstore/gnunet-service-psycstore.c:272 +#, fuzzy +#| msgid "Failed to read file" +msgid "Failed to get fragment!\n" +msgstr "Impossibile leggere il file" + +#: src/psycstore/gnunet-service-psycstore.c:299 +#, fuzzy +#| msgid "Failed to start service.\n" +msgid "Failed to get message!\n" +msgstr "Impossibile avviare il servizio.\n" + +#: src/psycstore/gnunet-service-psycstore.c:328 +msgid "Failed to get message fragment!\n" +msgstr "" + +#: src/psycstore/gnunet-service-psycstore.c:356 +#, fuzzy +#| msgid "Failed to start service.\n" +msgid "Failed to get master counters!\n" +msgstr "Impossibile avviare il servizio.\n" + +#: src/psycstore/gnunet-service-psycstore.c:392 +#: src/psycstore/gnunet-service-psycstore.c:465 +msgid "Tried to set invalid state variable name!\n" +msgstr "" + +#: src/psycstore/gnunet-service-psycstore.c:408 +msgid "Failed to begin modifying state!\n" msgstr "" -#: src/peerstore/peerstore_api.c:605 src/peerstore/peerstore_api.c:657 -msgid "Unexpected iteration response, this should not happen.\n" +#: src/psycstore/gnunet-service-psycstore.c:431 +#, fuzzy, c-format +#| msgid "Unknown command `%s'\n" +msgid "Unknown operator: %c\n" +msgstr "Comando `%s' sconosciuto.\n" + +#: src/psycstore/gnunet-service-psycstore.c:441 +#, fuzzy +#| msgid "Failed to read file" +msgid "Failed to end modifying state!\n" +msgstr "Impossibile leggere il file" + +#: src/psycstore/gnunet-service-psycstore.c:479 +msgid "Failed to begin synchronizing state!\n" msgstr "" -#: src/peerstore/peerstore_api.c:671 -msgid "Received a malformed response from service." +#: src/psycstore/gnunet-service-psycstore.c:495 +msgid "Failed to end synchronizing state!\n" msgstr "" -#: src/peerstore/peerstore_api.c:807 -msgid "Received a watch result for a non existing watch.\n" +#: src/psycstore/gnunet-service-psycstore.c:515 +#: src/psycstore/gnunet-service-psycstore.c:534 +#, fuzzy +#| msgid "Failed to read file" +msgid "Failed to reset state!\n" +msgstr "Impossibile leggere il file" + +#: src/psycstore/gnunet-service-psycstore.c:557 +#: src/psycstore/gnunet-service-psycstore.c:608 +msgid "Tried to get invalid state variable name!\n" msgstr "" -#: src/peerstore/plugin_peerstore_sqlite.c:453 +#: src/psycstore/gnunet-service-psycstore.c:584 +#: src/psycstore/gnunet-service-psycstore.c:623 +#, fuzzy +#| msgid "Failed to start service.\n" +msgid "Failed to get state variable!\n" +msgstr "Impossibile avviare il servizio.\n" + +#: src/psycstore/plugin_psycstore_sqlite.c:60 #, c-format -msgid "" -"Error executing SQL query: %s\n" -" %s\n" +msgid "`%s' failed at %s:%d with error: %s (%d)\n" msgstr "" -#: src/peerstore/plugin_peerstore_sqlite.c:488 +#: src/psycstore/plugin_psycstore_sqlite.c:253 #, c-format msgid "" "Error preparing SQL query: %s\n" " %s\n" msgstr "" -#: src/peerstore/plugin_peerstore_sqlite.c:570 +#: src/psycstore/plugin_psycstore_sqlite.c:276 #, c-format -msgid "Unable to create indices: %s.\n" +msgid "" +"Error executing SQL query: %s\n" +" %s\n" msgstr "" -#: src/pq/pq_prepare.c:84 -#, c-format -msgid "PQprepare (`%s' as `%s') failed with error: %s\n" +#: src/psycstore/plugin_psycstore_sqlite.c:1796 +msgid "SQLite database running\n" msgstr "" -#: src/pt/gnunet-daemon-pt.c:423 +#: src/pt/gnunet-daemon-pt.c:482 msgid "Failed to pack DNS request. Dropping.\n" msgstr "" -#: src/pt/gnunet-daemon-pt.c:429 +#: src/pt/gnunet-daemon-pt.c:488 msgid "# DNS requests mapped to VPN" msgstr "" -#: src/pt/gnunet-daemon-pt.c:483 +#: src/pt/gnunet-daemon-pt.c:541 msgid "# DNS records modified" msgstr "" -#: src/pt/gnunet-daemon-pt.c:667 +#: src/pt/gnunet-daemon-pt.c:717 msgid "# DNS replies intercepted" msgstr "" -#: src/pt/gnunet-daemon-pt.c:674 +#: src/pt/gnunet-daemon-pt.c:723 msgid "Failed to parse DNS request. Dropping.\n" msgstr "" -#: src/pt/gnunet-daemon-pt.c:712 +#: src/pt/gnunet-daemon-pt.c:826 msgid "# DNS requests dropped (timeout)" msgstr "" -#: src/pt/gnunet-daemon-pt.c:768 +#: src/pt/gnunet-daemon-pt.c:883 msgid "# DNS requests intercepted" msgstr "" -#: src/pt/gnunet-daemon-pt.c:773 -msgid "# DNS requests dropped (DNS cadet channel down)" +#: src/pt/gnunet-daemon-pt.c:888 +msgid "# DNS requests dropped (DNS mesh channel down)" msgstr "" -#: src/pt/gnunet-daemon-pt.c:781 +#: src/pt/gnunet-daemon-pt.c:896 msgid "# DNS requests dropped (malformed)" msgstr "" -#: src/pt/gnunet-daemon-pt.c:876 +#: src/pt/gnunet-daemon-pt.c:969 msgid "# DNS replies received" msgstr "" -#: src/pt/gnunet-daemon-pt.c:893 +#: src/pt/gnunet-daemon-pt.c:985 msgid "# DNS replies dropped (too late?)" msgstr "" -#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228 -#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253 -#: src/pt/gnunet-daemon-pt.c:1262 +#: src/pt/gnunet-daemon-pt.c:1261 src/pt/gnunet-daemon-pt.c:1270 +#: src/pt/gnunet-daemon-pt.c:1290 src/pt/gnunet-daemon-pt.c:1301 +#: src/pt/gnunet-daemon-pt.c:1310 #, c-format msgid "Failed to connect to %s service. Exiting.\n" msgstr "" -#: src/pt/gnunet-daemon-pt.c:1307 +#: src/pt/gnunet-daemon-pt.c:1347 msgid "Daemon to run to perform IP protocol translation to GNUnet" msgstr "" -#: src/reclaim/gnunet-reclaim.c:495 -#, c-format -msgid "Ego is required\n" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:501 -#, c-format -msgid "Attribute value missing!\n" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:507 -#, c-format -msgid "Requesting party key is required!\n" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:524 -msgid "Add an attribute NAME" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:527 -msgid "Add an attribute with ID" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:530 -msgid "The attribute VALUE" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:533 -msgid "The EGO to use" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:535 -msgid "Specify the relying party for issue" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:538 -msgid "List attributes for EGO" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:542 -msgid "Issue a ticket for a set of attributes separated by comma" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:545 -msgid "Consume a ticket" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:548 -msgid "Revoke a ticket" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:551 -msgid "Type of attribute" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:553 -msgid "List tickets of ego" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:556 -msgid "Expiration interval of the attribute" -msgstr "" - -#: src/reclaim/gnunet-reclaim.c:560 -msgid "re:claimID command line tool" -msgstr "" - -#: src/reclaim/plugin_rest_openid_connect.c:2051 -#: src/reclaim/plugin_rest_reclaim.c:1018 -msgid "Identity Provider REST API initialized\n" -msgstr "" - -#: src/reclaim/reclaim_api.c:436 -msgid "failed to store record\n" -msgstr "" - -#: src/regex/gnunet-daemon-regexprofiler.c:267 +#: src/regex/gnunet-daemon-regexprofiler.c:270 +#: src/regex/gnunet-regex-simulation-profiler.c:659 #, c-format msgid "%s service is lacking key configuration settings (%s). Exiting.\n" msgstr "" #: src/regex/gnunet-daemon-regexprofiler.c:380 -msgid "Daemon to announce regular expressions for the peer using cadet." +msgid "Daemon to announce regular expressions for the peer using mesh." msgstr "" -#: src/regex/gnunet-regex-profiler.c:1386 +#: src/regex/gnunet-regex-profiler.c:1288 msgid "No configuration file given. Exiting\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1427 -#: src/regex/gnunet-regex-simulation-profiler.c:630 +#: src/regex/gnunet-regex-profiler.c:1299 +msgid "Configuration option \"regex_prefix\" missing. Exiting\n" +msgstr "" + +#: src/regex/gnunet-regex-profiler.c:1328 +#: src/regex/gnunet-regex-simulation-profiler.c:622 #, c-format msgid "No policy directory specified on command line. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1433 -#: src/regex/gnunet-regex-simulation-profiler.c:638 +#: src/regex/gnunet-regex-profiler.c:1334 +#: src/regex/gnunet-regex-simulation-profiler.c:629 #, c-format msgid "Specified policies directory does not exist. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1440 +#: src/regex/gnunet-regex-profiler.c:1341 #, c-format msgid "No files found in `%s'\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1449 +#: src/regex/gnunet-regex-profiler.c:1350 msgid "No search strings file given. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1469 +#: src/regex/gnunet-regex-profiler.c:1370 msgid "Error loading search strings. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1557 +#: src/regex/gnunet-regex-profiler.c:1455 msgid "name of the file for writing statistics" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1563 +#: src/regex/gnunet-regex-profiler.c:1458 msgid "wait TIMEOUT before ending the experiment" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1569 +#: src/regex/gnunet-regex-profiler.c:1461 msgid "directory with policy files" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1576 +#: src/regex/gnunet-regex-profiler.c:1464 msgid "name of file with input strings" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1582 +#: src/regex/gnunet-regex-profiler.c:1467 msgid "name of file with hosts' names" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1595 +#: src/regex/gnunet-regex-profiler.c:1479 msgid "Profiler for regex" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:699 +#: src/regex/gnunet-regex-simulation-profiler.c:689 msgid "name of the table to write DFAs" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:705 +#: src/regex/gnunet-regex-simulation-profiler.c:692 msgid "maximum path compression length" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:719 +#: src/regex/gnunet-regex-simulation-profiler.c:705 msgid "Profiler for regex library" msgstr "" -#: src/regex/regex_api_announce.c:152 +#: src/regex/regex_api.c:131 #, c-format msgid "Regex `%s' is too long!\n" msgstr "" -#: src/regex/regex_api_search.c:212 -#, c-format -msgid "Search string `%s' is too long!\n" -msgstr "" - -#: src/rest/gnunet-rest-server.c:986 -msgid "listen on specified port (default: 7776)" -msgstr "" - -#: src/rest/gnunet-rest-server.c:1003 -msgid "GNUnet REST server" -msgstr "" - -#: src/rest/plugin_rest_copying.c:209 -msgid "COPYING REST API initialized\n" -msgstr "" - -#: src/revocation/gnunet-revocation.c:129 +#: src/revocation/gnunet-revocation.c:126 #, c-format msgid "Key `%s' is valid\n" msgstr "" -#: src/revocation/gnunet-revocation.c:134 +#: src/revocation/gnunet-revocation.c:131 #, c-format msgid "Key `%s' has been revoked\n" msgstr "" -#: src/revocation/gnunet-revocation.c:140 +#: src/revocation/gnunet-revocation.c:137 msgid "Internal error\n" msgstr "Errore interno\n" -#: src/revocation/gnunet-revocation.c:166 +#: src/revocation/gnunet-revocation.c:163 #, c-format msgid "Key for ego `%s' is still valid, revocation failed (!)\n" msgstr "" -#: src/revocation/gnunet-revocation.c:171 +#: src/revocation/gnunet-revocation.c:168 msgid "Revocation failed (!)\n" msgstr "" -#: src/revocation/gnunet-revocation.c:176 +#: src/revocation/gnunet-revocation.c:173 #, c-format msgid "Key for ego `%s' has been successfully revoked\n" msgstr "" -#: src/revocation/gnunet-revocation.c:181 +#: src/revocation/gnunet-revocation.c:178 msgid "Revocation successful.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:186 +#: src/revocation/gnunet-revocation.c:183 msgid "Internal error, key revocation might have failed\n" msgstr "" -#: src/revocation/gnunet-revocation.c:323 +#: src/revocation/gnunet-revocation.c:294 #, c-format msgid "Revocation certificate for `%s' stored in `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:352 +#: src/revocation/gnunet-revocation.c:324 #, c-format msgid "Ego `%s' not found.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:373 +#: src/revocation/gnunet-revocation.c:345 #, c-format msgid "Error: revocation certificate in `%s' is not for `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:393 +#: src/revocation/gnunet-revocation.c:365 msgid "Revocation certificate ready\n" msgstr "" -#: src/revocation/gnunet-revocation.c:403 +#: src/revocation/gnunet-revocation.c:375 msgid "Revocation certificate not ready, calculating proof of work\n" msgstr "" -#: src/revocation/gnunet-revocation.c:437 +#: src/revocation/gnunet-revocation.c:407 #, c-format msgid "Public key `%s' malformed\n" msgstr "" -#: src/revocation/gnunet-revocation.c:450 -msgid "" -"Testing and revoking at the same time is not allowed, only executing test.\n" +#: src/revocation/gnunet-revocation.c:421 +msgid "Testing and revoking at the same time is not allowed, only executing test.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:470 +#: src/revocation/gnunet-revocation.c:441 msgid "No filename to store revocation certificate given.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:491 +#: src/revocation/gnunet-revocation.c:463 #, c-format msgid "Failed to read revocation certificate from `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:516 +#: src/revocation/gnunet-revocation.c:488 msgid "No action specified. Nothing to do.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:535 +#: src/revocation/gnunet-revocation.c:504 msgid "use NAME for the name of the revocation file" msgstr "" -#: src/revocation/gnunet-revocation.c:541 -msgid "" -"revoke the private key associated for the the private key associated with " -"the ego NAME " +#: src/revocation/gnunet-revocation.c:507 +msgid "revoke the private key associated for the the private key associated with the ego NAME " msgstr "" -#: src/revocation/gnunet-revocation.c:546 +#: src/revocation/gnunet-revocation.c:510 msgid "actually perform revocation, otherwise we just do the precomputation" msgstr "" -#: src/revocation/gnunet-revocation.c:552 +#: src/revocation/gnunet-revocation.c:513 msgid "test if the public key KEY has been revoked" msgstr "" -#: src/revocation/gnunet-service-revocation.c:459 -msgid "# unsupported revocations received via set union" +#: src/revocation/gnunet-service-revocation.c:272 +msgid "Duplicate revocation received from peer. Ignored.\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:468 -msgid "# revocation messages received via set union" -msgstr "" - -#: src/revocation/gnunet-service-revocation.c:473 +#: src/revocation/gnunet-service-revocation.c:434 #, c-format msgid "Error computing revocation set union with %s\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:477 -msgid "# revocation set unions failed" +#: src/revocation/gnunet-service-revocation.c:486 +msgid "SET service crashed, terminating revocation service\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:486 -msgid "# revocation set unions completed" +#: src/revocation/gnunet-service-revocation.c:812 +msgid "Could not open revocation database file!" msgstr "" -#: src/revocation/gnunet-service-revocation.c:525 -msgid "SET service crashed, terminating revocation service\n" +#: src/scalarproduct/gnunet-scalarproduct.c:225 +msgid "You must specify at least one message ID to check!\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:867 -msgid "Could not open revocation database file!" +#: src/scalarproduct/gnunet-scalarproduct.c:232 +msgid "This program needs a session identifier for comparing vectors.\n" msgstr "" -#: src/rps/gnunet-rps.c:260 -msgid "Seed a PeerID" +#: src/scalarproduct/gnunet-scalarproduct.c:239 +msgid "Please give a session key for --input_key!\n" msgstr "" -#: src/rps/gnunet-rps.c:264 -msgid "Get updates of view (0 for infinite updates)" +#: src/scalarproduct/gnunet-scalarproduct.c:251 +#, c-format +msgid "Tried to set initiator mode, as peer ID was given. However, `%s' is not a valid peer identifier.\n" msgstr "" -#: src/rps/gnunet-rps.c:268 -msgid "Get peers from biased stream" +#: src/scalarproduct/gnunet-scalarproduct.c:278 +#: src/scalarproduct/gnunet-scalarproduct.c:314 +#, c-format +msgid "Could not convert `%s' to int32_t.\n" msgstr "" -#: src/rps/gnunet-rps-profiler.c:3088 -msgid "duration of the profiling" +#: src/scalarproduct/gnunet-scalarproduct.c:286 +msgid "Need elements to compute the vectorproduct, got none.\n" msgstr "" -#: src/rps/gnunet-rps-profiler.c:3093 -msgid "timeout for the profiling" +#: src/scalarproduct/gnunet-scalarproduct.c:346 +#, c-format +msgid "Could not convert `%s' to integer.\n" msgstr "" -#: src/rps/gnunet-rps-profiler.c:3098 -msgid "number of PeerIDs to request" +#: src/scalarproduct/gnunet-scalarproduct.c:407 +msgid "A comma separated list of elements to compare as vector with our remote peer." msgstr "" -#: src/rps/gnunet-rps-profiler.c:3114 -msgid "Measure quality and performance of the RPS service." +#: src/scalarproduct/gnunet-scalarproduct.c:410 +msgid "A comma separated mask to select which elements should actually be compared." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:220 -msgid "You must specify at least one message ID to check!\n" +#: src/scalarproduct/gnunet-scalarproduct.c:413 +msgid "[Optional] peer to calculate our scalarproduct with. If this parameter is not given, the service will wait for a remote peer to compute the request." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:227 -msgid "This program needs a session identifier for comparing vectors.\n" +#: src/scalarproduct/gnunet-scalarproduct.c:416 +msgid "Transaction ID shared with peer." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:240 +#: src/scalarproduct/gnunet-scalarproduct.c:425 +msgid "Calculate the Vectorproduct with a GNUnet peer." +msgstr "" + +#: src/scalarproduct/gnunet-service-scalarproduct.c:541 #, c-format -msgid "" -"Tried to set initiator mode, as peer ID was given. However, `%s' is not a " -"valid peer identifier.\n" +msgid "Client (%p) disconnected from us.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:258 -msgid "Need elements to compute the scalarproduct, got none.\n" +#: src/scalarproduct/gnunet-service-scalarproduct.c:613 +#: src/scalarproduct/gnunet-service-scalarproduct.c:702 +#, c-format +msgid "Could not send message to client (%p)!\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:280 +#: src/scalarproduct/gnunet-service-scalarproduct.c:619 #, c-format -msgid "Malformed input, could not parse `%s'\n" +msgid "Sending session-end notification to client (%p) for session %s\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:298 +#: src/scalarproduct/gnunet-service-scalarproduct.c:712 #, c-format -msgid "Could not convert `%s' to int64_t.\n" +msgid "Sent result to client (%p), this session (%s) has ended!\n" +msgstr "" + +#: src/scalarproduct/gnunet-service-scalarproduct.c:766 +#: src/scalarproduct/gnunet-service-scalarproduct.c:855 +msgid "Could not send service-response message via mesh!)\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:325 +#: src/scalarproduct/gnunet-service-scalarproduct.c:1028 #, c-format -msgid "Failed to initiate computation, were all keys unique?\n" +msgid "Failed to communicate with `%s', scalar product calculation aborted.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:351 -#: src/scalarproduct/gnunet-scalarproduct.c:357 -msgid "" -"A comma separated list of elements to compare as vector with our remote peer." +#: src/scalarproduct/gnunet-service-scalarproduct.c:1099 +#: src/scalarproduct/gnunet-service-scalarproduct.c:1208 +#, fuzzy +#| msgid "Starting service `%s'\n" +msgid "Transmitting service request.\n" +msgstr "Avvio del servizio '%s' in corso\n" + +#: src/scalarproduct/gnunet-service-scalarproduct.c:1108 +msgid "Could not send service-request multipart message to channel!\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:363 -msgid "" -"[Optional] peer to calculate our scalarproduct with. If this parameter is " -"not given, the service will wait for a remote peer to compute the request." +#: src/scalarproduct/gnunet-service-scalarproduct.c:1147 +#, c-format +msgid "Successfully created new channel to peer (%s)!\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:369 -msgid "Transaction ID shared with peer." +#: src/scalarproduct/gnunet-service-scalarproduct.c:1217 +msgid "Could not send message to channel!\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:379 -msgid "Calculate the Vectorproduct with a GNUnet peer." +#: src/scalarproduct/gnunet-service-scalarproduct.c:1274 +msgid "Too short message received from client!\n" msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 -#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 -msgid "Connect to CADET failed\n" +#: src/scalarproduct/gnunet-service-scalarproduct.c:1287 +msgid "Invalid message received from client, session information incorrect!\n" msgstr "" -#: src/scalarproduct/scalarproduct_api.c:185 -msgid "Keys given to SCALARPRODUCT not unique!\n" +#: src/scalarproduct/gnunet-service-scalarproduct.c:1298 +#, c-format +msgid "Duplicate session information received, cannot create new session with key `%s'\n" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:616 -msgid "dkg start delay" +#: src/scalarproduct/gnunet-service-scalarproduct.c:1318 +#, c-format +msgid "Got client-request-session with key %s, preparing channel to remote service.\n" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:622 -msgid "dkg timeout" +#: src/scalarproduct/gnunet-service-scalarproduct.c:1354 +#, c-format +msgid "Creating new channel for session with key %s.\n" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:628 -msgid "threshold" +#: src/scalarproduct/gnunet-service-scalarproduct.c:1399 +#, c-format +msgid "Got client-responder-session with key %s and a matching service-request-session set, processing.\n" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:633 -msgid "also profile decryption" +#: src/scalarproduct/gnunet-service-scalarproduct.c:1409 +#, c-format +msgid "Got client-responder-session with key %s but NO matching service-request-session set, queuing element for later use.\n" msgstr "" -#: src/set/gnunet-service-set.c:2008 -msgid "Could not connect to CADET service\n" +#: src/scalarproduct/gnunet-service-scalarproduct.c:1439 +#, c-format +msgid "New incoming channel from peer %s.\n" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:252 -msgid "number of element in set A-B" +#: src/scalarproduct/gnunet-service-scalarproduct.c:1471 +#, c-format +msgid "Peer disconnected, terminating session %s with peer (%s)\n" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:258 -msgid "number of element in set B-A" +#: src/scalarproduct/gnunet-service-scalarproduct.c:1672 +#: src/scalarproduct/gnunet-service-scalarproduct.c:1814 +#, c-format +msgid "Got session with key %s and a matching element set, processing.\n" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:264 -msgid "number of common elements in A and B" +#: src/scalarproduct/gnunet-service-scalarproduct.c:1681 +#: src/scalarproduct/gnunet-service-scalarproduct.c:1821 +#, c-format +msgid "Got session with key %s without a matching element set, queueing.\n" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:270 -msgid "hash num" +#: src/scalarproduct/gnunet-service-scalarproduct.c:1771 +#, c-format +msgid "Got message with duplicate session key (`%s'), ignoring service request.\n" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:276 -msgid "ibf size" +#: src/scalarproduct/gnunet-service-scalarproduct.c:2014 +msgid "Shutting down, initiating cleanup.\n" msgstr "" -#: src/set/gnunet-set-profiler.c:444 -msgid "use byzantine mode" +#: src/scalarproduct/gnunet-service-scalarproduct.c:2100 +msgid "Connect to MESH failed\n" msgstr "" -#: src/set/gnunet-set-profiler.c:450 -msgid "force sending full set" +#: src/scalarproduct/gnunet-service-scalarproduct.c:2104 +msgid "Mesh initialized\n" msgstr "" -#: src/set/gnunet-set-profiler.c:456 -msgid "number delta operation" +#: src/scalarproduct/scalarproduct_api.c:246 +#, fuzzy +#| msgid "# SYN messages received" +msgid "# SUC responder result messages received" +msgstr "# messaggi SYN ricevuti" + +#: src/scalarproduct/scalarproduct_api.c:300 +#, fuzzy +#| msgid "# bytes encrypted" +msgid "# bytes sent to scalarproduct" +msgstr "# byte crittografati" + +#: src/scalarproduct/scalarproduct_api.c:345 +#: src/scalarproduct/scalarproduct_api.c:440 +#, fuzzy +#| msgid "Failed to start service.\n" +msgid "Failed to connect to the scalarproduct service\n" +msgstr "Impossibile avviare il servizio.\n" + +#: src/scalarproduct/scalarproduct_api.c:353 +#: src/scalarproduct/scalarproduct_api.c:448 +#, fuzzy +#| msgid "Failed to start service.\n" +msgid "Failed to send a message to the statistics service\n" +msgstr "Impossibile avviare il servizio.\n" + +#: src/scalarproduct/scalarproduct_api.c:387 +#: src/scalarproduct/scalarproduct_api.c:485 +#, fuzzy +#| msgid "Failed to start service.\n" +msgid "Failed to send a message to the scalarproduct service\n" +msgstr "Impossibile avviare il servizio.\n" + +#: src/secretsharing/gnunet-secretsharing-profiler.c:538 +msgid "dkg start delay" msgstr "" -#: src/set/gnunet-set-profiler.c:468 -msgid "operation to execute" +#: src/secretsharing/gnunet-secretsharing-profiler.c:541 +msgid "dkg timeout" msgstr "" -#: src/set/gnunet-set-profiler.c:474 -msgid "element size" +#: src/secretsharing/gnunet-secretsharing-profiler.c:544 +msgid "threshold" msgstr "" -#: src/sq/sq.c:54 -#, c-format -msgid "Failure to bind %u-th SQL parameter\n" +#: src/secretsharing/gnunet-secretsharing-profiler.c:547 +msgid "also profile decryption" msgstr "" -#: src/sq/sq.c:61 -msgid "Failure in sqlite3_reset (!)\n" +#: src/set/gnunet-service-set.c:1431 +msgid "Could not connect to mesh service\n" msgstr "" -#: src/sq/sq.c:139 -#, c-format -msgid "Failed to reset sqlite statement with error: %s\n" +#: src/set/gnunet-set-ibf-profiler.c:221 +msgid "number of element in set A-B" msgstr "" -#: src/statistics/gnunet-service-statistics.c:338 -#, c-format -msgid "Wrote %llu bytes of statistics to `%s'\n" +#: src/set/gnunet-set-ibf-profiler.c:224 +msgid "number of element in set B-A" +msgstr "" + +#: src/set/gnunet-set-ibf-profiler.c:227 +msgid "number of common elements in A and B" +msgstr "" + +#: src/set/gnunet-set-ibf-profiler.c:230 +msgid "hash num" +msgstr "" + +#: src/set/gnunet-set-ibf-profiler.c:233 +msgid "ibf size" msgstr "" -#: src/statistics/gnunet-service-statistics.c:1086 +#: src/set/gnunet-set-profiler.c:295 +msgid "oeration to execute" +msgstr "" + +#: src/statistics/gnunet-service-statistics.c:280 #, c-format msgid "Loading %llu bytes of statistics from `%s'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:409 -#: src/statistics/gnunet-statistics.c:450 +#: src/statistics/gnunet-service-statistics.c:346 +#, c-format +msgid "Wrote %llu bytes of statistics to `%s'\n" +msgstr "" + +#: src/statistics/gnunet-statistics.c:140 msgid "Failed to obtain statistics.\n" msgstr "" -#: src/statistics/gnunet-statistics.c:412 -#: src/statistics/gnunet-statistics.c:453 +#: src/statistics/gnunet-statistics.c:142 #, c-format msgid "Failed to obtain statistics from host `%s:%llu'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:528 +#: src/statistics/gnunet-statistics.c:189 msgid "Missing argument: subsystem \n" msgstr "" -#: src/statistics/gnunet-statistics.c:536 +#: src/statistics/gnunet-statistics.c:195 msgid "Missing argument: name\n" msgstr "" -#: src/statistics/gnunet-statistics.c:579 +#: src/statistics/gnunet-statistics.c:226 #, c-format msgid "No subsystem or name given\n" msgstr "" -#: src/statistics/gnunet-statistics.c:594 +#: src/statistics/gnunet-statistics.c:234 #, c-format msgid "Failed to initialize watch routine\n" msgstr "" -#: src/statistics/gnunet-statistics.c:729 +#: src/statistics/gnunet-statistics.c:261 #, c-format -msgid "Invalid argument `%s'\n" +msgid "Trying to connect to remote host, but service `%s' is not running\n" msgstr "" -#: src/statistics/gnunet-statistics.c:747 +#: src/statistics/gnunet-statistics.c:269 #, c-format msgid "A port is required to connect to host `%s'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:755 +#: src/statistics/gnunet-statistics.c:276 #, c-format msgid "A port has to be between 1 and 65535 to connect to host `%s'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:786 +#: src/statistics/gnunet-statistics.c:308 #, c-format -msgid "Not able to watch testbed nodes (yet - feel free to implement)\n" +msgid "Invalid argument `%s'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:819 +#: src/statistics/gnunet-statistics.c:334 msgid "limit output to statistics for the given NAME" msgstr "" -#: src/statistics/gnunet-statistics.c:824 +#: src/statistics/gnunet-statistics.c:337 msgid "make the value being set persistent" msgstr "" -#: src/statistics/gnunet-statistics.c:830 +#: src/statistics/gnunet-statistics.c:340 msgid "limit output to the given SUBSYSTEM" msgstr "" -#: src/statistics/gnunet-statistics.c:836 -msgid "use as csv separator" -msgstr "" - -#: src/statistics/gnunet-statistics.c:842 -msgid "path to the folder containing the testbed data" -msgstr "" - -#: src/statistics/gnunet-statistics.c:847 +#: src/statistics/gnunet-statistics.c:343 msgid "just print the statistics value" msgstr "" -#: src/statistics/gnunet-statistics.c:852 +#: src/statistics/gnunet-statistics.c:346 msgid "watch value continuously" msgstr "" -#: src/statistics/gnunet-statistics.c:858 +#: src/statistics/gnunet-statistics.c:349 msgid "connect to remote host" msgstr "" -#: src/statistics/gnunet-statistics.c:864 +#: src/statistics/gnunet-statistics.c:352 msgid "port for remote host" msgstr "" -#: src/statistics/gnunet-statistics.c:881 +#: src/statistics/gnunet-statistics.c:364 msgid "Print statistics about GNUnet operations." msgstr "" -#: src/statistics/statistics_api.c:753 +#: src/statistics/statistics_api.c:519 msgid "Could not save some persistent statistics\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:225 -msgid "Need at least 2 arguments\n" +#: src/statistics/statistics_api.c:1090 +msgid "Failed to receive acknowledgement from statistics service, some statistics might have been lost!\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:230 +#: src/testbed/generate-underlay-topology.c:223 +msgid "Need atleast 2 arguments\n" +msgstr "" + +#: src/testbed/generate-underlay-topology.c:228 msgid "Database filename missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:237 +#: src/testbed/generate-underlay-topology.c:235 msgid "Topology string missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:242 +#: src/testbed/generate-underlay-topology.c:240 #, c-format msgid "Invalid topology: %s\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:255 +#: src/testbed/generate-underlay-topology.c:252 #, c-format msgid "An argument is missing for given topology `%s'\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:261 +#: src/testbed/generate-underlay-topology.c:258 #, c-format msgid "Invalid argument `%s' given as topology argument\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:269 +#: src/testbed/generate-underlay-topology.c:266 #, c-format msgid "Filename argument missing for topology `%s'\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:283 +#: src/testbed/generate-underlay-topology.c:280 #, c-format msgid "Second argument for topology `%s' is missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:289 +#: src/testbed/generate-underlay-topology.c:286 #, c-format msgid "Invalid argument `%s'; expecting unsigned int\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:342 -#: src/testbed/gnunet-testbed-profiler.c:282 +#: src/testbed/generate-underlay-topology.c:335 +#: src/testbed/gnunet-testbed-profiler.c:293 msgid "create COUNT number of peers" msgstr "" -#: src/testbed/generate-underlay-topology.c:352 +#: src/testbed/generate-underlay-topology.c:344 msgid "" "Generates SQLite3 database representing a given underlay topology.\n" "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n" -"The following options are available for TOPO followed by TOPOOPTS if " -"applicable:\n" +"The following options are available for TOPO followed by TOPOOPTS if applicable:\n" "\t LINE\n" "\t RING\n" "\t RANDOM \n" @@ -6245,230 +6012,182 @@ msgid "" "\t cap: the maximum number of links a node can have\n" "\t m: the number of links a node should have while joining the network\n" "\t filename: the path of the file which contains topology information\n" -"NOTE: the format of the above file is descibed here: https://www.gnunet.org/" -"content/topology-file-format\n" +"NOTE: the format of the above file is descibed here: https://www.gnunet.org/content/topology-file-format\n" msgstr "" -#: src/testbed/gnunet-daemon-latency-logger.c:315 +#: src/testbed/gnunet-daemon-latency-logger.c:325 msgid "Daemon to log latency values of connections to neighbours" msgstr "" -#: src/testbed/gnunet-daemon-testbed-blacklist.c:249 -msgid "" -"Daemon to restrict incoming transport layer connections during testbed " -"deployments" +#: src/testbed/gnunet-daemon-testbed-blacklist.c:264 +msgid "Daemon to restrict incoming transport layer connections during testbed deployments" msgstr "" -#: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46 -#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312 +#: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50 +#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217 #, c-format msgid "Incorrect hostkey file format: %s\n" msgstr "" -#: src/testbed/gnunet-daemon-testbed-underlay.c:471 +#: src/testbed/gnunet-daemon-testbed-underlay.c:474 msgid "Daemon to restrict underlay network in testbed deployments" msgstr "" -#: src/testbed/gnunet-service-testbed_cpustatus.c:728 +#: src/testbed/gnunet-service-testbed_cpustatus.c:730 #, c-format -msgid "" -"Cannot open %s for writing load statistics. Not logging load statistics\n" -msgstr "" - -#: src/testbed/gnunet-service-testbed_peers.c:1159 -#, c-format -msgid "%s is stopped" -msgstr "" - -#: src/testbed/gnunet-service-testbed_peers.c:1161 -#, c-format -msgid "%s is starting" -msgstr "" - -#: src/testbed/gnunet-service-testbed_peers.c:1163 -#, c-format -msgid "%s is stopping" -msgstr "" - -#: src/testbed/gnunet-service-testbed_peers.c:1165 -#, c-format -msgid "%s is starting already" -msgstr "" - -#: src/testbed/gnunet-service-testbed_peers.c:1167 -#, c-format -msgid "%s is stopping already" -msgstr "" - -#: src/testbed/gnunet-service-testbed_peers.c:1169 -#, c-format -msgid "%s is started already" +msgid "Cannot open %s for writing load statistics. Not logging load statistics\n" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1171 -#, c-format -msgid "%s is stopped already" +#: src/testbed/gnunet-service-testbed_peers.c:1015 +msgid "Misconfiguration (can't connect to the ARM service)" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1173 -#, c-format -msgid "%s service is not known to ARM" +#: src/testbed/gnunet-service-testbed_peers.c:1021 +msgid "Request doesn't fit into a message" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1175 -#, c-format -msgid "%s service failed to start" -msgstr "" - -#: src/testbed/gnunet-service-testbed_peers.c:1177 +#: src/testbed/gnunet-service-testbed_peers.c:1059 #, c-format msgid "%s service can't be started because ARM is shutting down" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1179 -#, c-format -msgid "%.s Unknown result code." -msgstr "" - -#: src/testbed/gnunet_testbed_mpi_spawn.c:118 +#: src/testbed/gnunet_testbed_mpi_spawn.c:125 msgid "Waiting for child to exit.\n" msgstr "" -#: src/testbed/gnunet_testbed_mpi_spawn.c:241 +#: src/testbed/gnunet_testbed_mpi_spawn.c:247 #, c-format msgid "Spawning process `%s'\n" msgstr "" -#: src/testbed/gnunet-testbed-profiler.c:287 -msgid "tolerate COUNT number of continious timeout failures" +#: src/testbed/gnunet-testbed-profiler.c:267 +#, c-format +msgid "Exiting as the number of peers is %u\n" msgstr "" -#: src/testbed/gnunet-testbed-profiler.c:291 -msgid "" -"run profiler in non-interactive mode where upon testbed setup the profiler " -"does not wait for a keystroke but continues to run until a termination " -"signal is received" +#: src/testbed/gnunet-testbed-profiler.c:296 +msgid "tolerate COUNT number of continious timeout failures" msgstr "" -#: src/testbed/testbed_api.c:410 -#, c-format -msgid "Adding host %u failed with error: %s\n" +#: src/testbed/gnunet-testbed-profiler.c:299 +msgid "run profiler in non-interactive mode where upon testbed setup the profiler does not wait for a keystroke but continues to run until a termination signal is received" msgstr "" -#: src/testbed/testbed_api_hosts.c:413 +#: src/testbed/testbed_api_hosts.c:415 #, c-format msgid "Hosts file %s not found\n" msgstr "" -#: src/testbed/testbed_api_hosts.c:421 +#: src/testbed/testbed_api_hosts.c:423 #, c-format msgid "Hosts file %s has no data\n" msgstr "" -#: src/testbed/testbed_api_hosts.c:428 +#: src/testbed/testbed_api_hosts.c:430 #, c-format msgid "Hosts file %s cannot be read\n" msgstr "" -#: src/testbed/testbed_api_hosts.c:569 +#: src/testbed/testbed_api_hosts.c:570 #, c-format msgid "The function %s is only available when compiled with (--with-ll)\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:818 +#: src/testbed/testbed_api_hosts.c:1586 +#, c-format +msgid "Adding host %u failed with error: %s\n" +msgstr "" + +#: src/testbed/testbed_api_testbed.c:819 msgid "Linking controllers failed. Exiting" msgstr "" -#: src/testbed/testbed_api_testbed.c:986 +#: src/testbed/testbed_api_testbed.c:988 #, c-format msgid "Host registration failed for a host. Error: %s\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1052 +#: src/testbed/testbed_api_testbed.c:1054 msgid "Controller crash detected. Shutting down.\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1141 +#: src/testbed/testbed_api_testbed.c:1143 #, c-format msgid "Host %s cannot start testbed\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1145 +#: src/testbed/testbed_api_testbed.c:1147 msgid "Testbed cannot be started on localhost\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1183 +#: src/testbed/testbed_api_testbed.c:1185 msgid "Cannot start the master controller" msgstr "" -#: src/testbed/testbed_api_testbed.c:1201 +#: src/testbed/testbed_api_testbed.c:1203 msgid "Shutting down testbed due to timeout while setup.\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1261 +#: src/testbed/testbed_api_testbed.c:1263 msgid "No hosts loaded from LoadLeveler. Need at least one host\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1273 +#: src/testbed/testbed_api_testbed.c:1275 msgid "No hosts loaded. Need at least one host\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1297 +#: src/testbed/testbed_api_testbed.c:1299 msgid "Specified topology must be supported by testbed" msgstr "" -#: src/testbed/testbed_api_testbed.c:1347 +#: src/testbed/testbed_api_testbed.c:1349 #, c-format -msgid "" -"Maximum number of edges a peer can have in a scale free topology cannot be " -"more than %u. Given `%s = %llu'" +msgid "Maximum number of edges a peer can have in a scale free topology cannot be more than %u. Given `%s = %llu'" msgstr "" -#: src/testbed/testbed_api_testbed.c:1363 +#: src/testbed/testbed_api_testbed.c:1365 #, c-format -msgid "" -"The number of edges that can established when adding a new node to scale " -"free topology cannot be more than %u. Given `%s = %llu'" +msgid "The number of edges that can established when adding a new node to scale free topology cannot be more than %u. Given `%s = %llu'" msgstr "" -#: src/testbed/testbed_api_topology.c:1028 +#: src/testbed/testbed_api_topology.c:960 #, c-format msgid "Topology file %s not found\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1036 +#: src/testbed/testbed_api_topology.c:966 #, c-format msgid "Topology file %s has no data\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1044 +#: src/testbed/testbed_api_topology.c:973 #, c-format msgid "Topology file %s cannot be read\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1066 +#: src/testbed/testbed_api_topology.c:995 #, c-format msgid "Failed to read peer index from toology file: %s" msgstr "" -#: src/testbed/testbed_api_topology.c:1075 -#: src/testbed/testbed_api_topology.c:1099 +#: src/testbed/testbed_api_topology.c:1004 +#: src/testbed/testbed_api_topology.c:1028 #, c-format msgid "Value in given topology file: %s out of range\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1081 -#: src/testbed/testbed_api_topology.c:1105 +#: src/testbed/testbed_api_topology.c:1010 +#: src/testbed/testbed_api_topology.c:1034 #, c-format msgid "Failed to read peer index from topology file: %s" msgstr "" -#: src/testbed/testbed_api_topology.c:1087 -#: src/testbed/testbed_api_topology.c:1111 +#: src/testbed/testbed_api_topology.c:1016 +#: src/testbed/testbed_api_topology.c:1040 msgid "Topology file needs more peers than given ones\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1145 +#: src/testbed/testbed_api_topology.c:1074 #, c-format msgid "Ignoring to connect peer %u to peer %u\n" msgstr "" @@ -6478,848 +6197,929 @@ msgstr "" msgid "Could not extract hostkey %u (offset too large?)\n" msgstr "" -#: src/testing/gnunet-testing.c:253 +#: src/testing/gnunet-testing.c:258 #, c-format msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n" msgstr "" -#: src/testing/gnunet-testing.c:354 +#: src/testing/gnunet-testing.c:355 msgid "create unique configuration files" msgstr "" -#: src/testing/gnunet-testing.c:359 +#: src/testing/gnunet-testing.c:357 msgid "extract hostkey file from pre-computed hostkey list" msgstr "" -#: src/testing/gnunet-testing.c:365 -msgid "" -"number of unique configuration files to create, or number of the hostkey to " -"extract" +#: src/testing/gnunet-testing.c:359 +msgid "number of unique configuration files to create, or number of the hostkey to extract" msgstr "" -#: src/testing/gnunet-testing.c:372 +#: src/testing/gnunet-testing.c:361 msgid "configuration template" msgstr "" -#: src/testing/gnunet-testing.c:378 +#: src/testing/gnunet-testing.c:363 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)" msgstr "" -#: src/testing/gnunet-testing.c:391 +#: src/testing/gnunet-testing.c:376 msgid "Command line tool to access the testing library" msgstr "" -#: src/testing/list-keys.c:89 +#: src/testing/list-keys.c:90 msgid "list COUNT number of keys" msgstr "" -#: src/testing/testing.c:272 +#: src/testing/list-keys.c:93 +msgid "skip COUNT number of keys in the beginning" +msgstr "" + +#: src/testing/testing.c:277 #, c-format msgid "Hostkeys file not found: %s\n" msgstr "" -#: src/testing/testing.c:715 +#: src/testing/testing.c:718 #, c-format msgid "Key number %u does not exist\n" msgstr "" -#: src/testing/testing.c:1161 +#: src/testing/testing.c:1157 #, c-format -msgid "" -"You attempted to create a testbed with more than %u hosts. Please " -"precompute more hostkeys first.\n" +msgid "You attempted to create a testbed with more than %u hosts. Please precompute more hostkeys first.\n" msgstr "" -#: src/testing/testing.c:1170 +#: src/testing/testing.c:1166 #, c-format msgid "Failed to initialize hostkey for peer %u\n" msgstr "" -#: src/testing/testing.c:1180 +#: src/testing/testing.c:1176 msgid "PRIVATE_KEY option in PEER section missing in configuration\n" msgstr "" -#: src/testing/testing.c:1193 +#: src/testing/testing.c:1189 msgid "Failed to create configuration for peer (not enough free ports?)\n" msgstr "" -#: src/testing/testing.c:1207 +#: src/testing/testing.c:1203 #, c-format msgid "Cannot open hostkey file `%s': %s\n" msgstr "" -#: src/testing/testing.c:1219 +#: src/testing/testing.c:1215 #, c-format msgid "Failed to write hostkey file for peer %u: %s\n" msgstr "" -#: src/testing/testing.c:1244 +#: src/testing/testing.c:1240 #, c-format msgid "Failed to write configuration file `%s' for peer %u: %s\n" msgstr "" -#: src/testing/testing.c:1346 +#: src/testing/testing.c:1342 #, c-format msgid "Failed to start `%s': %s\n" msgstr "" -#: src/testing/testing.c:1649 +#: src/testing/testing.c:1706 #, c-format msgid "Failed to load configuration from %s\n" msgstr "" -#: src/topology/friends.c:126 +#: src/topology/friends.c:100 #, c-format msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n" msgstr "" -#: src/topology/friends.c:180 +#: src/topology/friends.c:154 #, c-format msgid "Directory for file `%s' does not seem to be writable.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:230 +#: src/topology/gnunet-daemon-topology.c:255 msgid "# peers blacklisted" -msgstr "" +msgstr "# nodi in blacklist" -#: src/topology/gnunet-daemon-topology.c:344 -msgid "# connect requests issued to ATS" +#: src/topology/gnunet-daemon-topology.c:388 +msgid "# connect requests issued to transport" msgstr "" -#: src/topology/gnunet-daemon-topology.c:538 -msgid "# HELLO messages gossipped" -msgstr "" - -#: src/topology/gnunet-daemon-topology.c:640 -#: src/topology/gnunet-daemon-topology.c:726 +#: src/topology/gnunet-daemon-topology.c:728 +#: src/topology/gnunet-daemon-topology.c:813 msgid "# friends connected" -msgstr "" +msgstr "# amici connessi" -#: src/topology/gnunet-daemon-topology.c:923 +#: src/topology/gnunet-daemon-topology.c:993 msgid "Failed to connect to core service, can not manage topology!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:956 +#: src/topology/gnunet-daemon-topology.c:1022 #, c-format msgid "Found myself `%s' in friend list (useless, ignored)\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:963 +#: src/topology/gnunet-daemon-topology.c:1029 #, c-format msgid "Found friend `%s' in configuration\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:985 +#: src/topology/gnunet-daemon-topology.c:1050 msgid "Encountered errors parsing friends list!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:988 +#: src/topology/gnunet-daemon-topology.c:1052 msgid "# friends in configuration" msgstr "" -#: src/topology/gnunet-daemon-topology.c:995 -msgid "" -"Fewer friends specified than required by minimum friend count. Will only " -"connect to friends.\n" +#: src/topology/gnunet-daemon-topology.c:1057 +msgid "Fewer friends specified than required by minimum friend count. Will only connect to friends.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1001 -msgid "" -"More friendly connections required than target total number of connections.\n" +#: src/topology/gnunet-daemon-topology.c:1063 +msgid "More friendly connections required than target total number of connections.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1054 -#: src/transport/plugin_transport_wlan.c:1517 +#: src/topology/gnunet-daemon-topology.c:1094 msgid "# HELLO messages received" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1233 -msgid "GNUnet topology control" +#: src/topology/gnunet-daemon-topology.c:1151 +msgid "# HELLO messages gossipped" msgstr "" -#: src/transport/gnunet-communicator-tcp.c:2334 -#: src/transport/gnunet-communicator-udp.c:2938 -#: src/transport/gnunet-service-tng.c:7070 -#: src/transport/gnunet-service-transport.c:2795 -msgid "Transport service is lacking key configuration settings. Exiting.\n" +#: src/topology/gnunet-daemon-topology.c:1290 +msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)" msgstr "" -#: src/transport/gnunet-communicator-tcp.c:2398 -msgid "GNUnet TCP communicator" +#: src/transport/gnunet-service-transport_blacklist.c:271 +#, c-format +msgid "Adding blacklisting entry for peer `%s'\n" msgstr "" -#: src/transport/gnunet-communicator-udp.c:3016 -msgid "GNUnet UDP communicator" +#: src/transport/gnunet-service-transport_blacklist.c:279 +#, c-format +msgid "Adding blacklisting entry for peer `%s':`%s'\n" msgstr "" -#: src/transport/gnunet-communicator-unix.c:802 -msgid "" -"Maximum number of UNIX connections exceeded, dropping incoming message\n" +#: src/transport/gnunet-service-transport_blacklist.c:464 +#: src/transport/gnunet-service-transport_blacklist.c:745 +msgid "# disconnects due to blacklist" msgstr "" -#: src/transport/gnunet-communicator-unix.c:1074 -#: src/transport/plugin_transport_unix.c:1403 -#, c-format -msgid "Cannot create path to `%s'\n" +#: src/transport/gnunet-service-transport.c:220 +msgid "# bytes payload discarded due to not connected peer" msgstr "" -#: src/transport/gnunet-communicator-unix.c:1163 -msgid "GNUnet UNIX domain socket communicator" +#: src/transport/gnunet-service-transport.c:424 +msgid "# bytes total received" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 -msgid "# Addresses given to ATS" +#: src/transport/gnunet-service-transport.c:515 +msgid "# bytes payload received" msgstr "" -#: src/transport/gnunet-service-transport.c:452 -msgid "# messages dropped due to slow client" +#: src/transport/gnunet-service-transport.c:686 +#, c-format +msgid "Could not obtain a valid network for `%s' %s (%s)\n" msgstr "" -#: src/transport/gnunet-service-transport.c:826 -msgid "# bytes payload dropped (other peer was not connected)" +#: src/transport/gnunet-service-transport.c:733 +#, c-format +msgid "Address or session unknown: failed to update properties for peer `%s' plugin `%s' address `%s' session %p\n" msgstr "" -#: src/transport/gnunet-service-transport.c:1563 -msgid "# bytes payload discarded due to not connected peer" +#: src/transport/gnunet-service-transport.c:1084 +msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "" -#: src/transport/gnunet-service-transport.c:1723 -msgid "# bytes total received" +#: src/transport/gnunet-service-transport_clients.c:432 +#, c-format +msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n" msgstr "" -#: src/transport/gnunet-service-transport.c:1820 -msgid "# bytes payload received" +#: src/transport/gnunet-service-transport_clients.c:439 +msgid "# messages dropped due to slow client" msgstr "" -#: src/transport/gnunet-service-transport.c:2137 -#: src/transport/gnunet-service-transport.c:2609 -msgid "# disconnects due to blacklist" +#: src/transport/gnunet-service-transport_clients.c:596 +#, c-format +msgid "Rejecting control connection from peer `%s', which is not me!\n" msgstr "" -#: src/transport/gnunet-service-transport.c:2613 -#, c-format -msgid "Disallowing connection to peer `%s' on transport %s\n" +#: src/transport/gnunet-service-transport_clients.c:737 +msgid "# bytes payload dropped (other peer was not connected)" msgstr "" -#: src/transport/gnunet-service-transport.c:2721 +#: src/transport/gnunet-service-transport_clients.c:770 #, c-format -msgid "Adding blacklisting entry for peer `%s'\n" +msgid "Blacklist refuses connection attempt to peer `%s'\n" msgstr "" -#: src/transport/gnunet-service-transport.c:2730 +#: src/transport/gnunet-service-transport_clients.c:776 #, c-format -msgid "Adding blacklisting entry for peer `%s':`%s'\n" +msgid "Blacklist allows connection attempt to peer `%s'\n" msgstr "" -#: src/transport/gnunet-service-transport_hello.c:195 -msgid "# refreshed my HELLO" +#: src/transport/gnunet-service-transport_clients.c:801 +#, fuzzy +#| msgid "# PONG messages received" +msgid "# REQUEST CONNECT messages received" +msgstr "# messaggi PONG ricevuti" + +#: src/transport/gnunet-service-transport_clients.c:815 +#, c-format +msgid "Received a request connect message for peer `%s'\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:805 -msgid "# session creation failed" +#: src/transport/gnunet-service-transport_clients.c:826 +#, fuzzy +#| msgid "# PONG messages received" +msgid "# REQUEST DISCONNECT messages received" +msgstr "# messaggi PONG ricevuti" + +#: src/transport/gnunet-service-transport_clients.c:840 +#, c-format +msgid "Received a request disconnect message for peer `%s'\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1053 -msgid "# DISCONNECT messages sent" +#: src/transport/gnunet-service-transport_hello.c:181 +msgid "# refreshed my HELLO" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1176 -msgid "# disconnects due to quota of 0" +#: src/transport/gnunet-service-transport_neighbours.c:1095 +msgid "# DISCONNECT messages sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1324 -#: src/transport/gnunet-service-transport_neighbours.c:1785 +#: src/transport/gnunet-service-transport_neighbours.c:1220 +#: src/transport/gnunet-service-transport_neighbours.c:1629 msgid "# bytes in message queue for other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1329 +#: src/transport/gnunet-service-transport_neighbours.c:1225 msgid "# messages transmitted to other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1335 +#: src/transport/gnunet-service-transport_neighbours.c:1230 msgid "# transmission failures for messages to other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1395 +#: src/transport/gnunet-service-transport_neighbours.c:1287 msgid "# messages timed out while in transport queue" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1479 -msgid "# KEEPALIVES sent" -msgstr "" +#: src/transport/gnunet-service-transport_neighbours.c:1343 +#, fuzzy +#| msgid "# SYN messages sent" +msgid "# keepalives sent" +msgstr "# messaggi SYN inviati" -#: src/transport/gnunet-service-transport_neighbours.c:1515 +#: src/transport/gnunet-service-transport_neighbours.c:1376 msgid "# KEEPALIVE messages discarded (peer unknown)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1523 +#: src/transport/gnunet-service-transport_neighbours.c:1384 msgid "# KEEPALIVE messages discarded (no session)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1533 -msgid "# KEEPALIVES received in good order" -msgstr "" - -#: src/transport/gnunet-service-transport_neighbours.c:1578 -msgid "# KEEPALIVE_RESPONSEs discarded (not connected)" +#: src/transport/gnunet-service-transport_neighbours.c:1431 +msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1587 -msgid "# KEEPALIVE_RESPONSEs discarded (not expected)" +#: src/transport/gnunet-service-transport_neighbours.c:1440 +msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1595 -msgid "# KEEPALIVE_RESPONSEs discarded (address changed)" +#: src/transport/gnunet-service-transport_neighbours.c:1448 +msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1604 -msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)" +#: src/transport/gnunet-service-transport_neighbours.c:1456 +msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1609 -msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)" -msgstr "" - -#: src/transport/gnunet-service-transport_neighbours.c:1615 -msgid "# KEEPALIVE_RESPONSEs received (OK)" -msgstr "" - -#: src/transport/gnunet-service-transport_neighbours.c:1682 +#: src/transport/gnunet-service-transport_neighbours.c:1534 msgid "# messages discarded due to lack of neighbour record" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1716 +#: src/transport/gnunet-service-transport_neighbours.c:1568 msgid "# bandwidth quota violations by other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1731 +#: src/transport/gnunet-service-transport_neighbours.c:1584 msgid "# ms throttling suggested" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1854 +#: src/transport/gnunet-service-transport_neighbours.c:1678 #, c-format -msgid "Failed to send SYN message to peer `%s'\n" +msgid "Failed to send CONNECT message to peer `%s' using address `%s' session %p\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1874 -msgid "# Failed attempts to switch addresses (failed to send SYN CONT)" +#: src/transport/gnunet-service-transport_neighbours.c:1705 +msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1913 +#: src/transport/gnunet-service-transport_neighbours.c:1751 #, fuzzy -msgid "# SYN messages sent" +#| msgid "# PONG messages decrypted" +msgid "# SESSION_CONNECT messages sent" msgstr "# messaggi PONG decrittati" -#: src/transport/gnunet-service-transport_neighbours.c:1930 +#: src/transport/gnunet-service-transport_neighbours.c:1767 #, c-format -msgid "Failed to transmit SYN message to %s\n" +msgid "Failed to transmit CONNECT message via plugin to %s\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1960 -msgid "# Failed attempts to switch addresses (failed to send SYN)" +#: src/transport/gnunet-service-transport_neighbours.c:1794 +msgid "# Failed attempts to switch addresses (failed to send CONNECT)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2028 +#: src/transport/gnunet-service-transport_neighbours.c:1844 #, c-format -msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n" +msgid "Failed to send CONNECT_ACK message to peer `%s' using address `%s' session %p\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2082 +#: src/transport/gnunet-service-transport_neighbours.c:1899 #, fuzzy -msgid "# SYN_ACK messages sent" +#| msgid "# PONG messages decrypted" +msgid "# CONNECT_ACK messages sent" msgstr "# messaggi PONG decrittati" -#: src/transport/gnunet-service-transport_neighbours.c:2099 +#: src/transport/gnunet-service-transport_neighbours.c:1914 #, c-format -msgid "Failed to transmit SYN_ACK message to %s\n" +msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2262 +#: src/transport/gnunet-service-transport_neighbours.c:2192 +#, c-format +msgid "Blacklisting disapproved to connect to peer `%s'\n" +msgstr "" + +#: src/transport/gnunet-service-transport_neighbours.c:2312 #, fuzzy -msgid "# SYN messages received" +#| msgid "# PONG messages received" +msgid "# CONNECT messages received" msgstr "# messaggi PONG ricevuti" -#: src/transport/gnunet-service-transport_neighbours.c:2267 +#: src/transport/gnunet-service-transport_neighbours.c:2317 #, c-format -msgid "SYN request from peer `%s' ignored due impending shutdown\n" +msgid "CONNECT request from peer `%s' ignored due impending shutdown\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2654 +#: src/transport/gnunet-service-transport_neighbours.c:2590 msgid "# Attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3139 +#: src/transport/gnunet-service-transport_neighbours.c:3012 +msgid "# Failed attempts to switch addresses (no response)" +msgstr "" + +#: src/transport/gnunet-service-transport_neighbours.c:3107 #, fuzzy -msgid "# SYN_ACK messages received" +#| msgid "# PONG messages received" +msgid "# CONNECT_ACK messages received" msgstr "# messaggi PONG ricevuti" -#: src/transport/gnunet-service-transport_neighbours.c:3147 -msgid "# unexpected SYN_ACK messages (no peer)" +#: src/transport/gnunet-service-transport_neighbours.c:3115 +msgid "# unexpected CONNECT_ACK messages (no peer)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3165 -#: src/transport/gnunet-service-transport_neighbours.c:3189 -msgid "# unexpected SYN_ACK messages (not ready)" +#: src/transport/gnunet-service-transport_neighbours.c:3129 +#: src/transport/gnunet-service-transport_neighbours.c:3164 +msgid "# unexpected CONNECT_ACK messages (not ready)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3201 -msgid "# unexpected SYN_ACK messages (waiting on ATS)" +#: src/transport/gnunet-service-transport_neighbours.c:3176 +msgid "# unexpected CONNECT_ACK messages (waiting on ATS)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3226 +#: src/transport/gnunet-service-transport_neighbours.c:3200 msgid "# Successful attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3239 -msgid "# unexpected SYN_ACK messages (disconnecting)" +#: src/transport/gnunet-service-transport_neighbours.c:3208 +msgid "# unexpected CONNECT_ACK messages (disconnecting)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3412 +#: src/transport/gnunet-service-transport_neighbours.c:3396 +#, fuzzy +#| msgid "# PONG messages received" +msgid "# SESSION_ACK messages received" +msgstr "# messaggi PONG ricevuti" + +#: src/transport/gnunet-service-transport_neighbours.c:3424 +#, fuzzy +#| msgid "# PONG messages decrypted" +msgid "# unexpected SESSION_ACK messages" +msgstr "# messaggi PONG decrittati" + +#: src/transport/gnunet-service-transport_neighbours.c:3490 #, fuzzy -msgid "# ACK messages received" +#| msgid "# PONG messages received" +msgid "# SET QUOTA messages ignored (no such peer)" msgstr "# messaggi PONG ricevuti" -#: src/transport/gnunet-service-transport_neighbours.c:3448 -msgid "# unexpected ACK messages" -msgstr "" - -#: src/transport/gnunet-service-transport_neighbours.c:3536 -msgid "# quota messages ignored (malformed)" +#: src/transport/gnunet-service-transport_neighbours.c:3505 +msgid "# disconnects due to quota of 0" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3543 -#, fuzzy -msgid "# QUOTA messages received" -msgstr "# messaggi PONG ricevuti" - -#: src/transport/gnunet-service-transport_neighbours.c:3583 +#: src/transport/gnunet-service-transport_neighbours.c:3545 msgid "# disconnect messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3590 +#: src/transport/gnunet-service-transport_neighbours.c:3551 msgid "# DISCONNECT messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3601 +#: src/transport/gnunet-service-transport_neighbours.c:3560 msgid "# disconnect messages ignored (timestamp)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3736 +#: src/transport/gnunet-service-transport_neighbours.c:3687 msgid "# disconnected from peer upon explicit request" msgstr "" -#: src/transport/gnunet-service-transport_plugins.c:158 +#: src/transport/gnunet-service-transport_plugins.c:120 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n" msgstr "" -#: src/transport/gnunet-service-transport_plugins.c:223 -#: src/transport/gnunet-service-transport_plugins.c:231 -#: src/transport/gnunet-service-transport_plugins.c:239 -#: src/transport/gnunet-service-transport_plugins.c:247 -#: src/transport/gnunet-service-transport_plugins.c:255 -#: src/transport/gnunet-service-transport_plugins.c:263 -#: src/transport/gnunet-service-transport_plugins.c:271 -#: src/transport/gnunet-service-transport_plugins.c:279 -#: src/transport/gnunet-service-transport_plugins.c:287 -#: src/transport/gnunet-service-transport_plugins.c:295 -#: src/transport/gnunet-service-transport_plugins.c:303 +#: src/transport/gnunet-service-transport_plugins.c:178 +#: src/transport/gnunet-service-transport_plugins.c:186 +#: src/transport/gnunet-service-transport_plugins.c:194 +#: src/transport/gnunet-service-transport_plugins.c:202 +#: src/transport/gnunet-service-transport_plugins.c:210 +#: src/transport/gnunet-service-transport_plugins.c:218 +#: src/transport/gnunet-service-transport_plugins.c:226 +#: src/transport/gnunet-service-transport_plugins.c:234 +#: src/transport/gnunet-service-transport_plugins.c:242 +#: src/transport/gnunet-service-transport_plugins.c:250 +#: src/transport/gnunet-service-transport_plugins.c:258 #, c-format msgid "Missing function `%s' in transport plugin for `%s'\n" msgstr "" -#: src/transport/gnunet-service-transport_plugins.c:310 +#: src/transport/gnunet-service-transport_plugins.c:265 #, c-format msgid "Did not load plugin `%s' due to missing functions\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:388 -msgid "# Addresses in validation map" -msgstr "" - -#: src/transport/gnunet-service-transport_validation.c:491 -#: src/transport/gnunet-service-transport_validation.c:677 -#: src/transport/gnunet-service-transport_validation.c:997 -#: src/transport/gnunet-service-transport_validation.c:1610 -msgid "# validations running" +#: src/transport/gnunet-service-transport_validation.c:488 +msgid "# address records discarded" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:532 -msgid "# address records discarded (timeout)" -msgstr "" - -#: src/transport/gnunet-service-transport_validation.c:580 -msgid "# address records discarded (blacklist)" -msgstr "" - -#: src/transport/gnunet-service-transport_validation.c:668 -msgid "# PINGs for address validation sent" +#: src/transport/gnunet-service-transport_validation.c:558 +#, c-format +msgid "Not transmitting `%s' with `%s', message too big (%u bytes!). This should not happen.\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:748 -msgid "# validations delayed by global throttle" -msgstr "" +#: src/transport/gnunet-service-transport_validation.c:616 +#, fuzzy +#| msgid "# SYN messages sent" +msgid "# PING without HELLO messages sent" +msgstr "# messaggi SYN inviati" -#: src/transport/gnunet-service-transport_validation.c:785 +#: src/transport/gnunet-service-transport_validation.c:722 msgid "# address revalidations started" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1124 +#: src/transport/gnunet-service-transport_validation.c:1011 msgid "# PING message for different peer received" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1175 +#: src/transport/gnunet-service-transport_validation.c:1062 #, c-format msgid "Plugin `%s' not available, cannot confirm having this address\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1188 +#: src/transport/gnunet-service-transport_validation.c:1072 msgid "# failed address checks during validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1191 +#: src/transport/gnunet-service-transport_validation.c:1075 #, c-format msgid "Address `%s' is not one of my addresses, not confirming PING\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1199 +#: src/transport/gnunet-service-transport_validation.c:1083 msgid "# successful address checks during validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1212 +#: src/transport/gnunet-service-transport_validation.c:1095 #, c-format -msgid "" -"Not confirming PING from peer `%s' with address `%s' since I cannot confirm " -"having this address.\n" +msgid "Not confirming PING from peer `%s' with address `%s' since I cannot confirm having this address.\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1267 +#: src/transport/gnunet-service-transport_validation.c:1103 +#, c-format +msgid "Received a PING message with validation bug from `%s'\n" +msgstr "" + +#: src/transport/gnunet-service-transport_validation.c:1157 #, c-format msgid "Failed to create PONG signature for peer `%s'\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1318 +#: src/transport/gnunet-service-transport_validation.c:1206 msgid "# PONGs unicast via reliable transport" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1327 +#: src/transport/gnunet-service-transport_validation.c:1215 msgid "# PONGs multicast to all available addresses" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1500 +#: src/transport/gnunet-service-transport_validation.c:1356 msgid "# PONGs dropped, no matching pending validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1518 +#: src/transport/gnunet-service-transport_validation.c:1371 msgid "# PONGs dropped, signature expired" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1573 -msgid "# validations succeeded" +#: src/transport/gnunet-service-transport_validation.c:1493 +#, c-format +msgid "Validation received new %s message for peer `%s' with size %u\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1628 -msgid "# HELLOs given to peerinfo" +#: src/transport/gnunet-service-transport_validation.c:1500 +#, c-format +msgid "Adding `%s' without addresses for peer `%s'\n" msgstr "" -#: src/transport/gnunet-transport.c:413 +#: src/transport/gnunet-transport.c:367 #, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" msgstr "" -#: src/transport/gnunet-transport.c:423 +#: src/transport/gnunet-transport.c:375 #, c-format msgid "Received %llu bytes/s (%llu bytes in %s)\n" msgstr "" -#: src/transport/gnunet-transport.c:467 +#: src/transport/gnunet-transport.c:415 #, c-format msgid "Failed to connect to `%s'\n" msgstr "" -#: src/transport/gnunet-transport.c:480 +#: src/transport/gnunet-transport.c:428 #, c-format msgid "Failed to resolve address for peer `%s'\n" msgstr "" -#: src/transport/gnunet-transport.c:494 +#: src/transport/gnunet-transport.c:438 #, fuzzy -msgid "Failed to list connections, timeout occurred\n" +#| msgid "# active connections" +msgid "Failed to list connections, timeout occured\n" msgstr "# connessioni attive" -#: src/transport/gnunet-transport.c:527 -#, c-format -msgid "Transmitting %u bytes\n" -msgstr "" - -#: src/transport/gnunet-transport.c:561 +#: src/transport/gnunet-transport.c:559 #, c-format msgid "" -"Successfully connected to `%s', starting to send benchmark data in %u Kb " -"blocks\n" +"Peer `%s' %s %s\n" +"\t%s%s\n" +"\t%s%s\n" +"\t%s%s\n" msgstr "" -#: src/transport/gnunet-transport.c:592 -#, c-format -msgid "Disconnected from peer `%s' while benchmarking\n" +#: src/transport/gnunet-transport.c:586 +#, fuzzy, c-format +#| msgid "Peer `%s'\n" +msgid "Peer `%s' %s `%s' \n" +msgstr "Peer `%s'\n" + +#: src/transport/gnunet-transport.c:712 +msgid "No transport plugins configured, peer will never communicate\n" msgstr "" -#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645 +#: src/transport/gnunet-transport.c:726 #, c-format -msgid "%24s: %-17s %4s (%u connections in total)\n" +msgid "No port configured for plugin `%s', cannot test it\n" msgstr "" -#: src/transport/gnunet-transport.c:618 -msgid "Connected to" +#: src/transport/gnunet-transport.c:789 +#, c-format +msgid "Transmitting %u bytes to %s\n" msgstr "" -#: src/transport/gnunet-transport.c:647 -msgid "Disconnected from" +#: src/transport/gnunet-transport.c:810 +#, c-format +msgid "Successfully connected to `%s'\n" msgstr "" -#: src/transport/gnunet-transport.c:682 +#: src/transport/gnunet-transport.c:834 #, c-format -msgid "Received %u bytes\n" +msgid "Successfully connected to `%s', starting to send benchmark data in %u Kb blocks\n" msgstr "" -#: src/transport/gnunet-transport.c:719 +#: src/transport/gnunet-transport.c:865 #, c-format -msgid "Peer `%s': %s %s in state `%s' until %s\n" +msgid "Successfully disconnected from `%s'\n" msgstr "" -#: src/transport/gnunet-transport.c:731 +#: src/transport/gnunet-transport.c:888 #, c-format -msgid "Peer `%s': %s %s\n" +msgid "Disconnected from peer `%s' while benchmarking\n" msgstr "" -#: src/transport/gnunet-transport.c:1144 -msgid "Monitor disconnected from transport service. Reconnecting.\n" +#: src/transport/gnunet-transport.c:950 +#, c-format +msgid "Received %u bytes from %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1251 +#: src/transport/gnunet-transport.c:975 #, c-format -msgid "" -"Multiple operations given. Please choose only one operation: %s, %s, %s, %s, " -"%s, %s %s\n" +msgid "Peer `%s': %s %s in state `%s' until %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1264 +#: src/transport/gnunet-transport.c:986 #, c-format -msgid "" -"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n" +msgid "Peer `%s': %s %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1294 -msgid "Failed to connect to transport service for disconnection\n" +#: src/transport/gnunet-transport.c:1197 src/transport/gnunet-transport.c:1222 +#, fuzzy +#| msgid "Failed to start service.\n" +msgid "Failed to send connect request to transport service\n" +msgstr "Impossibile avviare il servizio.\n" + +#: src/transport/gnunet-transport.c:1266 +#, c-format +msgid "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, %s, %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1300 -msgid "Blacklisting request in place, stop with CTRL-C\n" +#: src/transport/gnunet-transport.c:1274 +#, c-format +msgid "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355 -#: src/transport/gnunet-transport.c:1408 +#: src/transport/gnunet-transport.c:1293 src/transport/gnunet-transport.c:1323 +#: src/transport/gnunet-transport.c:1353 src/transport/gnunet-transport.c:1376 +#: src/transport/gnunet-transport.c:1419 msgid "Failed to connect to transport service\n" msgstr "" +#: src/transport/gnunet-transport.c:1302 src/transport/gnunet-transport.c:1332 #: src/transport/gnunet-transport.c:1362 +#, fuzzy +#| msgid "Failed to start service.\n" +msgid "Failed to send request to transport service\n" +msgstr "Impossibile avviare il servizio.\n" + +#: src/transport/gnunet-transport.c:1381 msgid "Starting to receive benchmark data\n" msgstr "" -#: src/transport/gnunet-transport.c:1433 -msgid "print information for all peers (instead of only connected peers)" +#: src/transport/gnunet-transport.c:1465 +msgid "print information for all peers (instead of only connected peers )" msgstr "" -#: src/transport/gnunet-transport.c:1437 +#: src/transport/gnunet-transport.c:1468 msgid "measure how fast we are receiving data from all peers (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1441 -msgid "disconnect from a peer" +#: src/transport/gnunet-transport.c:1471 +msgid "connect to a peer" +msgstr "" + +#: src/transport/gnunet-transport.c:1474 +#, fuzzy +#| msgid "# friends connected" +msgid "disconnect to a peer" +msgstr "# amici connessi" + +#: src/transport/gnunet-transport.c:1477 +msgid "print information for all pending validations " +msgstr "" + +#: src/transport/gnunet-transport.c:1480 +msgid "print information for all pending validations continously" msgstr "" -#: src/transport/gnunet-transport.c:1445 +#: src/transport/gnunet-transport.c:1483 msgid "provide information about all current connections (once)" msgstr "" -#: src/transport/gnunet-transport.c:1453 -msgid "" -"provide information about all connects and disconnect events (continuously)" +#: src/transport/gnunet-transport.c:1489 +msgid "provide information about all connects and disconnect events (continuously)" msgstr "" -#: src/transport/gnunet-transport.c:1457 +#: src/transport/gnunet-transport.c:1491 msgid "do not resolve hostnames" msgstr "" -#: src/transport/gnunet-transport.c:1462 -#: src/transport/gnunet-transport-profiler.c:641 +#: src/transport/gnunet-transport.c:1493 msgid "peer identity" msgstr "" -#: src/transport/gnunet-transport.c:1466 -msgid "monitor plugin sessions" +#: src/transport/gnunet-transport.c:1495 +msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1471 -msgid "send data for benchmarking to the other peer (until CTRL-C)" +#: src/transport/gnunet-transport.c:1498 +msgid "test transport configuration (involves external server)" msgstr "" -#: src/transport/gnunet-transport.c:1482 -#: src/transport/gnunet-transport-profiler.c:652 +#: src/transport/gnunet-transport.c:1507 msgid "Direct access to transport service." msgstr "" -#: src/transport/gnunet-transport-profiler.c:219 -#, c-format -msgid "%llu B in %llu ms == %.2f KB/s!\n" +#: src/transport/plugin_transport_bluetooth.c:621 +msgid "# Bluetooth ACKs sent" +msgstr "" + +#: src/transport/plugin_transport_bluetooth.c:640 +#, fuzzy +#| msgid "# PONG messages decrypted" +msgid "# Bluetooth messages defragmented" +msgstr "# messaggi PONG decrittati" + +#: src/transport/plugin_transport_bluetooth.c:686 +#: src/transport/plugin_transport_bluetooth.c:737 +#: src/transport/plugin_transport_bluetooth.c:1942 +msgid "# Bluetooth sessions allocated" +msgstr "" + +#: src/transport/plugin_transport_bluetooth.c:837 +#, fuzzy +#| msgid "# PONG messages decrypted" +msgid "# Bluetooth message fragments sent" +msgstr "# messaggi PONG decrittati" + +#: src/transport/plugin_transport_bluetooth.c:861 +msgid "# Bluetooth messages pending (with fragmentation)" msgstr "" -#: src/transport/gnunet-transport-profiler.c:617 -msgid "send data to peer" +#: src/transport/plugin_transport_bluetooth.c:969 +#: src/transport/plugin_transport_bluetooth.c:1054 +#: src/transport/plugin_transport_bluetooth.c:1944 +msgid "# Bluetooth MAC endpoints allocated" msgstr "" -#: src/transport/gnunet-transport-profiler.c:621 -msgid "receive data from peer" +#: src/transport/plugin_transport_bluetooth.c:1307 +#, fuzzy +#| msgid "# PONG messages received" +msgid "# HELLO messages received via Bluetooth" +msgstr "# messaggi PONG ricevuti" + +#: src/transport/plugin_transport_bluetooth.c:1331 +msgid "# fragments received via Bluetooth" msgstr "" -#: src/transport/gnunet-transport-profiler.c:626 -msgid "iterations" +#: src/transport/plugin_transport_bluetooth.c:1341 +#, fuzzy +#| msgid "# ACKs received" +msgid "# ACKs received via Bluetooth" +msgstr "# ACK ricevuti" + +#: src/transport/plugin_transport_bluetooth.c:1401 +msgid "# Bluetooth DATA messages discarded due to CRC32 error" msgstr "" -#: src/transport/gnunet-transport-profiler.c:631 -msgid "number of messages to send" +#: src/transport/plugin_transport_bluetooth.c:1512 +#, fuzzy +#| msgid "# PONG messages received" +msgid "# DATA messages received via Bluetooth" +msgstr "# messaggi PONG ricevuti" + +#: src/transport/plugin_transport_bluetooth.c:1547 +#, fuzzy +#| msgid "# PONG messages received" +msgid "# Bluetooth DATA messages processed" +msgstr "# messaggi PONG ricevuti" + +#: src/transport/plugin_transport_bluetooth.c:1610 +msgid "# HELLO beacons sent via Bluetooth" msgstr "" -#: src/transport/gnunet-transport-profiler.c:636 -msgid "message size to use" +#: src/transport/plugin_transport_bluetooth.c:1723 +msgid "Bluetooth address with invalid size encountered\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:1474 -#: src/transport/plugin_transport_http_server.c:2312 -#: src/transport/plugin_transport_http_server.c:3530 -#: src/transport/plugin_transport_tcp.c:3901 -#: src/transport/plugin_transport_tcp.c:3908 -msgid "TCP_STEALTH not supported on this platform.\n" +#: src/transport/plugin_transport_bluetooth.c:1923 +#, c-format +msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2115 +#: src/transport/plugin_transport_http_client.c:1622 #, c-format msgid "Could not initialize curl multi handle, failed to start %s plugin!\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2164 -#: src/transport/plugin_transport_http_server.c:3245 +#: src/transport/plugin_transport_http_client.c:1697 +#: src/transport/plugin_transport_http_server.c:3007 #, c-format msgid "Shutting down plugin `%s'\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2181 -#: src/transport/plugin_transport_http_server.c:3315 +#: src/transport/plugin_transport_http_client.c:1722 +#: src/transport/plugin_transport_http_server.c:3063 #, c-format msgid "Shutdown for plugin `%s' complete\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2215 +#: src/transport/plugin_transport_http_client.c:1750 +#: src/transport/plugin_transport_http_server.c:2907 #, c-format -msgid "Maximum number of requests is %u\n" +msgid "Maximum number of connections is %u\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:1756 +#: src/transport/plugin_transport_http_server.c:1402 #, c-format -msgid "" -"Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data " -"size %u\n" +msgid "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data size %u\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2028 +#: src/transport/plugin_transport_http_server.c:1663 #, c-format msgid "Accepting connection (%u of %u) from `%s'\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2036 +#: src/transport/plugin_transport_http_server.c:1671 #, c-format -msgid "" -"Server reached maximum number connections (%u), rejecting new connection\n" +msgid "Server reached maximum number connections (%u), rejecting new connection\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2186 -msgid "" -"Could not create a new TLS certificate, program `gnunet-transport-" -"certificate-creation' could not be started!\n" +#: src/transport/plugin_transport_http_server.c:1958 +msgid "Could not create a new TLS certificate, program `gnunet-transport-certificate-creation' could not be started!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2209 +#: src/transport/plugin_transport_http_server.c:1982 #, c-format msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2338 -msgid "Could not load or create server certificate! Loading plugin failed!\n" +#: src/transport/plugin_transport_http_server.c:2405 +msgid "Require valid port number for service in configuration!\n" +msgstr "" + +#: src/transport/plugin_transport_http_server.c:2437 src/util/service.c:698 +#, c-format +msgid "Failed to resolve `%s': %s\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2654 -msgid "Require valid port number for service in configuration!\n" +#: src/transport/plugin_transport_http_server.c:2454 src/util/service.c:715 +#, c-format +msgid "Failed to find %saddress for `%s'.\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2819 +#: src/transport/plugin_transport_http_server.c:2565 #, c-format msgid "Found %u addresses to report to NAT service\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2905 -#: src/transport/plugin_transport_udp.c:3627 +#: src/transport/plugin_transport_http_server.c:2637 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3011 +#: src/transport/plugin_transport_http_server.c:2730 #, c-format msgid "IPv4 support is %s\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3026 +#: src/transport/plugin_transport_http_server.c:2744 #, c-format msgid "IPv6 support is %s\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3032 +#: src/transport/plugin_transport_http_server.c:2751 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3043 +#: src/transport/plugin_transport_http_server.c:2762 msgid "Port is required! Fix in configuration\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3049 +#: src/transport/plugin_transport_http_server.c:2769 #, c-format msgid "Using port %u\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3068 +#: src/transport/plugin_transport_http_server.c:2784 #, c-format msgid "Specific IPv4 address `%s' in configuration file is invalid!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3103 +#: src/transport/plugin_transport_http_server.c:2794 #, c-format -msgid "Specific IPv6 address `%s' in configuration file is invalid!\n" +msgid "Binding to IPv4 address %s\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3178 +#: src/transport/plugin_transport_http_server.c:2815 #, c-format -msgid "Using external hostname `%s'\n" +msgid "Specific IPv6 address `%s' in configuration file is invalid!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3199 +#: src/transport/plugin_transport_http_server.c:2825 #, c-format -msgid "Notifying transport only about hostname `%s'\n" +msgid "Binding to IPv6 address %s\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3216 +#: src/transport/plugin_transport_http_server.c:2877 #, c-format -msgid "Maximum number of connections is %u\n" +msgid "Using external hostname `%s'\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3542 -msgid "Unable to compile URL regex\n" +#: src/transport/plugin_transport_http_server.c:2893 +#, c-format +msgid "Notifying transport only about hostname `%s'\n" msgstr "" #: src/transport/plugin_transport_smtp.c:223 @@ -7354,7 +7154,7 @@ msgstr "" #: src/transport/plugin_transport_smtp.c:664 msgid "# bytes received via SMTP" -msgstr "" +msgstr "# byte ricevuti via SMTP" #: src/transport/plugin_transport_smtp.c:665 msgid "# bytes sent via SMTP" @@ -7364,592 +7164,478 @@ msgstr "# byte inviati via SMTP" msgid "# bytes dropped by SMTP (outgoing)" msgstr "" -#: src/transport/plugin_transport_tcp.c:1557 -#: src/transport/plugin_transport_tcp.c:2883 +#: src/transport/plugin_transport_tcp.c:555 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:1740 -#: src/transport/plugin_transport_tcp.c:1964 -#: src/transport/plugin_transport_tcp.c:3147 -#: src/transport/plugin_transport_tcp.c:4024 +#: src/transport/plugin_transport_tcp.c:762 +#: src/transport/plugin_transport_tcp.c:928 +#: src/transport/plugin_transport_tcp.c:2005 +#: src/transport/plugin_transport_tcp.c:2558 msgid "# TCP sessions active" msgstr "" -#: src/transport/plugin_transport_tcp.c:1782 -#: src/transport/plugin_transport_tcp.c:1946 -#: src/transport/plugin_transport_tcp.c:2070 -#: src/transport/plugin_transport_tcp.c:2143 -#: src/transport/plugin_transport_tcp.c:2243 -#: src/transport/plugin_transport_tcp.c:2268 +#: src/transport/plugin_transport_tcp.c:795 +#: src/transport/plugin_transport_tcp.c:921 +#: src/transport/plugin_transport_tcp.c:1009 +#: src/transport/plugin_transport_tcp.c:1056 +#: src/transport/plugin_transport_tcp.c:1219 +#: src/transport/plugin_transport_tcp.c:1237 msgid "# bytes currently in TCP buffers" msgstr "" -#: src/transport/plugin_transport_tcp.c:1785 +#: src/transport/plugin_transport_tcp.c:798 msgid "# bytes discarded by TCP (disconnect)" msgstr "" -#: src/transport/plugin_transport_tcp.c:2073 +#: src/transport/plugin_transport_tcp.c:1012 msgid "# bytes discarded by TCP (timeout)" msgstr "" -#: src/transport/plugin_transport_tcp.c:2147 +#: src/transport/plugin_transport_tcp.c:1059 msgid "# bytes transmitted via TCP" msgstr "" -#: src/transport/plugin_transport_tcp.c:2545 +#: src/transport/plugin_transport_tcp.c:1193 +#, c-format +msgid "Trying to send with invalid session %p\n" +msgstr "" + +#: src/transport/plugin_transport_tcp.c:1462 msgid "# requests to create session with invalid address" msgstr "" -#: src/transport/plugin_transport_tcp.c:2721 +#: src/transport/plugin_transport_tcp.c:1567 msgid "# transport-service disconnect requests for TCP" msgstr "" -#: src/transport/plugin_transport_tcp.c:3213 +#: src/transport/plugin_transport_tcp.c:2055 msgid "# TCP WELCOME messages received" msgstr "" -#: src/transport/plugin_transport_tcp.c:3419 +#: src/transport/plugin_transport_tcp.c:2215 msgid "# bytes received via TCP" msgstr "" -#: src/transport/plugin_transport_tcp.c:3470 -#: src/transport/plugin_transport_tcp.c:3528 -#, fuzzy -msgid "# TCP server connections active" -msgstr "# connessioni attive" - -#: src/transport/plugin_transport_tcp.c:3474 -msgid "# TCP server connect events" -msgstr "" - -#: src/transport/plugin_transport_tcp.c:3480 -msgid "TCP connection limit reached, suspending server\n" -msgstr "" - -#: src/transport/plugin_transport_tcp.c:3482 -msgid "# TCP service suspended" -msgstr "" - -#: src/transport/plugin_transport_tcp.c:3522 -msgid "# TCP service resumed" +#: src/transport/plugin_transport_tcp.c:2279 +msgid "# network-level TCP disconnect events" msgstr "" -#: src/transport/plugin_transport_tcp.c:3532 -msgid "# network-level TCP disconnect events" +#: src/transport/plugin_transport_tcp.c:2437 src/util/service.c:582 +#: src/util/service.c:588 +#, c-format +msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:3851 +#: src/transport/plugin_transport_tcp.c:2451 msgid "Failed to start service.\n" -msgstr "" +msgstr "Impossibile avviare il servizio.\n" -#: src/transport/plugin_transport_tcp.c:4012 +#: src/transport/plugin_transport_tcp.c:2547 #, c-format msgid "TCP transport listening on port %llu\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4016 +#: src/transport/plugin_transport_tcp.c:2551 msgid "TCP transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4020 +#: src/transport/plugin_transport_tcp.c:2554 #, c-format msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:168 -msgid "# Multicast HELLO beacons received via UDP" +#: src/transport/plugin_transport_udp_broadcasting.c:167 +msgid "# IPv6 multicast HELLO beacons received via udp" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:548 -msgid "" -"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" +#: src/transport/plugin_transport_udp_broadcasting.c:210 +msgid "# IPv4 broadcast HELLO beacons received via udp" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:565 -#, c-format -msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" +#: src/transport/plugin_transport_udp_broadcasting.c:603 +msgid "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3371 +#: src/transport/plugin_transport_udp_broadcasting.c:626 #, c-format -msgid "" -"UDP could not transmit message to `%s': Network seems down, please check " -"your network configuration\n" +msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3385 -msgid "" -"UDP could not transmit IPv6 message! Please check your network configuration " -"and disable IPv6 if your connection does not have a global IPv6 address\n" +#: src/transport/plugin_transport_udp.c:1513 +#, c-format +msgid "Trying to create session for address of unexpected length %u (should be %u or %u)\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3703 -#: src/transport/plugin_transport_udp.c:3802 +#: src/transport/plugin_transport_udp.c:2602 #, c-format -msgid "Failed to bind UDP socket to %s: %s\n" +msgid "UDP could not transmit message to `%s': Network seems down, please check your network configuration\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3721 -msgid "Disabling IPv4 since it is not supported on this system!\n" +#: src/transport/plugin_transport_udp.c:2616 +msgid "UDP could not transmit IPv6 message! Please check your network configuration and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3812 +#: src/transport/plugin_transport_udp.c:2961 msgid "Failed to open UDP sockets\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3883 -#: src/transport/plugin_transport_udp.c:3897 -msgid "must be in [0,65535]" +#: src/transport/plugin_transport_udp.c:3056 +#, c-format +msgid "Given `%s' option is out of range: %llu > %u\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3929 -#, fuzzy -msgid "must be valid IPv4 address" -msgstr "`%s' non è un indirizzo IP valido.\n" +#: src/transport/plugin_transport_udp.c:3097 +#, c-format +msgid "Invalid IPv6 address: `%s'\n" +msgstr "Indirizzo IPv6 non valido: `%s'\n" -#: src/transport/plugin_transport_udp.c:3956 +#: src/transport/plugin_transport_udp.c:3168 #, fuzzy -msgid "must be valid IPv6 address" -msgstr "`%s' non è un indirizzo IP valido.\n" +#| msgid "Failed to create statistics!\n" +msgid "Failed to create network sockets, plugin failed\n" +msgstr "Generazione statistiche fallita\n" -#: src/transport/plugin_transport_udp.c:4020 -msgid "Failed to create UDP network sockets\n" +#: src/transport/plugin_transport_unix.c:1321 +#, c-format +msgid "Cannot create path to `%s'\n" msgstr "" -#: src/transport/plugin_transport_unix.c:1416 -#, fuzzy, c-format -msgid "Cannot bind to `%s'\n" -msgstr "Connessione stabilita con `%s'\n" +#: src/transport/plugin_transport_unix.c:1652 +msgid "No UNIXPATH given in configuration!\n" +msgstr "" -#: src/transport/plugin_transport_unix.c:1816 +#: src/transport/plugin_transport_unix.c:1688 msgid "Failed to open UNIX listen socket\n" msgstr "" -#: src/transport/plugin_transport_wlan.c:768 -msgid "# ACKs sent" -msgstr "" +#: src/transport/plugin_transport_wlan.c:620 +#, fuzzy +#| msgid "# PONG messages decrypted" +msgid "# WLAN ACKs sent" +msgstr "# messaggi PONG decrittati" -#: src/transport/plugin_transport_wlan.c:788 +#: src/transport/plugin_transport_wlan.c:639 #, fuzzy -msgid "# Messages defragmented" +#| msgid "# PONG messages decrypted" +msgid "# WLAN messages defragmented" msgstr "# messaggi PONG decrittati" -#: src/transport/plugin_transport_wlan.c:829 -#: src/transport/plugin_transport_wlan.c:914 -msgid "# Sessions allocated" +#: src/transport/plugin_transport_wlan.c:688 +#: src/transport/plugin_transport_wlan.c:772 +#: src/transport/plugin_transport_wlan.c:1948 +msgid "# WLAN sessions allocated" msgstr "" -#: src/transport/plugin_transport_wlan.c:1035 -msgid "# message fragments sent" -msgstr "" +#: src/transport/plugin_transport_wlan.c:876 +#, fuzzy +#| msgid "# SYN messages sent" +msgid "# WLAN message fragments sent" +msgstr "# messaggi SYN inviati" -#: src/transport/plugin_transport_wlan.c:1064 -msgid "# messages pending (with fragmentation)" +#: src/transport/plugin_transport_wlan.c:900 +msgid "# WLAN messages pending (with fragmentation)" msgstr "" -#: src/transport/plugin_transport_wlan.c:1193 -#: src/transport/plugin_transport_wlan.c:1284 -#: src/transport/plugin_transport_wlan.c:2305 -msgid "# MAC endpoints allocated" +#: src/transport/plugin_transport_wlan.c:1008 +#: src/transport/plugin_transport_wlan.c:1098 +#: src/transport/plugin_transport_wlan.c:1950 +msgid "# WLAN MAC endpoints allocated" msgstr "" -#: src/transport/plugin_transport_wlan.c:1567 +#: src/transport/plugin_transport_wlan.c:1302 #, fuzzy -msgid "# ACKs received" +#| msgid "# PONG messages received" +msgid "# HELLO messages received via WLAN" msgstr "# messaggi PONG ricevuti" -#: src/transport/plugin_transport_wlan.c:1636 -msgid "# DATA messages discarded due to CRC32 error" +#: src/transport/plugin_transport_wlan.c:1326 +msgid "# fragments received via WLAN" msgstr "" -#: src/transport/plugin_transport_wlan.c:1740 -msgid "# HELLO beacons sent" +#: src/transport/plugin_transport_wlan.c:1336 +#, fuzzy +#| msgid "# ACKs received" +msgid "# ACKs received via WLAN" +msgstr "# ACK ricevuti" + +#: src/transport/plugin_transport_wlan.c:1396 +msgid "# WLAN DATA messages discarded due to CRC32 error" msgstr "" -#: src/transport/plugin_transport_wlan.c:1856 +#: src/transport/plugin_transport_wlan.c:1518 #, fuzzy -msgid "# DATA messages received" +#| msgid "# PONG messages received" +msgid "# DATA messages received via WLAN" msgstr "# messaggi PONG ricevuti" -#: src/transport/plugin_transport_wlan.c:1890 +#: src/transport/plugin_transport_wlan.c:1553 #, fuzzy -msgid "# DATA messages processed" +#| msgid "# PONG messages received" +msgid "# WLAN DATA messages processed" msgstr "# messaggi PONG ricevuti" -#: src/transport/plugin_transport_wlan.c:2280 -#, c-format -msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n" -msgstr "" - -#: src/transport/plugin_transport_wlan.c:2302 -msgid "# sessions allocated" -msgstr "" - -#: src/transport/tcp_connection_legacy.c:452 -#, c-format -msgid "Access denied to `%s'\n" -msgstr "" - -#: src/transport/tcp_connection_legacy.c:469 -#, c-format -msgid "Accepting connection from `%s': %p\n" -msgstr "" - -#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1624 -#, c-format -msgid "`%s' failed for port %d (%s).\n" -msgstr "" - -#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1634 -#, c-format -msgid "`%s' failed for port %d (%s): address already in use\n" -msgstr "" - -#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1640 -#, c-format -msgid "`%s' failed for `%s': address already in use\n" -msgstr "" - -#: src/transport/tcp_server_legacy.c:890 -#, c-format -msgid "" -"Processing code for message of type %u did not call " -"`GNUNET_SERVER_receive_done' after %s\n" -msgstr "" - -#: src/transport/tcp_service_legacy.c:339 src/util/service.c:864 -#, c-format -msgid "Unknown address family %d\n" -msgstr "" - -#: src/transport/tcp_service_legacy.c:346 -#, c-format -msgid "Access from `%s' denied to service `%s'\n" -msgstr "" +#: src/transport/plugin_transport_wlan.c:1616 +#, fuzzy +#| msgid "# bytes sent via SMTP" +msgid "# HELLO beacons sent via WLAN" +msgstr "# byte inviati via SMTP" -#: src/transport/tcp_service_legacy.c:402 src/util/service.c:988 -#, c-format -msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n" +#: src/transport/plugin_transport_wlan.c:1729 +msgid "WLAN address with invalid size encountered\n" msgstr "" -#: src/transport/tcp_service_legacy.c:440 src/util/service.c:1031 +#: src/transport/plugin_transport_wlan.c:1929 #, c-format -msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n" -msgstr "" - -#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1555 -msgid "Could not access a pre-bound socket, will try to bind myself\n" +msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n" msgstr "" -#: src/transport/tcp_service_legacy.c:953 -#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1708 +#: src/transport/transport_api.c:739 #, c-format -msgid "Specified value for `%s' of service `%s' is invalid\n" +msgid "Received unexpected message of type %u in %s:%u\n" msgstr "" -#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1741 -#, c-format -msgid "Could not access pre-bound socket %u, will try to bind myself\n" +#: src/transport/transport-testing.c:584 +msgid "Failed to initialize testing library!\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1161 +#: src/tun/regex.c:129 #, c-format -msgid "Failed to start `%s' at `%s'\n" +msgid "Bad mask: %d\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1202 +#: src/util/bio.c:170 src/util/bio.c:178 #, c-format -msgid "Service `%s' runs at %s\n" -msgstr "" - -#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:2015 -msgid "Service process failed to initialize\n" -msgstr "" - -#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:2019 -msgid "Service process could not initialize server function\n" +msgid "Error reading `%s': %s" msgstr "" -#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:2023 -msgid "Service process failed to report status\n" -msgstr "" +#: src/util/bio.c:180 +msgid "End of file" +msgstr "Fine del file" -#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1535 -#: src/util/service.c:1893 +#: src/util/bio.c:237 #, c-format -msgid "Cannot obtain information about user `%s': %s\n" -msgstr "" - -#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1895 -msgid "No such user" +msgid "Error reading length of string `%s'" msgstr "" -#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1914 +#: src/util/bio.c:247 #, c-format -msgid "Cannot change user/group to `%s': %s\n" -msgstr "" - -#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:2276 -msgid "do daemonize (detach from terminal)" +msgid "String `%s' longer than allowed (%u > %u)" msgstr "" -#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:2340 -#: src/util/service.c:2355 +#: src/util/bio.c:293 #, c-format -msgid "Malformed configuration file `%s', exit ...\n" -msgstr "" - -#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:2367 -msgid "Malformed configuration, exit ...\n" +msgid "Serialized metadata `%s' larger than allowed (%u>%u)" msgstr "" -#: src/transport/tcp_service_legacy.c:1463 +#: src/util/bio.c:307 #, c-format -msgid "Could not access configuration file `%s'\n" -msgstr "" - -#: src/transport/transport_api2_communication.c:764 -msgid "Dropped backchanel message: handler not provided by communicator\n" +msgid "Metadata `%s' failed to deserialize" msgstr "" -#: src/util/bio.c:181 src/util/bio.c:189 +#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:619 #, c-format -msgid "Error reading `%s': %s" +msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" -#: src/util/bio.c:191 -msgid "End of file" -msgstr "Fine del file" - -#: src/util/bio.c:248 +#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:623 #, c-format -msgid "Error reading length of string `%s'" +msgid "Using `%s' instead\n" msgstr "" -#: src/util/bio.c:258 +#: src/util/client.c:360 #, c-format -msgid "String `%s' longer than allowed (%u > %u)" +msgid "Could not determine valid hostname and port for service `%s' from configuration.\n" msgstr "" -#: src/util/bio.c:306 +#: src/util/client.c:368 #, c-format -msgid "Serialized metadata `%s' larger than allowed (%u>%u)" +msgid "Need a non-empty hostname for service `%s'.\n" msgstr "" -#: src/util/bio.c:328 +#: src/util/client.c:1008 #, c-format -msgid "Metadata `%s' failed to deserialize" +msgid "Could not connect to service `%s', configuration broken.\n" msgstr "" -#: src/util/client.c:749 -msgid "not a valid filename" -msgstr "" +#: src/util/client.c:1020 +#, fuzzy, c-format +#| msgid "Failed to start service `%s'\n" +msgid "Failure to transmit request to service `%s'\n" +msgstr "Impossibile avviare il servizio ' %s'\n" -#: src/util/client.c:941 -#, c-format -msgid "Need a non-empty hostname for service `%s'.\n" +#: src/util/client.c:1303 +msgid "Could not submit request, not expecting to receive a response.\n" msgstr "" -#: src/util/common_logging.c:259 src/util/common_logging.c:1162 +#: src/util/common_logging.c:254 src/util/common_logging.c:1039 msgid "DEBUG" msgstr "DEBUG" -#: src/util/common_logging.c:261 src/util/common_logging.c:1160 +#: src/util/common_logging.c:256 src/util/common_logging.c:1037 msgid "INFO" -msgstr "" - -#: src/util/common_logging.c:263 src/util/common_logging.c:1158 -msgid "MESSAGE" -msgstr "" +msgstr "INFO" -#: src/util/common_logging.c:265 src/util/common_logging.c:1156 +#: src/util/common_logging.c:258 src/util/common_logging.c:1035 msgid "WARNING" -msgstr "" +msgstr "ATTENZIONE" -#: src/util/common_logging.c:267 src/util/common_logging.c:1154 +#: src/util/common_logging.c:260 src/util/common_logging.c:1033 msgid "ERROR" msgstr "ERRORE" -#: src/util/common_logging.c:269 src/util/common_logging.c:1164 +#: src/util/common_logging.c:262 src/util/common_logging.c:1041 msgid "NONE" msgstr "NESSUNA" -#: src/util/common_logging.c:633 src/util/common_logging.c:663 +#: src/util/common_logging.c:391 #, c-format -msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n" +msgid "Failed to create or access directory for log file `%s'\n" msgstr "" -#: src/util/common_logging.c:898 +#: src/util/common_logging.c:817 #, c-format msgid "Message `%.*s' repeated %u times in the last %s\n" msgstr "" -#: src/util/common_logging.c:1165 +#: src/util/common_logging.c:1042 msgid "INVALID" msgstr "NON VALIDO" -#: src/util/common_logging.c:1458 +#: src/util/common_logging.c:1157 msgid "unknown address" msgstr "indirizzo sconosciuto" -#: src/util/common_logging.c:1513 +#: src/util/common_logging.c:1196 msgid "invalid address" -msgstr "" - -#: src/util/common_logging.c:1531 -#, c-format -msgid "Configuration fails to specify option `%s' in section `%s'!\n" -msgstr "" - -#: src/util/common_logging.c:1552 -#, c-format -msgid "" -"Configuration specifies invalid value for option `%s' in section `%s': %s\n" -msgstr "" +msgstr "indirizzo non valido" -#: src/util/configuration.c:331 +#: src/util/common_logging.c:1214 #, c-format -msgid "Syntax error while deserializing in line %u\n" +msgid "Configuration fails to specify option `%s' in section `%s'!\n" msgstr "" -#: src/util/configuration.c:398 +#: src/util/common_logging.c:1235 #, c-format -msgid "Error while reading file `%s'\n" +msgid "Configuration specifies invalid value for option `%s' in section `%s': %s\n" msgstr "" -#: src/util/configuration.c:1016 -msgid "Not a valid relative time specification" +#: src/util/configuration.c:288 +#, c-format +msgid "Syntax error while deserializing in line %u\n" msgstr "" -#: src/util/configuration.c:1105 +#: src/util/configuration.c:996 #, c-format -msgid "" -"Configuration value '%s' for '%s' in section '%s' is not in set of legal " -"choices\n" +msgid "Configuration value '%s' for '%s' in section '%s' is not in set of legal choices\n" msgstr "" -#: src/util/configuration.c:1224 +#: src/util/configuration.c:1066 #, c-format msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n" msgstr "" -#: src/util/configuration.c:1257 +#: src/util/configuration.c:1098 #, c-format msgid "Missing closing `%s' in option `%s'\n" msgstr "" -#: src/util/configuration.c:1325 +#: src/util/configuration.c:1172 #, c-format -msgid "" -"Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined " -"as an environmental variable\n" +msgid "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined as an environmental variable\n" msgstr "" -#: src/util/container_bloomfilter.c:532 +#: src/util/connection.c:423 #, c-format -msgid "" -"Size of file on disk is incorrect for this Bloom filter (want %llu, have " -"%llu)\n" +msgid "Access denied to `%s'\n" msgstr "" -#: src/util/crypto_ecc.c:887 +#: src/util/connection.c:438 #, c-format -msgid "ECC signing failed at %s:%d: %s\n" +msgid "Accepting connection from `%s': %p\n" msgstr "" -#: src/util/crypto_ecc.c:946 +#: src/util/connection.c:553 #, c-format -msgid "EdDSA signing failed at %s:%d: %s\n" +msgid "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n" msgstr "" -#: src/util/crypto_ecc.c:1025 +#: src/util/connection.c:751 src/util/connection.c:919 #, c-format -msgid "ECDSA signature verification failed at %s:%d: %s\n" +msgid "Trying to connect to `%s' (%p)\n" msgstr "" -#: src/util/crypto_ecc.c:1086 +#: src/util/connection.c:910 #, c-format -msgid "EdDSA signature verification failed at %s:%d: %s\n" +msgid "Attempt to connect to `%s' failed\n" msgstr "" -#: src/util/crypto_ecc_setup.c:123 src/util/crypto_ecc_setup.c:162 -#: src/util/crypto_ecc_setup.c:305 src/util/crypto_ecc_setup.c:352 +#: src/util/container_bloomfilter.c:531 +#, c-format +msgid "Size of file on disk is incorrect for this Bloom filter (want %llu, have %llu)\n" +msgstr "" + +#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740 +#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896 #, c-format msgid "Could not acquire lock on file `%s': %s...\n" msgstr "" -#: src/util/crypto_ecc_setup.c:129 src/util/crypto_ecc_setup.c:311 +#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863 msgid "Creating a new private key. This may take a while.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:166 src/util/crypto_ecc_setup.c:356 +#: src/util/crypto_ecc.c:744 src/util/crypto_ecc.c:900 msgid "This may be ok if someone is currently generating a private key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:196 src/util/crypto_ecc_setup.c:398 +#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930 #, c-format -msgid "" -"When trying to read key file `%s' I found %u bytes but I need at least %u.\n" +msgid "When trying to read key file `%s' I found %u bytes but I need at least %u.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:201 src/util/crypto_ecc_setup.c:402 +#: src/util/crypto_ecc.c:778 src/util/crypto_ecc.c:934 msgid "This may be ok if someone is currently generating a key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:468 +#: src/util/crypto_ecc.c:1016 msgid "Could not load peer's private key\n" msgstr "" -#: src/util/crypto_random.c:306 +#: src/util/crypto_ecc.c:1120 #, c-format -msgid "libgcrypt has not the expected version (version %s is required).\n" -msgstr "" - -#: src/util/crypto_rsa.c:850 -#, c-format -msgid "RSA signing failed at %s:%d: %s\n" -msgstr "" - -#: src/util/crypto_rsa.c:1189 -#, c-format -msgid "RSA signature verification failed at %s:%d: %s\n" -msgstr "" - -#: src/util/disk.c:1265 -#, c-format -msgid "Expected `%s' to be a directory!\n" +msgid "ECC signing failed at %s:%d: %s\n" msgstr "" -#: src/util/dnsparser.c:264 +#: src/util/crypto_ecc.c:1170 #, c-format -msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n" +msgid "EdDSA signing failed at %s:%d: %s\n" msgstr "" -#: src/util/dnsparser.c:954 +#: src/util/crypto_ecc.c:1244 #, c-format -msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n" +msgid "ECDSA signature verification failed at %s:%d: %s\n" msgstr "" -#: src/util/dnsstub.c:231 +#: src/util/crypto_ecc.c:1301 #, c-format -msgid "Could not bind to any port: %s\n" +msgid "EdDSA signature verification failed at %s:%d: %s\n" msgstr "" -#: src/util/dnsstub.c:362 +#: src/util/crypto_random.c:284 #, c-format -msgid "Received DNS response that is too small (%u bytes)" +msgid "libgcrypt has not the expected version (version %s is required).\n" msgstr "" -#: src/util/dnsstub.c:509 +#: src/util/disk.c:1184 #, c-format -msgid "Failed to send DNS request to %s: %s\n" +msgid "Expected `%s' to be a directory!\n" msgstr "" -#: src/util/dnsstub.c:515 +#: src/util/disk.c:1546 src/util/service.c:1318 #, c-format -msgid "Sent DNS request to %s\n" +msgid "Cannot obtain information about user `%s': %s\n" msgstr "" #: src/util/getopt.c:568 @@ -8007,148 +7693,74 @@ msgstr "" msgid "%s: option `-W %s' does not allow an argument\n" msgstr "" -#: src/util/getopt.c:947 +#: src/util/getopt.c:933 #, c-format msgid "Use %s to get a list of options.\n" msgstr "" -#: src/util/getopt.c:962 -#, c-format -msgid "Missing mandatory option `%s'.\n" -msgstr "" - -#: src/util/getopt_helpers.c:70 -msgid "print the version number" -msgstr "" - -#: src/util/getopt_helpers.c:116 +#: src/util/getopt_helpers.c:84 #, c-format -msgid "" -"Arguments mandatory for long options are also mandatory for short options.\n" -msgstr "" - -#: src/util/getopt_helpers.c:204 -msgid "print this help" -msgstr "" - -#: src/util/getopt_helpers.c:282 src/util/gnunet-qr.c:300 -msgid "be verbose" -msgstr "" - -#: src/util/getopt_helpers.c:423 -msgid "configure logging to use LOGLEVEL" -msgstr "" - -#: src/util/getopt_helpers.c:503 -msgid "configure logging to write logs to FILENAME" -msgstr "" - -#: src/util/getopt_helpers.c:525 -msgid "use configuration file FILENAME" +msgid "Arguments mandatory for long options are also mandatory for short options.\n" msgstr "" -#: src/util/getopt_helpers.c:564 src/util/getopt_helpers.c:770 -#: src/util/getopt_helpers.c:839 +#: src/util/getopt_helpers.c:268 src/util/getopt_helpers.c:326 #, c-format msgid "You must pass a number to the `%s' option.\n" msgstr "" -#: src/util/getopt_helpers.c:629 +#: src/util/getopt_helpers.c:298 #, c-format msgid "You must pass relative time to the `%s' option.\n" msgstr "" -#: src/util/getopt_helpers.c:695 -#, c-format -msgid "You must pass absolute time to the `%s' option.\n" -msgstr "" - -#: src/util/getopt_helpers.c:760 -#, c-format -msgid "Your input for the '%s' option has to be a non negative number \n" -msgstr "" - -#: src/util/getopt_helpers.c:846 -#, c-format -msgid "You must pass a number below %u to the `%s' option.\n" -msgstr "" - -#: src/util/getopt_helpers.c:932 +#: src/util/gnunet-config.c:90 #, c-format -msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n" +msgid "--section argument is required\n" msgstr "" -#: src/util/gnunet-config.c:161 -#, c-format -msgid "failed to load configuration defaults" -msgstr "" - -#: src/util/gnunet-config.c:174 -#, c-format -msgid "%s or %s argument is required\n" -msgstr "" - -#: src/util/gnunet-config.c:182 -#, c-format -msgid "The following sections are available:\n" -msgstr "" - -#: src/util/gnunet-config.c:234 +#: src/util/gnunet-config.c:133 #, c-format msgid "--option argument required to set value\n" msgstr "" -#: src/util/gnunet-config.c:288 -msgid "interpret option value as a filename (with $-expansion)" +#: src/util/gnunet-config.c:160 +msgid "obtain option of value as a filename (with $-expansion)" msgstr "" -#: src/util/gnunet-config.c:293 +#: src/util/gnunet-config.c:163 msgid "name of the section to access" msgstr "" -#: src/util/gnunet-config.c:298 +#: src/util/gnunet-config.c:166 msgid "name of the option to access" msgstr "" -#: src/util/gnunet-config.c:303 +#: src/util/gnunet-config.c:169 msgid "value to set" msgstr "" -#: src/util/gnunet-config.c:307 -msgid "print available configuration sections" -msgstr "" - -#: src/util/gnunet-config.c:311 -msgid "write configuration file that only contains delta to defaults" -msgstr "" - -#: src/util/gnunet-config.c:324 +#: src/util/gnunet-config.c:178 msgid "Manipulate GNUnet configuration files" msgstr "" -#: src/util/gnunet-ecc.c:94 +#: src/util/gnunet-ecc.c:75 #, c-format msgid "Failed to open `%s': %s\n" msgstr "" -#: src/util/gnunet-ecc.c:130 -#, c-format -msgid "Generating %u keys like %s, please wait" -msgstr "" - -#: src/util/gnunet-ecc.c:143 +#: src/util/gnunet-ecc.c:81 #, c-format msgid "Generating %u keys, please wait" msgstr "" -#: src/util/gnunet-ecc.c:184 +#: src/util/gnunet-ecc.c:97 #, c-format msgid "" "\n" "Failed to write to `%s': %s\n" msgstr "" -#: src/util/gnunet-ecc.c:194 +#: src/util/gnunet-ecc.c:107 #, c-format msgid "" "\n" @@ -8157,509 +7769,562 @@ msgstr "" "\n" "Completato!\n" -#: src/util/gnunet-ecc.c:197 +#: src/util/gnunet-ecc.c:110 #, c-format msgid "" "\n" "Error, %u keys not generated\n" msgstr "" -#: src/util/gnunet-ecc.c:290 +#: src/util/gnunet-ecc.c:199 #, c-format msgid "Hostkeys file `%s' not found\n" msgstr "" -#: src/util/gnunet-ecc.c:305 +#: src/util/gnunet-ecc.c:210 #, c-format msgid "Hostkeys file `%s' is empty\n" msgstr "" -#: src/util/gnunet-ecc.c:334 +#: src/util/gnunet-ecc.c:232 #, c-format msgid "Could not read hostkey file: %s\n" msgstr "" -#: src/util/gnunet-ecc.c:391 +#: src/util/gnunet-ecc.c:283 msgid "No hostkey file specified on command line\n" msgstr "" -#: src/util/gnunet-ecc.c:456 +#: src/util/gnunet-ecc.c:349 msgid "list keys included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:461 +#: src/util/gnunet-ecc.c:352 msgid "number of keys to list included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:466 +#: src/util/gnunet-ecc.c:355 msgid "create COUNT public-private key pairs (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:470 +#: src/util/gnunet-ecc.c:358 msgid "print the public key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:474 -msgid "print the private key in ASCII format" +#: src/util/gnunet-ecc.c:361 +msgid "print the hash of the public key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:478 -msgid "print the public key in HEX format" -msgstr "" - -#: src/util/gnunet-ecc.c:482 +#: src/util/gnunet-ecc.c:364 msgid "print examples of ECC operations (used for compatibility testing)" msgstr "" -#: src/util/gnunet-ecc.c:498 +#: src/util/gnunet-ecc.c:375 msgid "Manipulate GNUnet private ECC key files" msgstr "" -#: src/util/gnunet-qr.c:108 src/util/gnunet-uri.c:91 -#, c-format -msgid "Invalid URI: does not start with `%s'\n" -msgstr "" - -#: src/util/gnunet-qr.c:116 src/util/gnunet-uri.c:98 -#, c-format -msgid "Invalid URI: fails to specify subsystem\n" +#: src/util/gnunet-resolver.c:149 +msgid "perform a reverse lookup" msgstr "" -#: src/util/gnunet-qr.c:127 src/util/gnunet-uri.c:108 -#, c-format -msgid "No handler known for subsystem `%s'\n" +#: src/util/gnunet-resolver.c:160 +msgid "Use build-in GNUnet stub resolver" msgstr "" -#: src/util/gnunet-qr.c:297 -msgid "use video-device DEVICE (default: /dev/video0" +#: src/util/gnunet-scrypt.c:279 +msgid "number of bits to require for the proof of work" msgstr "" -#: src/util/gnunet-qr.c:303 -msgid "do not show preview windows" +#: src/util/gnunet-scrypt.c:282 +msgid "file with private key, otherwise default is used" msgstr "" -#: src/util/gnunet-qr.c:311 -msgid "Scan a QR code using a video device and import the uri read" +#: src/util/gnunet-scrypt.c:285 +msgid "file with proof of work, otherwise default is used" msgstr "" -#: src/util/gnunet-resolver.c:168 -msgid "perform a reverse lookup" +#: src/util/gnunet-scrypt.c:288 +msgid "time to wait between calculations" msgstr "" -#: src/util/gnunet-resolver.c:179 -msgid "Use build-in GNUnet stub resolver" +#: src/util/gnunet-scrypt.c:299 +msgid "Manipulate GNUnet proof of work files" msgstr "" -#: src/util/gnunet-scrypt.c:242 +#: src/util/gnunet-service-resolver.c:299 #, c-format -msgid "Loading hostkey from `%s' failed.\n" -msgstr "" - -#: src/util/gnunet-scrypt.c:317 -msgid "number of bits to require for the proof of work" -msgstr "" - -#: src/util/gnunet-scrypt.c:322 -msgid "file with private key, otherwise default is used" +msgid "Could not resolve `%s' (%s): %s\n" msgstr "" -#: src/util/gnunet-scrypt.c:327 -msgid "file with proof of work, otherwise default is used" +#: src/util/gnunet-service-resolver.c:371 +#: src/util/gnunet-service-resolver.c:412 +#, c-format +msgid "Could not find IP of host `%s': %s\n" msgstr "" -#: src/util/gnunet-scrypt.c:332 -msgid "time to wait between calculations" +#: src/util/gnunet-uri.c:84 +#, c-format +msgid "No URI specified on command line\n" msgstr "" -#: src/util/gnunet-scrypt.c:345 -msgid "Manipulate GNUnet proof of work files" +#: src/util/gnunet-uri.c:89 +#, c-format +msgid "Invalid URI: does not start with `%s'\n" msgstr "" -#: src/util/gnunet-service-resolver.c:1424 -msgid "No DNS server available. DNS resolution will not be possible.\n" +#: src/util/gnunet-uri.c:96 +#, c-format +msgid "Invalid URI: fails to specify subsystem\n" msgstr "" -#: src/util/gnunet-uri.c:85 +#: src/util/gnunet-uri.c:106 #, c-format -msgid "No URI specified on command line\n" +msgid "No handler known for subsystem `%s'\n" msgstr "" -#: src/util/gnunet-uri.c:170 +#: src/util/gnunet-uri.c:168 msgid "Perform default-actions for GNUnet URIs" msgstr "" -#: src/util/helper.c:335 +#: src/util/helper.c:338 #, c-format msgid "Error reading from `%s': %s\n" -msgstr "" +msgstr "Errore di lettura da '%s': %s\n" -#: src/util/helper.c:386 +#: src/util/helper.c:383 #, c-format msgid "Failed to parse inbound message from helper `%s'\n" msgstr "" -#: src/util/helper.c:606 +#: src/util/helper.c:609 #, c-format msgid "Error writing to `%s': %s\n" msgstr "" -#: src/util/network.c:176 +#: src/util/network.c:134 #, c-format msgid "Unable to shorten unix path `%s' while keeping name unique\n" msgstr "" -#: src/util/network.c:1835 src/util/network.c:2019 +#: src/util/network.c:1355 src/util/network.c:1480 #, c-format -msgid "" -"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n" +msgid "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n" msgstr "" -#: src/util/os_installation.c:509 +#: src/util/os_installation.c:421 #, c-format -msgid "" -"Could not determine installation path for %s. Set `%s' environment " -"variable.\n" +msgid "Could not determine installation path for %s. Set `%s' environment variable.\n" msgstr "" -#: src/util/os_installation.c:881 +#: src/util/os_installation.c:766 #, c-format msgid "Could not find binary `%s' in PATH!\n" msgstr "" -#: src/util/os_installation.c:922 -#, c-format -msgid "Binary `%s' exists, but is not SUID\n" -msgstr "" - -#: src/util/os_installation.c:953 +#: src/util/os_installation.c:826 #, c-format msgid "CreateProcess failed for binary %s (%d).\n" msgstr "" -#: src/util/os_installation.c:963 +#: src/util/os_installation.c:836 #, c-format msgid "GetExitCodeProcess failed for binary %s (%d).\n" msgstr "" -#: src/util/plugin.c:86 +#: src/util/plugin.c:87 #, c-format msgid "Initialization of plugin mechanism failed: %s!\n" msgstr "" -#: src/util/plugin.c:151 +#: src/util/plugin.c:148 #, c-format msgid "`%s' failed to resolve method '%s' with error: %s\n" msgstr "" -#: src/util/plugin.c:226 +#: src/util/plugin.c:223 #, c-format msgid "`%s' failed for library `%s' with error: %s\n" msgstr "" -#: src/util/plugin.c:385 +#: src/util/plugin.c:382 msgid "Could not determine plugin installation path.\n" msgstr "" -#: src/util/program.c:283 +#: src/util/program.c:246 src/util/service.c:1452 #, c-format -msgid "Unreadable or malformed configuration file `%s', exit ...\n" +msgid "Malformed configuration file `%s', exit ...\n" msgstr "" -#: src/util/program.c:301 +#: src/util/program.c:258 src/util/service.c:1467 #, c-format -msgid "Unreadable or malformed default configuration file `%s', exit ...\n" +msgid "Could not access configuration file `%s'\n" msgstr "" -#: src/util/program.c:318 -msgid "Unreadable or malformed configuration, exit ...\n" +#: src/util/program.c:263 src/util/service.c:1462 +msgid "Malformed configuration, exit ...\n" msgstr "" -#: src/util/regex.c:134 +#: src/util/resolver_api.c:198 #, c-format -msgid "Bad mask: %d\n" +msgid "Must specify `%s' for `%s' in configuration!\n" msgstr "" -#: src/util/resolver_api.c:218 +#: src/util/resolver_api.c:216 #, c-format -msgid "" -"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n" +msgid "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n" msgstr "" -#: src/util/resolver_api.c:239 +#: src/util/resolver_api.c:348 #, c-format -msgid "" -"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS " -"resolution will be unavailable.\n" +msgid "Timeout trying to resolve IP address `%s'.\n" msgstr "" -#: src/util/resolver_api.c:875 +#: src/util/resolver_api.c:352 #, c-format msgid "Timeout trying to resolve hostname `%s'.\n" msgstr "" -#: src/util/resolver_api.c:888 +#: src/util/resolver_api.c:908 #, c-format -msgid "Timeout trying to resolve IP address `%s'.\n" +msgid "Could not resolve our FQDN : %s\n" msgstr "" -#: src/util/resolver_api.c:1073 -msgid "Resolver not configured correctly.\n" +#: src/util/scheduler.c:813 +msgid "Looks like we're busy waiting...\n" msgstr "" -#: src/util/resolver_api.c:1160 src/util/resolver_api.c:1183 -#: src/util/resolver_api.c:1197 +#: src/util/scheduler.c:948 #, c-format -msgid "Could not resolve our FQDN: %s\n" +msgid "Attempt to cancel dead task %llu!\n" msgstr "" -#: src/util/service.c:668 +#: src/util/server.c:484 #, c-format -msgid "" -"Processing code for message of type %u did not call " -"`GNUNET_SERVICE_client_continue' after %s\n" +msgid "`%s' failed for port %d (%s).\n" msgstr "" -#: src/util/service.c:1820 -msgid "" -"Could not bind to any of the ports I was supposed to, refusing to run!\n" +#: src/util/server.c:493 +#, c-format +msgid "`%s' failed for port %d (%s): address already in use\n" msgstr "" -#: src/util/signal.c:89 +#: src/util/server.c:499 #, c-format -msgid "signal (%d, %p) returned %d.\n" +msgid "`%s' failed for `%s': address already in use\n" +msgstr "" + +#: src/util/server.c:892 +#, c-format +msgid "Processing code for message of type %u did not call `GNUNET_SERVER_receive_done' after %s\n" +msgstr "" + +#: src/util/service.c:347 +#, c-format +msgid "Unknown address family %d\n" +msgstr "" + +#: src/util/service.c:354 +#, c-format +msgid "Access from `%s' denied to service `%s'\n" +msgstr "" + +#: src/util/service.c:409 +#, c-format +msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n" +msgstr "" + +#: src/util/service.c:446 +#, c-format +msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n" +msgstr "" + +#: src/util/service.c:563 +#, c-format +msgid "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n" +msgstr "" + +#: src/util/service.c:653 +#, c-format +msgid "Disabling UNIX domain socket support for service `%s', failed to create UNIX domain socket: %s\n" +msgstr "" + +#: src/util/service.c:669 +#, c-format +msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" +msgstr "" + +#: src/util/service.c:903 +msgid "Could not access a pre-bound socket, will try to bind myself\n" +msgstr "" + +#: src/util/service.c:952 src/util/service.c:970 +#, c-format +msgid "Specified value for `%s' of service `%s' is invalid\n" +msgstr "" + +#: src/util/service.c:995 +#, c-format +msgid "Could not access pre-bound socket %u, will try to bind myself\n" +msgstr "" + +#: src/util/service.c:1165 +#, c-format +msgid "Failed to start `%s' at `%s'\n" +msgstr "" + +#: src/util/service.c:1207 +#, c-format +msgid "Service `%s' runs at %s\n" +msgstr "" + +#: src/util/service.c:1256 +msgid "Service process failed to initialize\n" +msgstr "" + +#: src/util/service.c:1260 +msgid "Service process could not initialize server function\n" +msgstr "" + +#: src/util/service.c:1264 +msgid "Service process failed to report status\n" +msgstr "" + +#: src/util/service.c:1319 +msgid "No such user" msgstr "" -#: src/util/socks.c:597 +#: src/util/service.c:1332 #, c-format -msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n" +msgid "Cannot change user/group to `%s': %s\n" +msgstr "" + +#: src/util/service.c:1402 +msgid "do daemonize (detach from terminal)" msgstr "" -#: src/util/socks.c:616 +#: src/util/signal.c:89 #, c-format -msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n" +msgid "signal (%d, %p) returned %d.\n" msgstr "" -#: src/util/strings.c:176 +#: src/util/strings.c:145 msgid "b" msgstr "" -#: src/util/strings.c:475 +#: src/util/strings.c:433 #, c-format msgid "Character sets requested were `%s'->`%s'\n" msgstr "" -#: src/util/strings.c:602 +#: src/util/strings.c:561 msgid "Failed to expand `$HOME': environment variable `HOME' not set" msgstr "" -#: src/util/strings.c:706 +#: src/util/strings.c:658 msgid "µs" msgstr "µs" -#: src/util/strings.c:710 +#: src/util/strings.c:662 msgid "forever" msgstr "per sempre" -#: src/util/strings.c:712 +#: src/util/strings.c:664 msgid "0 ms" msgstr "0 ms" -#: src/util/strings.c:718 +#: src/util/strings.c:670 msgid "ms" msgstr "ms" -#: src/util/strings.c:724 +#: src/util/strings.c:676 msgid "s" msgstr "s" -#: src/util/strings.c:730 +#: src/util/strings.c:682 msgid "m" msgstr "" -#: src/util/strings.c:736 +#: src/util/strings.c:688 msgid "h" msgstr "o" -#: src/util/strings.c:743 +#: src/util/strings.c:695 msgid "day" msgstr "giorno" -#: src/util/strings.c:745 +#: src/util/strings.c:697 msgid "days" msgstr "giorni" -#: src/util/strings.c:774 +#: src/util/strings.c:726 msgid "end of time" msgstr "" -#: src/util/strings.c:1277 +#: src/util/strings.c:1159 msgid "IPv6 address did not start with `['\n" msgstr "" -#: src/util/strings.c:1285 +#: src/util/strings.c:1167 msgid "IPv6 address did contain ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1291 +#: src/util/strings.c:1173 msgid "IPv6 address did contain ']' before ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1301 +#: src/util/strings.c:1180 msgid "IPv6 address did contain a valid port number after the last ':'\n" msgstr "" -#: src/util/strings.c:1310 +#: src/util/strings.c:1189 #, c-format msgid "Invalid IPv6 address `%s': %s\n" msgstr "" -#: src/util/strings.c:1586 src/util/strings.c:1602 +#: src/util/strings.c:1395 src/util/strings.c:1411 msgid "Port not in range\n" msgstr "" -#: src/util/strings.c:1611 +#: src/util/strings.c:1420 #, c-format msgid "Malformed port policy `%s'\n" msgstr "" -#: src/util/strings.c:1696 src/util/strings.c:1728 src/util/strings.c:1777 -#: src/util/strings.c:1798 +#: src/util/strings.c:1503 src/util/strings.c:1534 src/util/strings.c:1582 +#: src/util/strings.c:1603 #, c-format msgid "Invalid format for IP: `%s'\n" msgstr "" -#: src/util/strings.c:1754 +#: src/util/strings.c:1560 #, c-format msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)." msgstr "" -#: src/util/strings.c:1807 +#: src/util/strings.c:1612 #, c-format msgid "Invalid format: `%s'\n" msgstr "" -#: src/util/strings.c:1860 +#: src/util/strings.c:1664 #, c-format msgid "Invalid network notation (does not end with ';': `%s')\n" msgstr "" -#: src/util/strings.c:1914 +#: src/util/strings.c:1714 #, c-format msgid "Wrong format `%s' for netmask\n" msgstr "" -#: src/util/strings.c:1945 +#: src/util/strings.c:1745 #, c-format msgid "Wrong format `%s' for network\n" msgstr "" -#: src/util/time.c:844 src/util/time.c:876 -#, c-format -msgid "Failed to map `%s', cannot assure monotonic time!\n" -msgstr "" - -#: src/util/time.c:882 -#, c-format -msgid "" -"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n" -msgstr "" - -#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807 +#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086 msgid "# Active channels" msgstr "# Canali attivi" -#: src/vpn/gnunet-service-vpn.c:599 -msgid "# Messages dropped in cadet queue (overflow)" -msgstr "" - -#: src/vpn/gnunet-service-vpn.c:753 -msgid "# ICMP packets received from cadet" +#: src/vpn/gnunet-service-vpn.c:642 +msgid "# Bytes given to mesh for transmission" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1096 -msgid "# UDP packets received from cadet" +#: src/vpn/gnunet-service-vpn.c:680 +msgid "# Bytes dropped in mesh queue (overflow)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1255 -msgid "# TCP packets received from cadet" -msgstr "" +#: src/vpn/gnunet-service-vpn.c:753 +#, fuzzy +#| msgid "# PONG messages decrypted" +msgid "# Mesh channels created" +msgstr "# messaggi PONG decrittati" -#: src/vpn/gnunet-service-vpn.c:1467 -msgid "# Cadet channels created" -msgstr "" +#: src/vpn/gnunet-service-vpn.c:784 +#, fuzzy +#| msgid "Failed to create statistics!\n" +msgid "Failed to setup mesh channel!\n" +msgstr "Generazione statistiche fallita\n" -#: src/vpn/gnunet-service-vpn.c:1687 +#: src/vpn/gnunet-service-vpn.c:978 #, c-format msgid "Protocol %u not supported, dropping\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1826 -msgid "# Packets dropped (channel not yet online)" -msgstr "" - -#: src/vpn/gnunet-service-vpn.c:2006 +#: src/vpn/gnunet-service-vpn.c:1305 msgid "# ICMPv4 packets dropped (not allowed)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2027 +#: src/vpn/gnunet-service-vpn.c:1326 msgid "# ICMPv6 packets dropped (not allowed)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2235 +#: src/vpn/gnunet-service-vpn.c:1531 msgid "# Packets received from TUN interface" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2268 src/vpn/gnunet-service-vpn.c:2304 +#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600 #, c-format msgid "Packet received for unmapped destination `%s' (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2314 +#: src/vpn/gnunet-service-vpn.c:1610 msgid "Received IPv4 packet with options (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2328 +#: src/vpn/gnunet-service-vpn.c:1624 #, c-format msgid "Received packet of unknown protocol %d from TUN (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2367 +#: src/vpn/gnunet-service-vpn.c:1706 +msgid "# ICMP packets received from mesh" +msgstr "" + +#: src/vpn/gnunet-service-vpn.c:2045 +msgid "# UDP packets received from mesh" +msgstr "" + +#: src/vpn/gnunet-service-vpn.c:2200 +msgid "# TCP packets received from mesh" +msgstr "" + +#: src/vpn/gnunet-service-vpn.c:2351 msgid "Failed to find unallocated IPv4 address in VPN's range\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2422 +#: src/vpn/gnunet-service-vpn.c:2406 msgid "Failed to find unallocated IPv6 address in VPN's range\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2464 src/vpn/gnunet-service-vpn.c:2686 +#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663 msgid "# Active destinations" -msgstr "" +msgstr "# Destinazioni attive" -#: src/vpn/gnunet-service-vpn.c:2735 +#: src/vpn/gnunet-service-vpn.c:2715 msgid "Failed to allocate IP address for new destination\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2998 +#: src/vpn/gnunet-service-vpn.c:2982 msgid "Must specify valid IPv6 address" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3022 +#: src/vpn/gnunet-service-vpn.c:3006 msgid "Must specify valid IPv6 mask" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3030 +#: src/vpn/gnunet-service-vpn.c:3014 msgid "IPv6 support disabled as this system does not support IPv6\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3043 +#: src/vpn/gnunet-service-vpn.c:3027 msgid "Must specify valid IPv4 address" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3056 +#: src/vpn/gnunet-service-vpn.c:3040 msgid "Must specify valid IPv4 mask" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3066 +#: src/vpn/gnunet-service-vpn.c:3050 msgid "IPv4 support disabled as this system does not support IPv4\n" msgstr "" @@ -8667,95 +8332,137 @@ msgstr "" msgid "Error creating tunnel\n" msgstr "" -#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222 +#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221 #, c-format msgid "Option `%s' makes no sense with option `%s'.\n" msgstr "" -#: src/vpn/gnunet-vpn.c:204 +#: src/vpn/gnunet-vpn.c:203 #, c-format msgid "Option `%s' or `%s' is required.\n" msgstr "" -#: src/vpn/gnunet-vpn.c:216 +#: src/vpn/gnunet-vpn.c:215 #, c-format msgid "Option `%s' or `%s' is required when using option `%s'.\n" msgstr "" -#: src/vpn/gnunet-vpn.c:236 +#: src/vpn/gnunet-vpn.c:235 #, c-format msgid "`%s' is not a valid peer identifier.\n" msgstr "" -#: src/vpn/gnunet-vpn.c:256 +#: src/vpn/gnunet-vpn.c:255 #, c-format msgid "`%s' is not a valid IP address.\n" msgstr "`%s' non è un indirizzo IP valido.\n" -#: src/vpn/gnunet-vpn.c:292 +#: src/vpn/gnunet-vpn.c:290 msgid "request that result should be an IPv4 address" msgstr "" -#: src/vpn/gnunet-vpn.c:297 +#: src/vpn/gnunet-vpn.c:293 msgid "request that result should be an IPv6 address" msgstr "" -#: src/vpn/gnunet-vpn.c:303 +#: src/vpn/gnunet-vpn.c:296 msgid "how long should the mapping be valid for new tunnels?" msgstr "" -#: src/vpn/gnunet-vpn.c:309 +#: src/vpn/gnunet-vpn.c:299 msgid "destination IP for the tunnel" msgstr "" -#: src/vpn/gnunet-vpn.c:315 +#: src/vpn/gnunet-vpn.c:302 msgid "peer offering the service we would like to access" msgstr "" -#: src/vpn/gnunet-vpn.c:321 +#: src/vpn/gnunet-vpn.c:305 msgid "name of the service we would like to access" msgstr "" -#: src/vpn/gnunet-vpn.c:326 +#: src/vpn/gnunet-vpn.c:308 msgid "service is offered via TCP" msgstr "" -#: src/vpn/gnunet-vpn.c:331 +#: src/vpn/gnunet-vpn.c:311 msgid "service is offered via UDP" msgstr "" -#: src/vpn/gnunet-vpn.c:344 +#: src/vpn/gnunet-vpn.c:323 msgid "Setup tunnels via VPN." msgstr "" -#: src/zonemaster/gnunet-service-zonemaster.c:838 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 -msgid "Failed to connect to the namestore!\n" -msgstr "" - -#: src/include/gnunet_common.h:794 src/include/gnunet_common.h:801 -#: src/include/gnunet_common.h:811 -#, c-format -msgid "Assertion failed at %s:%d. Aborting.\n" -msgstr "" - -#: src/include/gnunet_common.h:819 +#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573 +#: src/include/gnunet_common.h:581 #, c-format msgid "Assertion failed at %s:%d.\n" msgstr "" -#: src/include/gnunet_common.h:831 +#: src/include/gnunet_common.h:593 #, c-format msgid "External protocol violation detected at %s:%d.\n" msgstr "" -#: src/include/gnunet_common.h:858 src/include/gnunet_common.h:867 +#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629 #, c-format msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "" -#~ msgid "Benchmarking done\n" -#~ msgstr "Benchmark completato\n" +#, fuzzy +#~| msgid "# items stored" +#~ msgid "is stopped" +#~ msgstr "# elementi memorizzati" + +#~ msgid "inactive " +#~ msgstr "non attivo" + +#, fuzzy +#~| msgid "# friends connected" +#~ msgid "fresh connection" +#~ msgstr "# amici connessi" + +#~ msgid "connection established" +#~ msgstr "connessione stabilita" + +#~ msgid "unknown state" +#~ msgstr "stato sconosciuto" + +#~ msgid "# PING messages transmitted" +#~ msgstr "# Messaggi PING trasmessi" + +#~ msgid "invalid argument" +#~ msgstr "argomento non valido" + +#, fuzzy +#~| msgid "URI is `%s'.\n" +#~ msgid "Namespace URI is `%s'.\n" +#~ msgstr "" +#~ "L'URI è `%s'.\n" +#~ "\n" + +#, fuzzy +#~| msgid "`%s' is not a valid IP address.\n" +#~ msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" +#~ msgstr "`%s' non è un indirizzo IP valido.\n" + +#, fuzzy +#~| msgid "Unknown command `%s'\n" +#~ msgid "Unknown record type `%s'\n" +#~ msgstr "Comando `%s' sconosciuto.\n" + +#~ msgid "must be valid IPv4 address" +#~ msgstr "deve essere un indirizzo IPv4 valido" + +#, fuzzy +#~| msgid "Failed to create statistics!\n" +#~ msgid "Failed to create UDP network sockets\n" +#~ msgstr "Generazione statistiche fallita\n" + +#, fuzzy +#~| msgid "Connection established to `%s'\n" +#~ msgid "Cannot bind to `%s'\n" +#~ msgstr "Connessione stabilita con `%s'\n" -#~ msgid "Peer `%s'\n" -#~ msgstr "Peer `%s'\n" +#~ msgid "Error while reading file `%s'\n" +#~ msgstr "Errore di lettura del file `%s'\n" -- cgit v1.2.3 From 3553ca94cece25a12e2c0202ec7512d5e7aa7e2b Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 16 Oct 2019 17:55:45 +0000 Subject: clarify gnunet-arm(1) more and add syntax. --- doc/man/gnunet-arm.1 | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/doc/man/gnunet-arm.1 b/doc/man/gnunet-arm.1 index 7e15b171d..80d65ef94 100644 --- a/doc/man/gnunet-arm.1 +++ b/doc/man/gnunet-arm.1 @@ -55,39 +55,47 @@ ARM starts services on-demand or as configured and restarts them if they crash. .Bl -tag -width indent .It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME -Use the configuration file FILENAME. +Use the configuration file +.Pa FILENAME Ns . .It Fl d | -delete -Delete config file and directory on exit. +Delete configuration file and directory on exit. .It Fl e | -end Shutdown all GNUnet services (including ARM itself). Running "gnunet-arm -e" is the usual way to shutdown a GNUnet peer. .It Fl E | -no-stderr -Don't let gnunet-arm inherit standard error. +Don't let gnunet-arm inherit stderr (standard error). .It Fl h | -help Print short help on options. .It Fl i Ar SERVICE | Fl -init= Ns Ar SERVICE -Starts the specified SERVICE if it is not already running. +Starts the specified +.Ar SERVICE +if it is not already running. More specifically, this makes the service behave as if it were in the default services list. .It Fl I | -info List all running services. .It Fl k Ar SERVICE | Fl -kill= Ns Ar SERVICE -Stop the specified SERVICE if it is running. +Stop +.Ar SERVICE +if it is running. While this will kill the service right now, the service may be -restarted immediately if other services depend on it (service is +restarted immediately if other services depend on it (the service is then started 'on-demand'). If the service used to be a 'default' service, its default-service status will be revoked. If the service was not a default service, it will just be (temporarily) stopped, but could be re-started on-demand at any time. .It Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME -Write logs to FILENAME. +Write logs to +.Pa FILENAME Ns . .It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL -Use LOGLEVEL for logging. +Use +.Ar LOGLEVEL +for logging. Valid values are DEBUG, INFO, WARNING and ERROR. .It Fl m | -monitor Monitor service activity of ARM. -In this mode, the command will not terminate until the user presses CTRL-C. +In this mode, the command will not terminate until the user presses CTRL-C (thus sending SIGTERM or SIGINT). .It Fl O | -no-stdout Don't let gnunet-arm inherit standard output .It Fl q | -quiet @@ -100,7 +108,9 @@ Naturally, if a service is demanded by a default service, it will then also be started. Running "gnunet-arm -s" is the usual way to start a GNUnet peer. .It Fl T DELAY | -timeout= Ns Ar DELAY -Exit with error status if operation does not finish after DELAY +Exit with error status if operation does not finish after +.Ar DELAY Ns , +provided in number of microseconds. .It Fl v | -version Print GNUnet version number. .El -- cgit v1.2.3 From b6995e48b7e19bbbb0b92b34726d98b15fba0f20 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 16 Oct 2019 17:58:46 +0000 Subject: gnunet-ecc(1): syntax --- doc/man/gnunet-ecc.1 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/man/gnunet-ecc.1 b/doc/man/gnunet-ecc.1 index d99b6c00b..432a039c4 100644 --- a/doc/man/gnunet-ecc.1 +++ b/doc/man/gnunet-ecc.1 @@ -30,14 +30,14 @@ manipulate GNUnet ECC key files .Sh SYNOPSIS .Nm -.Op Fl g Ar COUNT | Fl \-generate-keys= Ns Ar COUNT -.Op Fl p | \-print-public-key -.Op Fl P | \-print-private-key -.Op Fl x | \-print-hex -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl v | \-version +.Op Fl g Ar COUNT | Fl -generate-keys= Ns Ar COUNT +.Op Fl p | -print-public-key +.Op Fl P | -print-private-key +.Op Fl x | -print-hex +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl v | -version .Ao Ar FILENAME Ac .sp .Sh DESCRIPTION @@ -50,26 +50,26 @@ If the option .Fl p is given, the corresponding public key will be printed to the console. .Bl -tag -width indent -.It Fl g Ar COUNT | Fl \-generate-keys= Ns Ar COUNT +.It Fl g Ar COUNT | Fl -generate-keys= Ns Ar COUNT Create COUNT public-private key pairs and write them to FILENAME. Used for creating a file for testing. -.It Fl p | \-print-public-key +.It Fl p | -print-public-key Print the corresponding public key to stdout. This is the value used for PKEY records in GNS. -.It Fl P | \-print-private-key +.It Fl P | -print-private-key Print the corresponding private key to stdout. This is the value used for PKEY records in GNS. -.It Fl x | \-print-hex +.It Fl x | -print-hex Print the corresponding public key to stdout in HEX format. Useful for comparing to Ed25519 keys in X.509 tools. -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. .El .Sh SEE ALSO -- cgit v1.2.3 From 7e154ba25582715152aef9b4bc655ff2381edfc7 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 16 Oct 2019 18:15:04 +0000 Subject: *.1: syntax (\- -> -) --- doc/man/gnunet-auto-share.1 | 48 ++++++++++---------- doc/man/gnunet-bcd.1 | 20 ++++----- doc/man/gnunet-cadet.1 | 48 ++++++++++---------- doc/man/gnunet-config.1 | 48 ++++++++++---------- doc/man/gnunet-conversation-test.1 | 18 ++++---- doc/man/gnunet-conversation.1 | 30 ++++++------- doc/man/gnunet-datastore.1 | 2 +- doc/man/gnunet-directory.1 | 16 +++---- doc/man/gnunet-download.1 | 48 ++++++++++---------- doc/man/gnunet-fs.1 | 24 +++++----- doc/man/gnunet-gns-proxy.1 | 26 +++++------ doc/man/gnunet-gns.1 | 34 +++++++------- doc/man/gnunet-identity.1 | 2 +- doc/man/gnunet-namecache.1 | 24 +++++----- doc/man/gnunet-namestore-fcfsd.1 | 20 ++++----- doc/man/gnunet-namestore.1 | 6 +-- doc/man/gnunet-nat-auto.1 | 24 +++++----- doc/man/gnunet-nat-server.1 | 22 ++++----- doc/man/gnunet-nat.1 | 40 ++++++++--------- doc/man/gnunet-peerinfo.1 | 44 +++++++++--------- doc/man/gnunet-publish.1 | 86 ++++++++++++++++++------------------ doc/man/gnunet-reclaim.1 | 68 ++++++++++++++-------------- doc/man/gnunet-resolver.1 | 24 +++++----- doc/man/gnunet-revocation.1 | 38 ++++++++-------- doc/man/gnunet-scrypt.1 | 36 +++++++-------- doc/man/gnunet-search.1 | 46 +++++++++---------- doc/man/gnunet-statistics.1 | 58 ++++++++++++------------ doc/man/gnunet-testbed-profiler.1 | 36 +++++++-------- doc/man/gnunet-testing-run-service.1 | 12 ++--- doc/man/gnunet-testing.1 | 40 ++++++++--------- doc/man/gnunet-unindex.1 | 20 ++++----- doc/man/gnunet-uri.1 | 20 ++++----- doc/man/gnunet-vpn.1 | 56 +++++++++++------------ doc/man/gnunet-zoneimport.1 | 26 +++++------ 34 files changed, 555 insertions(+), 555 deletions(-) diff --git a/doc/man/gnunet-auto-share.1 b/doc/man/gnunet-auto-share.1 index 0a0e8f702..0a50de21c 100644 --- a/doc/man/gnunet-auto-share.1 +++ b/doc/man/gnunet-auto-share.1 @@ -30,17 +30,17 @@ a command line tool to automatically share an entire directory with other users .Sh SYNOPSIS .Nm -.Op Fl a Ar LEVEL | Fl \-anonymity= Ns Ar LEVEL -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl D | \-disable-extractor -.Op Fl d | \-disable-creation-time -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME -.Op Fl p Ar PRIORITY | Fl \-prio= Ns Ar PRIORITY -.Op Fl r Ar LEVEL | Fl \-replication= Ns Ar LEVEL -.Op Fl V | \-verbose -.Op Fl v | \-version +.Op Fl a Ar LEVEL | Fl -anonymity= Ns Ar LEVEL +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl D | -disable-extractor +.Op Fl d | -disable-creation-time +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME +.Op Fl p Ar PRIORITY | Fl -prio= Ns Ar PRIORITY +.Op Fl r Ar LEVEL | Fl -replication= Ns Ar LEVEL +.Op Fl V | -verbose +.Op Fl v | -version .Ao Ar DIRNAME Ac .Sh DESCRIPTION In order to share files with other GNUnet users, the files must first be made available to GNUnet. @@ -55,7 +55,7 @@ gnunet-auto-share has many options in common with gnunet-publish, but can only b You can use automatic meta-data extraction (based on libextractor). The options are as follows: .Bl -tag -width indent -.It Fl a Ar LEVEL | Fl \-anonymity= Ns Ar LEVEL +.It Fl a Ar LEVEL | Fl -anonymity= Ns Ar LEVEL This option can be used to specify additional anonymity constraints. The default is 1. If set to 0, GNUnet will publish the file non-anonymously and in fact sign the advertisement for the file using your peer's private key. @@ -63,42 +63,42 @@ This will allow other users to download the file as fast as possible, including If you set it to 1 (default), you use the standard anonymous routing algorithm (which does not explicitly leak your identity). However, a powerful adversary may still be able to perform traffic analysis (statistics) to over time discovery your identity. You can gain better privacy by specifying a higher level of anonymity (using values above 1). -This tells FS that it must hide your own requests in equivalent\-looking cover traffic. +This tells FS that it must hide your own requests in equivalent-looking cover traffic. This should confound an adversaries traffic analysis, increasing the time and effort it would take to discover your identity. However, it also can significantly reduce performance, as your requests will be delayed until sufficient cover traffic is available. The specific numeric value (for anonymity levels above 1) is simple: -Given an anonymity level L (above 1), each request FS makes on your behalf must be hidden in L\-1 equivalent requests of cover traffic (traffic your peer routes for others) in the same time-period. +Given an anonymity level L (above 1), each request FS makes on your behalf must be hidden in L-1 equivalent requests of cover traffic (traffic your peer routes for others) in the same time-period. The time-period is twice the average delay by which GNUnet artificially delays traffic. Note that regardless of the anonymity level you choose, peers that cache content in the network always use anonymity level 1. -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use alternate config file (if this option is not specified, the default is .Pa ~/.config/gnunet.conf Ns ). -.It Fl D | \-disable-extractor +.It Fl D | -disable-extractor Disable use of GNU libextractor for finding additional keywords and metadata. -.It Fl d | \-disable-creation-time +.It Fl d | -disable-creation-time Disable adding the creation time to the metadata of the uploaded file. -.It Fl h | \-help +.It Fl h | -help Print a brief help page with all the options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Change the loglevel. Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG. -.It Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME +.It Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME Configure logging to write logs to FILENAME. -.It Fl p Ar PRIORITY | Fl \-prio= Ns Ar PRIORITY +.It Fl p Ar PRIORITY | Fl -prio= Ns Ar PRIORITY Executive summary: You probably don't need it. Set the priority of the published content (default: 365). If the local database is full, GNUnet will discard the content with the lowest ranking. Note that ranks change over time depending on popularity. The default should be high enough to preserve the locally published content in favor of content that migrates from other peers. -.It Fl r Ar LEVEL | Fl \-replication= Ns Ar LEVEL +.It Fl r Ar LEVEL | Fl -replication= Ns Ar LEVEL Set the desired replication level. If CONTENT_PUSHING is set to YES, GNUnet will push each block (for the file) LEVEL times to other peers before doing normal "random" replication of all content. This option can be used to push some content out into the network harder. Note that pushing content LEVEL times into the network does not guarantee that there will actually be LEVEL replicas. -.It Fl V | \-verbose +.It Fl V | -verbose Be verbose. Using this option causes gnunet-publish to print progress information and at the end the file identification that can be used to download the file from GNUnet. -.It Fl v | \-version +.It Fl v | -version Print the version number. .El .Sh EXAMPLES diff --git a/doc/man/gnunet-bcd.1 b/doc/man/gnunet-bcd.1 index 0a1399ba3..edc0fea41 100644 --- a/doc/man/gnunet-bcd.1 +++ b/doc/man/gnunet-bcd.1 @@ -30,11 +30,11 @@ run HTTP server to create GNS business cards .Sh SYNOPSIS .Nm -.Op Fl p Ar PORT | Fl \-port= Ns Ar PORT -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl v | \-version +.Op Fl p Ar PORT | Fl -port= Ns Ar PORT +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl v | -version .Sh DESCRIPTION .Nm can be used to create an business card with a QR code containing the public key of a zone from the GNU Name System. @@ -45,16 +45,16 @@ If it does not work for you, try installing the full TeXLive distribution first, .Xr apt 1 execute "apt-get install texlive-full". .Bl -tag -width indent -.It Fl p Ar PORT | Fl \-port= Ns Ar PORT +.It Fl p Ar PORT | Fl -port= Ns Ar PORT Run the HTTP server on port PORT. -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. .El .Sh SEE ALSO diff --git a/doc/man/gnunet-cadet.1 b/doc/man/gnunet-cadet.1 index bb2ce637e..fcc4fb2a5 100644 --- a/doc/man/gnunet-cadet.1 +++ b/doc/man/gnunet-cadet.1 @@ -30,18 +30,18 @@ create or obtain information about CADET tunnels and peers .Sh SYNOPSIS .Nm -.Op Fl C Ar CONNECTION_ID | Fl \-connection= Ns Ar CONNECTION_ID -.Op Fl d | \-dump -.Op Fl e | \-echo -.Op Fl o Ar SHARED_SECRET | Fl \-open-port= Ns Ar SHARED_SECRET -.Op Fl p Ar PEER_ID | Fl \-peer= Ns Ar PEER_ID -.Op Fl P | \-peers -.Op Fl T | \-tunnels -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl v | \-version +.Op Fl C Ar CONNECTION_ID | Fl -connection= Ns Ar CONNECTION_ID +.Op Fl d | -dump +.Op Fl e | -echo +.Op Fl o Ar SHARED_SECRET | Fl -open-port= Ns Ar SHARED_SECRET +.Op Fl p Ar PEER_ID | Fl -peer= Ns Ar PEER_ID +.Op Fl P | -peers +.Op Fl T | -tunnels +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl v | -version .Ao Ar PEER_ID Ac .Ao Ar SHARED_SECRET Ac .Sh DESCRIPTION @@ -63,36 +63,36 @@ For one-to-many communication .Xr gnunet-social 1 may be better suited, however. .Bl -tag -width indent -.It Fl C Ar CONNECTION_ID | Fl \-connection= Ns Ar CONNECTION_ID +.It Fl C Ar CONNECTION_ID | Fl -connection= Ns Ar CONNECTION_ID Provide information about the connection .Ar CONNECTION_ID . -.It Fl d | \-dump +.It Fl d | -dump Dump debug information to stderr. -.It Fl e | \-echo +.It Fl e | -echo Activate echo mode. -.It Fl o Ar SHARED_SECRET | Fl \-open-port= Ns Ar SHARED_SECRET +.It Fl o Ar SHARED_SECRET | Fl -open-port= Ns Ar SHARED_SECRET Listen for connections using a shared secret, provided as .Ar SHARED_SECRET , among sender and recipient. -.It Fl p Ar PEER_ID | Fl \-peer= Ns Ar PEER_ID +.It Fl p Ar PEER_ID | Fl -peer= Ns Ar PEER_ID Provide information about the peer .Ar PEER_ID . -.It Fl P | \-peers +.It Fl P | -peers Provide information about all (known) peers. -.It Fl T | \-tunnels +.It Fl T | -tunnels Provide information about all tunnels. -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file .Ar FILENAME . -.It Fl h | \-help +.It Fl h | -help Print the help page. -.It Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME +.It Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME Configure logging to write logs to .Ar FILENAME . -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl v | \-version +.It Fl v | -version Print the GNUnet version number. .El .Sh SEE ALSO diff --git a/doc/man/gnunet-config.1 b/doc/man/gnunet-config.1 index 95dc98811..e5babce2d 100644 --- a/doc/man/gnunet-config.1 +++ b/doc/man/gnunet-config.1 @@ -30,47 +30,47 @@ manipulate GNUnet configuration files .Sh SYNOPSIS .Nm -.Op Fl b Ar BACKEND | Fl \-supported-backend= Ns Ar BACKEND -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl f | \-filename -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl o Ar OPTION | Fl \-option= Ns Ar OPTION -.Op Fl S |\-list-sections -.Op Fl s Ar SECTION | Fl \-section= Ns Ar SECTION -.Op Fl V Ar VALUE | Fl \-value Ar VALUE -.Op Fl v | \-version -.Op Fl W | \-rewrite +.Op Fl b Ar BACKEND | Fl -supported-backend= Ns Ar BACKEND +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl f | -filename +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl o Ar OPTION | Fl -option= Ns Ar OPTION +.Op Fl S |-list-sections +.Op Fl s Ar SECTION | Fl -section= Ns Ar SECTION +.Op Fl V Ar VALUE | Fl -value Ar VALUE +.Op Fl v | -version +.Op Fl W | -rewrite .Sh DESCRIPTION .Nm can be used to read or modify GNUnet configuration files. .Bl -tag -width indent -.It Fl b Ar BACKEND | Fl \-supported-backend= Ns Ar BACKEND +.It Fl b Ar BACKEND | Fl -supported-backend= Ns Ar BACKEND Tests whether the specified BACKEND is supported by the current installation. The backend must match the name of a plugin, i.e. "namestore_postgres" for the Postgres database backend of the "NAMESTORE" service. If the BACKEND is supported, gnunet-config will return a status code of 0 (success), otherwise 77 (unsupported). When this option is specified, no other options may be specified. Specifying this option together with other options will cause gnunet-config to return a status code of 1 (error). -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl f | \-filename +.It Fl f | -filename Try to perform expansions as if the option values represent filenames (will also be applied even if the option is not really a filename). -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl o Ar OPTION | Fl \-option= Ns Ar OPTION +.It Fl o Ar OPTION | Fl -option= Ns Ar OPTION Which configuration option should be accessed or edited. Required to set a value. If not given, all values of a given section will be printed in the format "OPTION = VALUE". -.It Fl S |\-list-sections -List available configuration sections for use with \-\-section. -.It Fl s Ar SECTION | Fl \-section= Ns Ar SECTION +.It Fl S |-list-sections +List available configuration sections for use with --section. +.It Fl s Ar SECTION | Fl -section= Ns Ar SECTION Which configuration section should be accessed or edited. Required option. -.It Fl V Ar VALUE | Fl \-value Ar VALUE +.It Fl V Ar VALUE | Fl -value Ar VALUE Configuration value to store in the given section under the given option. -Must only be given together with \-s and \-o options. -.It Fl v | \-version +Must only be given together with -s and -o options. +.It Fl v | -version Print GNUnet version number. -.It Fl W | \-rewrite +.It Fl W | -rewrite Consider differences to defaults only. .El .Sh SEE ALSO diff --git a/doc/man/gnunet-conversation-test.1 b/doc/man/gnunet-conversation-test.1 index 1cc445f6f..395f27244 100644 --- a/doc/man/gnunet-conversation-test.1 +++ b/doc/man/gnunet-conversation-test.1 @@ -30,26 +30,26 @@ check your speaker and microphone settings .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl v | \-version +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl v | -version .Ao Ar URI Ac .Sh DESCRIPTION .Nm can be used to check your speaker and microphone settings. It will record you for five seconds and then play the recording back to you. If this fails, you might want to use the \fBpavucontrol\fP tool to check which microphone or speaker were assigned to GNUnet by PulseAudio (you may have more than one set of microphones or speakers known to your computer). -You can use gnunet\-conversation\-test without having a peer running on your computer. +You can use gnunet-conversation-test without having a peer running on your computer. .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. .El .\".Sh EXAMPLES diff --git a/doc/man/gnunet-conversation.1 b/doc/man/gnunet-conversation.1 index 62909224d..c319a231b 100644 --- a/doc/man/gnunet-conversation.1 +++ b/doc/man/gnunet-conversation.1 @@ -30,34 +30,34 @@ have a conversation with your peers .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl e Ar NAME | Fl \-ego= Ns Ar NAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl p Ar LINE | Fl \-phone= Ns Ar LINE -.Op Fl v | \-version +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl e Ar NAME | Fl -ego= Ns Ar NAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl p Ar LINE | Fl -phone= Ns Ar LINE +.Op Fl v | -version .Ao Ar URI Ac .Sh DESCRIPTION .Nm can be used to have a conversation with other GNUnet users. You can make calls and receive incoming calls. -You need to setup an ego using gnunet\-identity first. -For others to be able to call you, you must add a PHONE record to your zone in the GNU Name System (using gnunet\-namestore). -gnunet\-conversation has an interactive help system via the /help command. +You need to setup an ego using gnunet-identity first. +For others to be able to call you, you must add a PHONE record to your zone in the GNU Name System (using gnunet-namestore). +gnunet-conversation has an interactive help system via the /help command. .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl e Ar NAME | Fl \-ego= Ns Ar NAME +.It Fl e Ar NAME | Fl -ego= Ns Ar NAME Specifies the NAME of the ego to use (for caller ID). -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl p Ar LINE | Fl \-phone= Ns Ar LINE +.It Fl p Ar LINE | Fl -phone= Ns Ar LINE Optional argument that can be used to specify the phone LINE to be used with the conversation service. The default LINE is zero, which should be fine for most users. -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. .El .\".Sh EXAMPLES diff --git a/doc/man/gnunet-datastore.1 b/doc/man/gnunet-datastore.1 index fede02185..81347dcae 100644 --- a/doc/man/gnunet-datastore.1 +++ b/doc/man/gnunet-datastore.1 @@ -31,7 +31,7 @@ .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME .Op Fl d | -dump -.Op Fl f Ar FILENAME | Fl \-file= Ns Ar FILENAME +.Op Fl f Ar FILENAME | Fl -file= Ns Ar FILENAME .Op Fl h | -help .Op Fl i | -insert .Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL diff --git a/doc/man/gnunet-directory.1 b/doc/man/gnunet-directory.1 index 4a0696179..65c8e41ae 100644 --- a/doc/man/gnunet-directory.1 +++ b/doc/man/gnunet-directory.1 @@ -30,10 +30,10 @@ display directories .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl v | \-version +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl v | -version .Ao Ar FILENAME Ac .Sh DESCRIPTION .Nm @@ -42,15 +42,15 @@ A GNUnet directory is a binary file that contains a list of GNUnet file-sharing The names of the directory files must be passed as command-line arguments to gnunet-directory. The options are as follows: .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Configuration file to use. This option is useless, since gnunet-directory does not really depend on any configuration options. -.It Fl h | \-help +.It Fl h | -help Print the help page. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Change the loglevel. Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG. -.It Fl v | \-version +.It Fl v | -version Print the version number. .El .Ss NOTES diff --git a/doc/man/gnunet-download.1 b/doc/man/gnunet-download.1 index 56f18e050..951c4a979 100644 --- a/doc/man/gnunet-download.1 +++ b/doc/man/gnunet-download.1 @@ -30,24 +30,24 @@ a command line interface for downloading files from GNUnet .Sh SYNOPSIS .Nm -.Op Fl a Ar LEVEL | Fl \-anonymity= Ns Ar LEVEL -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl D | \-delete\-incomplete -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl n | \-no-network -.Op Fl o Ar FILENAME | Fl \-output= Ns Ar FILENAME -.Op Fl p Ar DOWNLOADS | Fl \-parallelism= Ns Ar DOWNLOADS -.Op Fl r Ar REQUESTS | Fl \-request-parallelism= Ns Ar REQUESTS -.Op Fl R | \-recursive -.Op Fl v | \-version -.Op Fl V | \-verbose +.Op Fl a Ar LEVEL | Fl -anonymity= Ns Ar LEVEL +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl D | -delete-incomplete +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl n | -no-network +.Op Fl o Ar FILENAME | Fl -output= Ns Ar FILENAME +.Op Fl p Ar DOWNLOADS | Fl -parallelism= Ns Ar DOWNLOADS +.Op Fl r Ar REQUESTS | Fl -request-parallelism= Ns Ar REQUESTS +.Op Fl R | -recursive +.Op Fl v | -version +.Op Fl V | -verbose .Ao Ar GNUNET_URI Ac .Sh DESCRIPTION Download files from GNUnet. The options are as follows: .Bl -tag -width indent -.It Fl a Ar LEVEL | Fl \-anonymity= Ns Ar LEVEL +.It Fl a Ar LEVEL | Fl -anonymity= Ns Ar LEVEL This option can be used to specify additional anonymity constraints. The default is 1. If set to 0, GNUnet will publish the file non-anonymously and in fact sign the advertisement for the file using your peer's private key. @@ -62,22 +62,22 @@ The specific numeric value (for anonymity levels above 1) is simple: Given an anonymity level L (above 1), each request FS makes on your behalf must be hidden in L-1 equivalent requests of cover traffic (traffic your peer routes for others) in the same time-period. The time-period is twice the average delay by which GNUnet artificially delays traffic. Note that regardless of the anonymity level you choose, peers that cache content in the network always use anonymity level 1. -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use config file (default: .Pa ~/.config/gnunet.conf Ns ) -.It Fl D | \-delete\-incomplete +.It Fl D | -delete-incomplete Causes gnunet-download to delete incomplete downloads when aborted with CTRL-C. Note that complete files that are part of an incomplete recursive download will not be deleted even with this option. Without this option, terminating gnunet-download with a signal will cause incomplete downloads to stay on disk. If gnunet-download runs to (normal) completion finishing the download, this option has no effect. -.It Fl h | \-help +.It Fl h | -help Print the help page. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Change the loglevel. Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG. -.It Fl n | \-no-network +.It Fl n | -no-network Only search locally, do not forward requests to other peers. -.It Fl o Ar FILENAME | Fl \-output= Ns Ar FILENAME +.It Fl o Ar FILENAME | Fl -output= Ns Ar FILENAME Write the file to .Ar FILENAME . Hint: when recursively downloading a directory, append a '/' to the end of the FILENAME to create a directory of that name. @@ -85,7 +85,7 @@ If no FILENAME is specified, gnunet-download constructs a temporary ID from the The final filename is constructed based on meta-data extracted using .Xr libextractor 1 (if available). -.It Fl p Ar DOWNLOADS | Fl \-parallelism= Ns Ar DOWNLOADS +.It Fl p Ar DOWNLOADS | Fl -parallelism= Ns Ar DOWNLOADS Set the maximum number of allowed parallel downloads to .Ar DOWNLOADS . More parallel downloads can, to some extent, improve the overall time to download content. @@ -97,7 +97,7 @@ This option is used to limit the number of files that are downloaded in parallel can be used to limit the number of blocks that are concurrently requested. As a result, the value only matters for recursive downloads. The default value is 32. -.It Fl r Ar REQUESTS | Fl \-request-parallelism= Ns Ar REQUESTS +.It Fl r Ar REQUESTS | Fl -request-parallelism= Ns Ar REQUESTS Set the maximum number of parallel requests that is allowed. If multiple files are downloaded, gnunet-download will not run them in parallel if this would cause the number of pending requests to possibly exceed the given value. This is useful since, for example, downloading dozens of multi-gigabyte files in parallel could exhaust memory resources and would hardly improve performance. @@ -107,16 +107,16 @@ Consider raising this limit for large recursive downloads with many large files is not reached. This option also only matters for recursive downloads. The default value is 4092. -.It Fl R | \-recursive +.It Fl R | -recursive Download directories recursively (and in parallel). Note that the URI must belong to a GNUnet directory and that the filename given to .Fl o must end in '.gnd' \(em otherwise, you will receive an error. You may want to use "DIRNAME/.gnd" for the filename, this way a directory "DIRNAME/" will be created, and GNUnet's internal directory information will be stored in "DIRNAME/.gnd". However, it is also possible to specify "DIRNAME.gnd", in which case the files from the directory will end up in "DIRNAME/", while GNUnet's directory meta data will be in "DIRNAME.gnd". -.It Fl v | \-version +.It Fl v | -version Print the version number. -.It Fl V | \-verbose +.It Fl V | -verbose Print progress information. .El .Ss NOTES diff --git a/doc/man/gnunet-fs.1 b/doc/man/gnunet-fs.1 index e87d9a3e2..f964acbb1 100644 --- a/doc/man/gnunet-fs.1 +++ b/doc/man/gnunet-fs.1 @@ -29,12 +29,12 @@ .Nd measure and control the FS subsystem .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl i | \-list-indexed -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl v | \-version -.Op Fl V | \-verbose +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl i | -list-indexed +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl v | -version +.Op Fl V | -verbose .Sh DESCRIPTION .Nm is a tool to access various functions of GNUnet's FS subsystem @@ -43,18 +43,18 @@ Most of these are not expected to be useful for end-users. gnunet-fs can currently only be used to obtain a list of indexed files. Other functions should be added in the near future. .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Configuration file to use. -.It Fl h | \-help +.It Fl h | -help Print the help page. -.It Fl i | \-list-indexed +.It Fl i | -list-indexed Print information about files that are currently indexed by file-sharing. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Change the loglevel. Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG. -.It Fl v | \-version +.It Fl v | -version Print the version number. -.It Fl V | \-verbose +.It Fl V | -verbose Be verbose. .El .Sh SEE ALSO diff --git a/doc/man/gnunet-gns-proxy.1 b/doc/man/gnunet-gns-proxy.1 index d985ee0d9..770cb4fe2 100644 --- a/doc/man/gnunet-gns-proxy.1 +++ b/doc/man/gnunet-gns-proxy.1 @@ -30,35 +30,35 @@ run a client side GNS SOCKS proxy .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl a Ar AUTHORITY | Fl \-authority= Ns Ar AUTHORITY -.Op Fl p Ar PORT | Fl \-port= Ns Ar PORT -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl v | \-version +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl a Ar AUTHORITY | Fl -authority= Ns Ar AUTHORITY +.Op Fl p Ar PORT | Fl -port= Ns Ar PORT +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl v | -version .Sh DESCRIPTION Most users will want to run this SOCKS proxy. It can be used in combination with browsers that support the SOCKS 4a protocol. .Pp The proxy will perform SSL authentication of GNS names and rewrite GNS enabled HTML content. To assert the validity of GNS names a local root CA certificate has to be generated that is used by the proxy. -Thus "gnunet-gns-proxy-setup-ca" should be executed before the first launch of this proxy or the \-\-authority switch is used to specify an appropriate CA certificate that is already trusted by the browser. +Thus "gnunet-gns-proxy-setup-ca" should be executed before the first launch of this proxy or the --authority switch is used to specify an appropriate CA certificate that is already trusted by the browser. .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl a Ar AUTHORITY | Fl \-authority= Ns Ar AUTHORITY +.It Fl a Ar AUTHORITY | Fl -authority= Ns Ar AUTHORITY Path to a PEM CA file that contains the certificate and private key of the CA to use to assert the validity of GNS names. The default port is specified in the configuration file for the gns service under "[gns-proxy]": "[gns-proxy]" PROXY_CACERT -.It Fl p Ar PORT | Fl \-port= Ns Ar PORT +.It Fl p Ar PORT | Fl -port= Ns Ar PORT The port this proxy should listen on. Default is 7777. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. .El .\".Sh EXAMPLES diff --git a/doc/man/gnunet-gns.1 b/doc/man/gnunet-gns.1 index 0743290b4..310198f74 100644 --- a/doc/man/gnunet-gns.1 +++ b/doc/man/gnunet-gns.1 @@ -30,43 +30,43 @@ access to GNU Name System .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME -.Op Fl r | \-raw -.Op Fl t Ar TYPE | Fl \-type= Ns Ar TYPE -.Op Fl u Ar NAME | Fl \-lookup= Ns Ar NAME -.Op Fl v | \-version +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME +.Op Fl r | -raw +.Op Fl t Ar TYPE | Fl -type= Ns Ar TYPE +.Op Fl u Ar NAME | Fl -lookup= Ns Ar NAME +.Op Fl v | -version .Sh DESCRIPTION .Nm can be used to lookup and process GNU Name Service names. .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME +.It Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME Write logs to FILENAME. -.It Fl r | \-raw +.It Fl r | -raw No unneeded output. This is a quiet mode where only important information is displayed. For example a lookup for an IP address will only yield the IP address, no descriptive text. -.It Fl t Ar TYPE | Fl \-type= Ns Ar TYPE +.It Fl t Ar TYPE | Fl -type= Ns Ar TYPE Resource Record Type (TYPE) to look for. Supported TYPE's are: A, AAAA, CNAME, NS, PKEY, PSEU, TLSA, SRV, SOA, MX, LEHO, VPN, REV, PTR, TXT. Defaults to "A". -.It Fl u Ar NAME | Fl \-lookup= Ns Ar NAME +.It Fl u Ar NAME | Fl -lookup= Ns Ar NAME Name to lookup. Resolve the specified name using the GNU Name System. -.It Fl T Ar TIMEOUT | Fl \-timeout= Ns Ar TIMEOUT +.It Fl T Ar TIMEOUT | Fl -timeout= Ns Ar TIMEOUT How much time to wait for a resolution to finish. Example: "5s" for 5 seconds or "3m" for 3 minutes. Defaults to "forver" (No timeout). -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. .El .Sh DIAGNOSTICS diff --git a/doc/man/gnunet-identity.1 b/doc/man/gnunet-identity.1 index ec1a7ab37..1adfdf4d0 100644 --- a/doc/man/gnunet-identity.1 +++ b/doc/man/gnunet-identity.1 @@ -35,7 +35,7 @@ .Op Fl e Ar NAME | Fl -ego= Ns Ar NAME .Op Fl h | -help .Op Fl m | -monitor -.Op Fl p | \-private-keys +.Op Fl p | -private-keys .Op Fl q | -quiet .Op Fl s Ar SUBSYSTEM | Fl -set= Ns Ar SUBSYSTEM .Op Fl V | -verbose diff --git a/doc/man/gnunet-namecache.1 b/doc/man/gnunet-namecache.1 index a040622b0..7abd9a449 100644 --- a/doc/man/gnunet-namecache.1 +++ b/doc/man/gnunet-namecache.1 @@ -30,29 +30,29 @@ inspect namecache .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl n Ar NAME | Fl \-name= Ns Ar NAME -.Op Fl v | \-version -.Op Fl z Ar PKEY | Fl \-zone= Ns Ar PKEY +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl n Ar NAME | Fl -name= Ns Ar NAME +.Op Fl v | -version +.Op Fl z Ar PKEY | Fl -zone= Ns Ar PKEY .Sh DESCRIPTION .Nm can be used to inspect values in the namecache. It is passed the mandatory option 'z' ('--zone=') with the argument PKEY, and the mandatory option 'n' ('--name=') with the argument NAME. .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl n Ar NAME | Fl \-name= Ns Ar NAME +.It Fl n Ar NAME | Fl -name= Ns Ar NAME Name (label) of the record to display (mandatory option). -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. -.It Fl z Ar PKEY | Fl \-zone= Ns Ar PKEY +.It Fl z Ar PKEY | Fl -zone= Ns Ar PKEY Specifies the public key of the zone to inspect (mandatory option) .El .\".Sh EXAMPLES diff --git a/doc/man/gnunet-namestore-fcfsd.1 b/doc/man/gnunet-namestore-fcfsd.1 index e1a09afe4..ee79a1784 100644 --- a/doc/man/gnunet-namestore-fcfsd.1 +++ b/doc/man/gnunet-namestore-fcfsd.1 @@ -30,11 +30,11 @@ HTTP server for GNU Name System First-Come-First-Served name registration .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl v | \-version -.Op Fl z Ar EGO | \-zone= Ns Ar EGO +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl v | -version +.Op Fl z Ar EGO | -zone= Ns Ar EGO .Sh DESCRIPTION Most users will not want to run an FCFS-zone and thus will not need this program. .Pp @@ -58,16 +58,16 @@ After that, you can start the FCFSD service (possibly using .Pp The options are as follows: .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. -.It Fl z Ar EGO | \-zone= Ns Ar EGO +.It Fl z Ar EGO | -zone= Ns Ar EGO Specifies for which .Ar EGO FCFSD should manage the zone. diff --git a/doc/man/gnunet-namestore.1 b/doc/man/gnunet-namestore.1 index e53bb7d95..e0d68fed1 100644 --- a/doc/man/gnunet-namestore.1 +++ b/doc/man/gnunet-namestore.1 @@ -61,11 +61,11 @@ Desired operation is adding a record. Use the configuration file FILENAME. .It Fl d | -delete Desired operation is deleting records under the given name that match -the specified type (\-t) and value (\-V). +the specified type (-t) and value (-V). If type or value are not specified, it means that all types (or values) should be assumed to match (and possibly multiple or all values under the given label will be deleted). -Specifying a label (\-n) is mandatory. +Specifying a label (-n) is mandatory. Note that matching by expiration time or flags is (currently) not supported. .It Fl D | -display @@ -85,7 +85,7 @@ suggested name for this zone. Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. .It Fl m | -monitor -Monitor changes to the zone on an ongoing basis (in contrast to \-D, +Monitor changes to the zone on an ongoing basis (in contrast to -D, which merely displays the current records). .It Fl n Ar NAME | Fl -name= Ns Ar NAME Label or name of the record to add/delete/display. diff --git a/doc/man/gnunet-nat-auto.1 b/doc/man/gnunet-nat-auto.1 index 2dbfaa599..f6d52abc6 100644 --- a/doc/man/gnunet-nat-auto.1 +++ b/doc/man/gnunet-nat-auto.1 @@ -30,30 +30,30 @@ autoconfigure and test NAT traversal .Sh SYNOPSIS .Nm -.Op Fl a | \-auto -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl S Ar NAME | Fl \-section= Ns Ar NAME -.Op Fl t | \-tcp -.Op Fl u | \-udp -.Op Fl w | \-write +.Op Fl a | -auto +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl S Ar NAME | Fl -section= Ns Ar NAME +.Op Fl t | -tcp +.Op Fl u | -udp +.Op Fl w | -write .Sh DESCRIPTION .Nm allows testing various NAT traversal functions, as well as attempting auto-configuration. The options are as follows: .Bl -tag -width indent -.It Fl a | \-auto +.It Fl a | -auto Attempt auto-configuration for NAT traversal. -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file .Ar FILENAME . -.It Fl S Ar NAME | Fl \-section= Ns Ar NAME +.It Fl S Ar NAME | Fl -section= Ns Ar NAME Name of the configuration section with details about the configuration to test. For example "transport-tcp". -.It Fl t | \-tcp +.It Fl t | -tcp Use TCP. -.It Fl u | \-udp +.It Fl u | -udp Use UDP. -.It Fl w | \-write +.It Fl w | -write Write configuration to configuration file, useful in combination with auto-configuration .Pq Fl a . .El diff --git a/doc/man/gnunet-nat-server.1 b/doc/man/gnunet-nat-server.1 index 77a5eec26..92ea9fd38 100644 --- a/doc/man/gnunet-nat-server.1 +++ b/doc/man/gnunet-nat-server.1 @@ -30,11 +30,11 @@ help GNUnet setup test network setup with NAT .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl d | \-daemonize -.Op Fl h | \-help -.Op Fl L Ar FILENAME | Fl \-logfile= Ns Ar FILENAME -.Op Fl v | \-version +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl d | -daemonize +.Op Fl h | -help +.Op Fl L Ar FILENAME | Fl -logfile= Ns Ar FILENAME +.Op Fl v | -version .Ao Ar PORT Ac .Sh DESCRIPTION Running a gnunet-nat-server is similar to running a hostlist server: it is a special service to the community with special requirements and no benefit to those running the service. @@ -60,20 +60,20 @@ In fact, distributions are encouraged to consider not shipping it at all. .Pp The options are as follows: .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file .Ar FILENAME . -.It Fl d | \-daemonize +.It Fl d | -daemonize Daemonize gnunet-nat-server (detach from terminal). -.It Fl h | \-help +.It Fl h | -help Print the help page. -.It Fl L Ar LOGLEVEL | Fl \-log= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -log= Ns Ar LOGLEVEL Configure logging to use .Ar LOGLEVEL . -.It Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME +.It Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME Configure logging to write logs to .Ar FILENAME . -.It Fl v | \-version +.It Fl v | -version Print the GNUnet version. .El .\".Sh EXAMPLES diff --git a/doc/man/gnunet-nat.1 b/doc/man/gnunet-nat.1 index 1ffdc5c7c..f0e36cb29 100644 --- a/doc/man/gnunet-nat.1 +++ b/doc/man/gnunet-nat.1 @@ -30,41 +30,41 @@ interact with the NAT service .Sh SYNOPSIS .Nm -.Op Fl b Ar ADDRESS | Fl \-bind= Ns Ar ADDRESS -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl e Ar ADDRESS | Fl \-external= Ns Ar ADDRESS -.Op Fl i Ar ADDRESS | Fl \-in= Ns Ar ADDRESS -.Op Fl r Ar ADDRESS | Fl \-remote= Ns Ar ADDRESS -.Op Fl S Ar NAME | Fl \-section= Ns Ar NAME -.Op Fl s | \-stun -.Op Fl t | \-tcp -.Op Fl u | \-udp -.Op Fl W | \-watch +.Op Fl b Ar ADDRESS | Fl -bind= Ns Ar ADDRESS +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl e Ar ADDRESS | Fl -external= Ns Ar ADDRESS +.Op Fl i Ar ADDRESS | Fl -in= Ns Ar ADDRESS +.Op Fl r Ar ADDRESS | Fl -remote= Ns Ar ADDRESS +.Op Fl S Ar NAME | Fl -section= Ns Ar NAME +.Op Fl s | -stun +.Op Fl t | -tcp +.Op Fl u | -udp +.Op Fl W | -watch .Sh DESCRIPTION This tool allows testing various NAT traversal functions, as well as attempting auto-configuration. .Sh OPTIONS .Bl -tag -width indent -.It Fl b Ar ADDRESS | Fl \-bind= Ns Ar ADDRESS +.It Fl b Ar ADDRESS | Fl -bind= Ns Ar ADDRESS Assume that the service is (locally) bound to ADDRESS. -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl e Ar ADDRESS | Fl \-external= Ns Ar ADDRESS +.It Fl e Ar ADDRESS | Fl -external= Ns Ar ADDRESS Assume that ADDRESS is the globally visible address of the peer. -.It Fl i Ar ADDRESS | Fl \-in= Ns Ar ADDRESS +.It Fl i Ar ADDRESS | Fl -in= Ns Ar ADDRESS Assuming we are listening at ADDRESS for connection reversal requests. -.It Fl r Ar ADDRESS | Fl \-remote= Ns Ar ADDRESS +.It Fl r Ar ADDRESS | Fl -remote= Ns Ar ADDRESS Ask the peer at ADDRESS for connection reversal, using the local address for the target address of the reversal. -.It Fl S Ar NAME | Fl \-section= Ns Ar NAME +.It Fl S Ar NAME | Fl -section= Ns Ar NAME Name of section in configuration file to use for additional options. -.It Fl s | \-stun +.It Fl s | -stun Enable processing of STUN requests. Will try to read UDP packets from the bind address and handle the packets if they are STUN packets. Will only work with UDP. -.It Fl t | \-tcp +.It Fl t | -tcp Use TCP. -.It Fl u | \-udp +.It Fl u | -udp Use UDP. -.It Fl W | \-watch +.It Fl W | -watch Watch for connection reversal requests. .El .Sh EXAMPLES diff --git a/doc/man/gnunet-peerinfo.1 b/doc/man/gnunet-peerinfo.1 index 143295dad..49d059d4f 100644 --- a/doc/man/gnunet-peerinfo.1 +++ b/doc/man/gnunet-peerinfo.1 @@ -30,46 +30,46 @@ display information about other peers .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl g | \-get\-hello -.Op Fl h | \-help -.Op Fl i | \-info -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl l Ar LOGFILE | Fl \-logfile= ns Ar LOGFILE -.Op Fl n | \-numeric -.Op Fl p Ar HELLO | Fl \-put\-hello= Ns Ar HELLO -.Op Fl q | \-quiet -.Op Fl s | \-self -.Op Fl v | \-version +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl g | -get-hello +.Op Fl h | -help +.Op Fl i | -info +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl l Ar LOGFILE | Fl -logfile= ns Ar LOGFILE +.Op Fl n | -numeric +.Op Fl p Ar HELLO | Fl -put-hello= Ns Ar HELLO +.Op Fl q | -quiet +.Op Fl s | -self +.Op Fl v | -version .Sh DESCRIPTION .Nm displays the known addresses and trust of known peers. .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Load config file, default FILENAME of the config is .Pa ~/.config/gnunet.conf . -.It Fl g | \-get\-hello +.It Fl g | -get-hello Output HELLO uri(s) -.It Fl h | \-help +.It Fl h | -help Print the help page. -.It Fl i | \-info +.It Fl i | -info List all known peers (and their addresses). -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Set the loglevel -.It Fl l Ar LOGFILE | Fl \-logfile= ns Ar LOGFILE +.It Fl l Ar LOGFILE | Fl -logfile= ns Ar LOGFILE Log messages to LOGFILE -.It Fl n | \-numeric +.It Fl n | -numeric Disable resolution of IPs to hostnames -.It Fl p Ar HELLO | Fl \-put\-hello= Ns Ar HELLO +.It Fl p Ar HELLO | Fl -put-hello= Ns Ar HELLO Add given HELLO uri to the database -.It Fl q | \-quiet +.It Fl q | -quiet Do not print anything but the peer identities -.It Fl s | \-self +.It Fl s | -self Print only our own identity. Together with .Fl q , this is the exact line that other peers would have to put in to their friends file in order to consider this peer one of their friends in F2F mode. -.It Fl v | \-version +.It Fl v | -version Print the version number .El .Sh SEE ALSO diff --git a/doc/man/gnunet-publish.1 b/doc/man/gnunet-publish.1 index 04293102c..a54a1717f 100644 --- a/doc/man/gnunet-publish.1 +++ b/doc/man/gnunet-publish.1 @@ -30,25 +30,25 @@ a command line interface for publishing new content into GNUnet .Sh SYNOPSIS .Nm -.Op Fl a Ar LEVEL | Fl \-anonymity= Ns Ar LEVEL -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl D | \-disable\-extractor -.Op Fl E | \-enable\-creation\-time -.Op Fl e | \-extract -.Op Fl h | \-help -.Op Fl k Ar KEYWORD | Fl \-key= Ns Ar KEYWORD -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl m Ar TYPE:VALUE | Fl \-meta= Ns Ar TYPE:VALUE -.Op Fl n | \-noindex -.Op Fl N Ar ID | Fl \-next= Ns Ar ID -.Op Fl p Ar PRIORITY | Fl \-prio= Ns Ar PRIORITY -.Op Fl P Ar NAME | Fl \-pseudonym= Ns Ar NAME -.Op Fl r Ar LEVEL | Fl \-replication= Ns Ar LEVEL -.Op Fl s | \-simulate-only -.Op Fl t Ar ID | Fl \-this= Ns Ar ID -.Op Fl u Ar URI | Fl \-uri= Ns Ar URI -.Op Fl v | \-version -.Op Fl V | \-verbose +.Op Fl a Ar LEVEL | Fl -anonymity= Ns Ar LEVEL +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl D | -disable-extractor +.Op Fl E | -enable-creation-time +.Op Fl e | -extract +.Op Fl h | -help +.Op Fl k Ar KEYWORD | Fl -key= Ns Ar KEYWORD +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl m Ar TYPE:VALUE | Fl -meta= Ns Ar TYPE:VALUE +.Op Fl n | -noindex +.Op Fl N Ar ID | Fl -next= Ns Ar ID +.Op Fl p Ar PRIORITY | Fl -prio= Ns Ar PRIORITY +.Op Fl P Ar NAME | Fl -pseudonym= Ns Ar NAME +.Op Fl r Ar LEVEL | Fl -replication= Ns Ar LEVEL +.Op Fl s | -simulate-only +.Op Fl t Ar ID | Fl -this= Ns Ar ID +.Op Fl u Ar URI | Fl -uri= Ns Ar URI +.Op Fl v | -version +.Op Fl V | -verbose .Ao Ar FILENAME Ac .Sh DESCRIPTION In order to share files with other GNUnet users, the files must first be made available to GNUnet. @@ -109,10 +109,10 @@ to specify meta-data. For the .Fl m option you need to use the form keyword-type:value. -For example, use "\-m os:Linux" to specify that the operating system is Linux. +For example, use "-m os:Linux" to specify that the operating system is Linux. Common meta-data types are "author", "title", "mimetype", "filename", "language", "subject" and "keywords". A full list can be obtained from the extract tool using the option -.Fl \-list . +.Fl -list . The meta-data is used to help users in searching for files on the network. The keywords are case-sensitive. .Pp @@ -128,7 +128,7 @@ If you publish or index a file and then leave the network, it will almost always .Pp The options are as follows: .Bl -tag -width indent -.It Fl a Ar LEVEL | Fl \-anonymity= Ns Ar LEVEL +.It Fl a Ar LEVEL | Fl -anonymity= Ns Ar LEVEL This option can be used to specify additional anonymity constraints. The default is 1. If set to 0, GNUnet will publish the file non-anonymously and in fact sign the advertisement for the file using your peer's private key. @@ -143,38 +143,38 @@ The specific numeric value (for anonymity levels above 1) is simple: Given an anonymity level L (above 1), each request FS makes on your behalf must be hidden in L-1 equivalent requests of cover traffic (traffic your peer routes for others) in the same time-period. The time-period is twice the average delay by which GNUnet artificially delays traffic. Note that regardless of the anonymity level you choose, peers that cache content in the network always use anonymity level 1. -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use alternate config file FILENAME. If this option is not specified, the default is .Pa ~/.config/gnunet.conf . -.It Fl D | \-disable\-extractor +.It Fl D | -disable-extractor Disable use of GNU libextractor for finding additional keywords and metadata. -.It Fl E | \-enable\-creation\-time +.It Fl E | -enable-creation-time Enable use of creation time timestamp in metadata. Setting this information will leak information about the time at which a file was made available. -.It Fl e | \-extract +.It Fl e | -extract Print the list of keywords that will be used for each file given the current options. Do not perform any indexing or publishing. -.It Fl h | \-help +.It Fl h | -help Print the help page. -.It Fl k Ar KEYWORD | Fl \-key= Ns Ar KEYWORD +.It Fl k Ar KEYWORD | Fl -key= Ns Ar KEYWORD Additional key to index the content with (to add multiple keys, specify multiple times). -Each additional key is case\-sensitive. +Each additional key is case-sensitive. Can be specified multiple times. -The keyword is only applied to the top\-level file or directory. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +The keyword is only applied to the top-level file or directory. +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Change the loglevel. Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG. -.It Fl m Ar TYPE:VALUE | Fl \-meta= Ns Ar TYPE:VALUE +.It Fl m Ar TYPE:VALUE | Fl -meta= Ns Ar TYPE:VALUE For the main file (or directory), set the metadata of the given TYPE to the given VALUE. Note that this will not add the respective VALUE to the set of keywords under which the file can be found. -.It Fl n | \-noindex +.It Fl n | -noindex Executive summary: You probably don't need it. Do not index, full publishing. Note that directories, information for keyword search, namespace search and indexing data are always published (even without this option). With this option, every block of the actual files is stored in encrypted form in the block database of the local peer. While this adds security if the local node is compromised (the adversary snags your machine), it is significantly less efficient compared to on-demand encryption and is definitely not recommended for large files. -.It Fl N Ar ID | Fl \-next= Ns Ar ID +.It Fl N Ar ID | Fl -next= Ns Ar ID Specifies the next identifier of a future version of the file to be published under the same pseudonym. This option is only valid together with the .Fl P @@ -187,36 +187,36 @@ and without .Fl t is not allowed. -.It Fl p Ar PRIORITY | Fl \-prio= Ns Ar PRIORITY +.It Fl p Ar PRIORITY | Fl -prio= Ns Ar PRIORITY Executive summary: You probably don't need it. Set the priority of the published content (default: 365). If the local database is full, GNUnet will discard the content with the lowest ranking. Note that ranks change over time depending on popularity. The default should be high enough to preserve the locally published content in favor of content that migrates from other peers. -.It Fl P Ar NAME | Fl \-pseudonym= Ns Ar NAME +.It Fl P Ar NAME | Fl -pseudonym= Ns Ar NAME For the top-level directory or file, places the file into the namespace identified by the pseudonym NAME. NAME must be a valid pseudonym managed by .Xr gnunet-identity 1 . -.It Fl r Ar LEVEL | Fl \-replication= Ns Ar LEVEL +.It Fl r Ar LEVEL | Fl -replication= Ns Ar LEVEL Set the desired replication level. If CONTENT_PUSHING is set to YES, GNUnet will push each block (for the file) LEVEL times to other peers before doing normal "random" replication of all content. This option can be used to push some content out into the network harder. Note that pushing content LEVEL times into the network does not guarantee that there will actually be LEVEL replicas. -.It Fl s | \-simulate-only -When this option is used, gnunet\-publish will not actually publish the file but just simulate what would be done. +.It Fl s | -simulate-only +When this option is used, gnunet-publish will not actually publish the file but just simulate what would be done. This can be used to compute the GNUnet URI for a file without actually sharing it. -.It Fl t Ar ID | Fl \-this= Ns Ar ID +.It Fl t Ar ID | Fl -this= Ns Ar ID Specifies the identifier under which the file is to be published under a pseudonym. This option is only valid together with the .Fl P option. -.It Fl u Ar URI | Fl \-uri= Ns Ar URI +.It Fl u Ar URI | Fl -uri= Ns Ar URI This option can be used to specify the URI of a file instead of a filename (this is the only case where the otherwise mandatory filename argument must be omitted). Instead of publishing a file or directory and using the corresponding URI, gnunet-publish will use this URI and perform the selected namespace or keyword operations. This can be used to add additional keywords to a file that has already been shared or to add files to a namespace for which the URI is known but the content is not locally available. -.It Fl v | \-version +.It Fl v | -version Print the version number. -.It Fl V | \-verbose +.It Fl V | -verbose Be verbose. Using this option causes gnunet-publish to print progress information and at the end the file identification that can be used to download the file from GNUnet. .El diff --git a/doc/man/gnunet-reclaim.1 b/doc/man/gnunet-reclaim.1 index c1ab0d1aa..5003ef070 100644 --- a/doc/man/gnunet-reclaim.1 +++ b/doc/man/gnunet-reclaim.1 @@ -30,62 +30,62 @@ Command-line tools for re:claimID subsystem .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE -.Op Fl e Ar EGO | Fl \-ego= Ns Ar EGO -.Op Fl a Ar NAME | Fl \-add= Ns Ar NAME -.Op Fl V Ar VALUE | Fl \-value= Ns Ar VALUE -.Op Fl d Ar ID | Fl \-delete= Ns Ar ID -.Op Fl r Ar RP | Fl \-rp= Ns Ar RP -.Op Fl D | \-dump -.Op Fl i Ar A1,A2,... | Fl \-issue= Ns Ar A1,A2,... -.Op Fl C Ar TICKET | Fl \-consume= Ns Ar TICKET -.Op Fl R Ar TICKET | Fl \-revoke= Ns Ar TICKET -.Op Fl t Ar TYPE | Fl \-type= Ns Ar TYPE -.Op Fl T | \-tickets -.Op Fl E Ar INTERVAL | Fl \-expiration= Ns Ar INTERVAL -.Op Fl v | \-version +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE +.Op Fl e Ar EGO | Fl -ego= Ns Ar EGO +.Op Fl a Ar NAME | Fl -add= Ns Ar NAME +.Op Fl V Ar VALUE | Fl -value= Ns Ar VALUE +.Op Fl d Ar ID | Fl -delete= Ns Ar ID +.Op Fl r Ar RP | Fl -rp= Ns Ar RP +.Op Fl D | -dump +.Op Fl i Ar A1,A2,... | Fl -issue= Ns Ar A1,A2,... +.Op Fl C Ar TICKET | Fl -consume= Ns Ar TICKET +.Op Fl R Ar TICKET | Fl -revoke= Ns Ar TICKET +.Op Fl t Ar TYPE | Fl -type= Ns Ar TYPE +.Op Fl T | -tickets +.Op Fl E Ar INTERVAL | Fl -expiration= Ns Ar INTERVAL +.Op Fl v | -version .Sh DESCRIPTION .Nm allows you to manage identity attributes and manage authorizations. .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE +.It Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE Configure logging to write logs to LOGFILE. -.It Fl e Ar EGO | Fl \-ego= Ns Ar EGO +.It Fl e Ar EGO | Fl -ego= Ns Ar EGO Specify identity to use. Always required. -.It Fl a Ar NAME | Fl \-add= Ns Ar NAME +.It Fl a Ar NAME | Fl -add= Ns Ar NAME Add an attribute with NAME. Must be used in conjunction with -V -.It Fl V Ar VALUE | Fl \-value= Ns Ar VALUE +.It Fl V Ar VALUE | Fl -value= Ns Ar VALUE Specify value of attribute to add. -.It Fl t Ar TYPE | Fl \-type= Ns Ar TYPE +.It Fl t Ar TYPE | Fl -type= Ns Ar TYPE Specify type of attribute to add (Default: STRING) -.It Fl d Ar ID | Fl \-delete= Ns Ar ID +.It Fl d Ar ID | Fl -delete= Ns Ar ID Delete an attribute with ID. -.It Fl E Ar INTERVAL | Fl \-expiration= Ns Ar INTERVAL +.It Fl E Ar INTERVAL | Fl -expiration= Ns Ar INTERVAL Specify relative expiration interval (freshness) of attribute. -.It Fl D | \-dump +.It Fl D | -dump List all attributes for given identity. -.It Fl i Ar A1,A2,... | Fl \-issue= Ns Ar A1,A2,... +.It Fl i Ar A1,A2,... | Fl -issue= Ns Ar A1,A2,... Authorize a relying party to access a set of attributes. Must be used in conjunction with -r. Returns a TICKET. -.It Fl r Ar RP | Fl \-rp= Ns Ar RP +.It Fl r Ar RP | Fl -rp= Ns Ar RP The relying party to authorize (see -i). RP is a PKEY of the entity. -.It Fl C Ar TICKET | Fl \-consume= Ns Ar TICKET +.It Fl C Ar TICKET | Fl -consume= Ns Ar TICKET Consume TICKET and retrieve shared attributes. To be used by RP. -.It Fl R Ar TICKET | Fl \-revoke= Ns Ar TICKET +.It Fl R Ar TICKET | Fl -revoke= Ns Ar TICKET Revoke TICKET. To be used by identity which issued TICKET. -.It Fl T | \-tickets +.It Fl T | -tickets List issued tickets. -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. .El .\".Sh EXAMPLES diff --git a/doc/man/gnunet-resolver.1 b/doc/man/gnunet-resolver.1 index 843b4e2a0..8952dc14e 100644 --- a/doc/man/gnunet-resolver.1 +++ b/doc/man/gnunet-resolver.1 @@ -30,29 +30,29 @@ built-in GNUnet stub resolver .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE -.Op Fl r | \-reverse -.Op Fl v | \-version +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE +.Op Fl r | -reverse +.Op Fl v | -version .Ao Ar hostname Ac .Sh DESCRIPTION .Nm allows you to use the build-in GNUnet stub resolver. .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE +.It Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE Configure logging to write logs to LOGFILE. -.It Fl r | \-reverse +.It Fl r | -reverse Perform a reverse lookup. -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. .El .\".Sh EXAMPLES diff --git a/doc/man/gnunet-revocation.1 b/doc/man/gnunet-revocation.1 index 16f954a2e..812c2633e 100644 --- a/doc/man/gnunet-revocation.1 +++ b/doc/man/gnunet-revocation.1 @@ -30,14 +30,14 @@ revoke private keys (of egos) in GNUnet .Sh SYNOPSIS .Nm -.Op Fl t Ar KEY | Fl \-test= Ns Ar KEY -.Op Fl R Ar NAME | Fl \-revoke= Ns Ar NAME -.Op Fl p | \-perform -.Op Fl f Ar NAME | Fl \-filename= Ns Ar NAME -.Op Fl c Ar FILENAME, Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl v | \-version +.Op Fl t Ar KEY | Fl -test= Ns Ar KEY +.Op Fl R Ar NAME | Fl -revoke= Ns Ar NAME +.Op Fl p | -perform +.Op Fl f Ar NAME | Fl -filename= Ns Ar NAME +.Op Fl c Ar FILENAME, Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl v | -version .Sh DESCRIPTION .Nm can be used to verify if a key has been revoked, to create a revocation certificate for later revocation, to instantly revoke a key and to use a pre-generated revocation certificate to revoke a key. @@ -49,26 +49,26 @@ gnunet-revocation also makes is possible to resume the pre-calculation of a revo Note that performing a revocation proof-of-work is deliberately VERY expensive. Depending on your CPU, the calculation can take days or weeks. .Bl -tag -width indent -.It Fl t Ar KEY | Fl \-test= Ns Ar KEY -Check if the given KEY (ASCII\-encoded public key required) has been revoked. -.It Fl R Ar NAME | Fl \-revoke= Ns Ar NAME +.It Fl t Ar KEY | Fl -test= Ns Ar KEY +Check if the given KEY (ASCII-encoded public key required) has been revoked. +.It Fl R Ar NAME | Fl -revoke= Ns Ar NAME Calculate or perform revocation for the ego with the given NAME. -.It Fl p | \-perform +.It Fl p | -perform Actually perform the revocation as soon as possible (do not just generate a revocation certificate, use it). Must be supplied to actually perform the revocation. -.It Fl f Ar NAME | Fl \-filename= Ns Ar NAME +.It Fl f Ar NAME | Fl -filename= Ns Ar NAME Use NAME as the name of the file that is to contain the revocation certificate. Intermediate computation results will be stored here, as well as the final revocation certificate. -When used together with \-p, this file will be inspected to see if it contains a valid certificate for instant revocation, in which case the revocation can be performed instantly. -If the given file contains anything (a valid certificate, with or without the completed proof-of-work) there is no need to supply the "\-R" option or to still have the private key of the ego to perform the revocation. -.It Fl c Ar FILENAME, Fl \-config= Ns Ar FILENAME +When used together with -p, this file will be inspected to see if it contains a valid certificate for instant revocation, in which case the revocation can be performed instantly. +If the given file contains anything (a valid certificate, with or without the completed proof-of-work) there is no need to supply the "-R" option or to still have the private key of the ego to perform the revocation. +.It Fl c Ar FILENAME, Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. .El .Sh SEE ALSO diff --git a/doc/man/gnunet-scrypt.1 b/doc/man/gnunet-scrypt.1 index 16a377443..ab1188348 100644 --- a/doc/man/gnunet-scrypt.1 +++ b/doc/man/gnunet-scrypt.1 @@ -29,41 +29,41 @@ .Nd manipulate GNUnet proof of work files .Sh SYNOPSIS .Nm -.Op Fl b Ar BITS | Fl \-bits= Ns Ar BITS -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl k Ar FILENAME | Fl \-keyfile= Ns Ar FILENAME -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME -.Op Fl o Ar FILENAME | Fl \-outfile= Ns Ar FILENAME -.Op Fl t Ar DELAY | Fl \-timeout= Ns Ar DELAY -.Op Fl v | \-version +.Op Fl b Ar BITS | Fl -bits= Ns Ar BITS +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl k Ar FILENAME | Fl -keyfile= Ns Ar FILENAME +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME +.Op Fl o Ar FILENAME | Fl -outfile= Ns Ar FILENAME +.Op Fl t Ar DELAY | Fl -timeout= Ns Ar DELAY +.Op Fl v | -version .Sh DESCRIPTION .Nm is a command line tool to manipulate GNUnet proof of work files. .Bl -tag -width indent -.It Fl b Ar BITS | Fl \-bits= Ns Ar BITS +.It Fl b Ar BITS | Fl -bits= Ns Ar BITS Number of bits to require for the proof of work. -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file .Ar FILENAME . -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl k Ar FILENAME | Fl \-keyfile= Ns Ar FILENAME +.It Fl k Ar FILENAME | Fl -keyfile= Ns Ar FILENAME Use .Ar FILENAME as the file with private key, otherwise the default private key file is used. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME +.It Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME Configure logging to write logs to FILENAME. -.It Fl o Ar FILENAME | Fl \-outfile= Ns Ar FILENAME +.It Fl o Ar FILENAME | Fl -outfile= Ns Ar FILENAME File with proof of work, otherwise default is used. -.It Fl t Ar DELAY | Fl \-timeout= Ns Ar DELAY +.It Fl t Ar DELAY | Fl -timeout= Ns Ar DELAY Time to wait between calculations. -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. .Sh SEE ALSO The full documentation for gnunet is maintained as a Texinfo manual. diff --git a/doc/man/gnunet-search.1 b/doc/man/gnunet-search.1 index 59263c1b1..c670da3d2 100644 --- a/doc/man/gnunet-search.1 +++ b/doc/man/gnunet-search.1 @@ -30,17 +30,17 @@ a command line interface to search for content on GNUnet .Sh SYNOPSIS .Nm -.Op Fl a Ar LEVEL | Fl \-anonymity= Ns Ar LEVEL -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME -.Op Fl o Ar FILENAME | Fl \-output= Ns Ar FILENAME -.Op Fl n | \-no-network -.Op Fl N Ar VALUE | Fl \-results= Ns Ar VALUE -.Op Fl t Ar DELAY | Fl \-timeout= Ns Ar DELAY -.Op Fl v | \-version -.Op Fl V | \-verbose +.Op Fl a Ar LEVEL | Fl -anonymity= Ns Ar LEVEL +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME +.Op Fl o Ar FILENAME | Fl -output= Ns Ar FILENAME +.Op Fl n | -no-network +.Op Fl N Ar VALUE | Fl -results= Ns Ar VALUE +.Op Fl t Ar DELAY | Fl -timeout= Ns Ar DELAY +.Op Fl v | -version +.Op Fl V | -verbose .Ao KEYWORD Ac Ao +KEYWORD Ac | Ao Ar URI Ac Ao Ar +URI Ac .Sh DESCRIPTION Search for content on GNUnet. @@ -49,7 +49,7 @@ The keywords are case-sensitive. can be used both for a search in the global namespace as well as for searching a private subspace. The options are as follows: .Bl -tag -width indent -.It Fl a Ar LEVEL | Fl \-anonymity= Ns Ar LEVEL +.It Fl a Ar LEVEL | Fl -anonymity= Ns Ar LEVEL This option can be used to specify additional anonymity constraints. The default is 1. If set to 0, GNUnet will publish the file non-anonymously and in fact sign the advertisement for the file using your peer's private key. @@ -64,37 +64,37 @@ The specific numeric value (for anonymity levels above 1) is simple: Given an anonymity level L (above 1), each request FS makes on your behalf must be hidden in L-1 equivalent requests of cover traffic (traffic your peer routes for others) in the same time-period. The time-period is twice the average delay by which GNUnet artificially delays traffic. Note that regardless of the anonymity level you choose, peers that cache content in the network always use anonymity level 1. -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file .Ar FILENAME (default: .Pa ~/.config/gnunet.conf ) -.It Fl h | \-help +.It Fl h | -help Print the help page. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Change the loglevel. Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG. -.It Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME +.It Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME Write logs to .Ar FILENAME . -.It Fl o Ar FILENAME | Fl \-output= Ns Ar FILENAME +.It Fl o Ar FILENAME | Fl -output= Ns Ar FILENAME Writes a GNUnet directory containing all of the search results to .Ar FILENAME . -.It Fl n | \-no-network +.It Fl n | -no-network Only search locally, do not forward requests to other peers. -.It Fl N Ar VALUE | Fl \-results= Ns Ar VALUE +.It Fl N Ar VALUE | Fl -results= Ns Ar VALUE Automatically terminate the search after receiving .Ar VALUE results. -.It Fl t Ar DELAY | Fl \-timeout= Ns Ar DELAY +.It Fl t Ar DELAY | Fl -timeout= Ns Ar DELAY Automatically timeout search after .Ar DELAY . The value given must be a number followed by a space and a time unit, for example "500 ms". Note that the quotes are required on the shell. -Otherwise the search runs until gnunet-search is aborted with CTRL\-C. -.It Fl v | \-version +Otherwise the search runs until gnunet-search is aborted with CTRL-C. +.It Fl v | -version print the version number -.It Fl V | \-verbose +.It Fl V | -verbose print meta data from search results as well .El You can run gnunet-search with an URI instead of a keyword. diff --git a/doc/man/gnunet-statistics.1 b/doc/man/gnunet-statistics.1 index a2ada90a4..b745c9897 100644 --- a/doc/man/gnunet-statistics.1 +++ b/doc/man/gnunet-statistics.1 @@ -29,61 +29,61 @@ .Nd display statistics about your GNUnet system .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME -.Op Fl n Ar NAME | Fl \-name= Ns Ar NAME -.Op Fl o Ar PORT | Fl \-port= Ns Ar PORT -.Op Fl p | \-persistent -.Op Fl q | \-quiet -.Op Fl r Ar REMOTE | Fl \-remote= Ns Ar REMOTE -.Op Fl S Ar SEPARATOR | Fl \-csv-separator= Ns Ar SEPARATOR -.Op Fl s Ar SUBSYSTEM | Fl \-subsystem= Ns Ar SUBSYSTEM -.Op Fl t Ar PATH | Fl \-testbed= Ns Ar PATH -.Op Fl v | \-version -.Op Fl w | \-watch +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME +.Op Fl n Ar NAME | Fl -name= Ns Ar NAME +.Op Fl o Ar PORT | Fl -port= Ns Ar PORT +.Op Fl p | -persistent +.Op Fl q | -quiet +.Op Fl r Ar REMOTE | Fl -remote= Ns Ar REMOTE +.Op Fl S Ar SEPARATOR | Fl -csv-separator= Ns Ar SEPARATOR +.Op Fl s Ar SUBSYSTEM | Fl -subsystem= Ns Ar SUBSYSTEM +.Op Fl t Ar PATH | Fl -testbed= Ns Ar PATH +.Op Fl v | -version +.Op Fl w | -watch .Ao Ar VALUE Ac .Sh DESCRIPTION .Nm is used to display detailed information about various aspect of GNUnet's operation. This tool only works if the "statistics" service is available. -gnunet-statistics can be used to set a value by giving the options \-n, \-s and also a VALUE. +gnunet-statistics can be used to set a value by giving the options -n, -s and also a VALUE. .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME +.It Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME Configure logging to write logs to FILENAME -.It Fl n Ar NAME | Fl \-name= Ns Ar NAME +.It Fl n Ar NAME | Fl -name= Ns Ar NAME Each statistic has a NAME that is unique with in its subsystem. With this option, the output can be restricted to statistics that have a particular NAME. -.It Fl o Ar PORT | Fl \-port= Ns Ar PORT +.It Fl o Ar PORT | Fl -port= Ns Ar PORT PORT for remote host -.It Fl p | \-persistent +.It Fl p | -persistent When setting a value, make the value persistent. If the value used to be persistent and this flag is not given, it will be marked as non-persistent. -.It Fl q | \-quiet +.It Fl q | -quiet Just print the statistics value -.It Fl r Ar REMOTE | Fl \-remote= Ns Ar REMOTE +.It Fl r Ar REMOTE | Fl -remote= Ns Ar REMOTE Connect to a remote host given as REMOTE. -.It Fl S Ar SEPARATOR | Fl \-csv-separator= Ns Ar SEPARATOR +.It Fl S Ar SEPARATOR | Fl -csv-separator= Ns Ar SEPARATOR Specify a separator for generating csv-output. -.It Fl s Ar SUBSYSTEM | Fl \-subsystem= Ns Ar SUBSYSTEM +.It Fl s Ar SUBSYSTEM | Fl -subsystem= Ns Ar SUBSYSTEM Statistics are kept for various subsystems. With this option, the output can be restricted to a particular subsystem only. -.It Fl t Ar PATH | Fl \-testbed= Ns Ar PATH +.It Fl t Ar PATH | Fl -testbed= Ns Ar PATH When running testbed, you can get statistics of all peers with specefying the folder containing the data of all testbed nodes like .Pp .Dl $ gnunet-statistics -t /tmp/testbedARtmQv .Pp -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. -.It Fl w | \-watch +.It Fl w | -watch Watch value continuously. .El .Sh SEE ALSO diff --git a/doc/man/gnunet-testbed-profiler.1 b/doc/man/gnunet-testbed-profiler.1 index 475884df2..5d1737e72 100644 --- a/doc/man/gnunet-testbed-profiler.1 +++ b/doc/man/gnunet-testbed-profiler.1 @@ -30,38 +30,38 @@ profiling driver for the testbed .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl e Ar COUNT | Fl \-num-errors= Ns Ar COUNT -.Op Fl H Ar FILENAME | Fl \-hosts= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE -.Op Fl n | \-non-interactive -.Op Fl p Ar COUNT | Fl \-num-peers= Ns Ar COUNT -.Op Fl v | \-version +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl e Ar COUNT | Fl -num-errors= Ns Ar COUNT +.Op Fl H Ar FILENAME | Fl -hosts= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE +.Op Fl n | -non-interactive +.Op Fl p Ar COUNT | Fl -num-peers= Ns Ar COUNT +.Op Fl v | -version .Sh DESCRIPTION .Nm is a command line profiling driver for the testbed. .Sh OPTIONS .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl e Ar COUNT | Fl \-num-errors= Ns Ar COUNT +.It Fl e Ar COUNT | Fl -num-errors= Ns Ar COUNT Tolerate COUNT number of continious timeout failures. -.It Fl H Ar FILENAME | Fl \-hosts= Ns Ar FILENAME +.It Fl H Ar FILENAME | Fl -hosts= Ns Ar FILENAME Name of the file with the login information for the testbed. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE +.It Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE Configure logging to write logs to LOGFILE. -.It Fl n | \-non-interactive +.It Fl n | -non-interactive Run profiler in non-interactive mode where upon testbed setup the profiler does not wait for a keystroke but continues to run until a termination signal is received. -.It Fl p Ar COUNT | Fl \-num-peers= Ns Ar COUNT +.It Fl p Ar COUNT | Fl -num-peers= Ns Ar COUNT Create COUNT number of peers. -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. .El .Sh SEE ALSO diff --git a/doc/man/gnunet-testing-run-service.1 b/doc/man/gnunet-testing-run-service.1 index 4f3c5c74b..5aa13fd22 100644 --- a/doc/man/gnunet-testing-run-service.1 +++ b/doc/man/gnunet-testing-run-service.1 @@ -30,9 +30,9 @@ command line tool to start a service for testing .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl s Ar SERVICE | Fl \-service= Ns Ar SERVICE +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl s Ar SERVICE | Fl -service= Ns Ar SERVICE .Sh DESCRIPTION .Nm is a command line tool to start a service for testing. @@ -43,11 +43,11 @@ When reading the character 'r' from stdin, the running service is restarted with .Pp This executable is intended to be used by gnunet-java, in order to reliably start and stop services for test cases. .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Name of the template configuration file to use (optional). -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl s Ar SERVICE | Fl \-service= Ns Ar SERVICE +.It Fl s Ar SERVICE | Fl -service= Ns Ar SERVICE Name of the service to run. .El .Sh SEE ALSO diff --git a/doc/man/gnunet-testing.1 b/doc/man/gnunet-testing.1 index 659e46fbc..c1dad78e0 100644 --- a/doc/man/gnunet-testing.1 +++ b/doc/man/gnunet-testing.1 @@ -30,43 +30,43 @@ command line tool to access the testing library .Sh SYNOPSIS .Nm -.Op Fl C | \-cfg -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl H | \-hostkeys -.Op Fl h | \-help -.Op Fl k | \-key -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOFILE -.Op Fl n | \-number -.Op Fl t | \-template -.Op Fl v | \-version +.Op Fl C | -cfg +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl H | -hostkeys +.Op Fl h | -help +.Op Fl k | -key +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOFILE +.Op Fl n | -number +.Op Fl t | -template +.Op Fl v | -version .Sh DESCRIPTION .Nm is a command line tool to access the testing library. .Sh OPTIONS .Bl -tag -width indent -.It Fl C | \-cfg +.It Fl C | -cfg Create unique configuration files. -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file .Ar FILENAME . -.It Fl H | \-hostkeys +.It Fl H | -hostkeys Host key file. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl k | \-key +.It Fl k | -key Create hostkey files from pre-computed hostkey list. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOFILE +.It Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOFILE Configure logging to write logs to .Ar LOGFILE . -.It Fl n | \-number +.It Fl n | -number Number of unique configuration files or hostkeys to create. -.It Fl t | \-template +.It Fl t | -template Configuration template. -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. .El .Sh SEE ALSO diff --git a/doc/man/gnunet-unindex.1 b/doc/man/gnunet-unindex.1 index 886793ed9..36d59edf0 100644 --- a/doc/man/gnunet-unindex.1 +++ b/doc/man/gnunet-unindex.1 @@ -30,27 +30,27 @@ a command line interface for deleting indexed files from GNUnet .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl v | \-version -.Op Fl V | \-verbose +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl v | -version +.Op Fl V | -verbose FILENAME .Sh DESCRIPTION .Nm is used for deleting indexed files from GNUnet. .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use config file FILENAME as config (default: .Pa ~/.config/gnunet.conf Ns ). -.It Fl h | \-help +.It Fl h | -help Print the help page. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Change the loglevel. Possible values for LOGLEVEL are NOTHING, ERROR, WARNING, INFO and DEBUG. -.It Fl v | \-version +.It Fl v | -version Print the version number. -.It Fl V | \-verbose +.It Fl V | -verbose Be verbose. .El .Sh NOTES diff --git a/doc/man/gnunet-uri.1 b/doc/man/gnunet-uri.1 index 1d8380631..38b901697 100644 --- a/doc/man/gnunet-uri.1 +++ b/doc/man/gnunet-uri.1 @@ -29,11 +29,11 @@ .Nd invoke default handler for GNUnet URIs .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl l | \-logfile= Ns Ar FILENAME -.Op Fl v | \-version +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl l | -logfile= Ns Ar FILENAME +.Op Fl v | -version URI .Sh DESCRIPTION .Nm @@ -43,17 +43,17 @@ thus the specific tool to handle the URI depends on the subsystem. gnunet-uri will determine the correct tool (by looking for SUBSYSTEM in the configuration section "uri") and invoke it. .Bl -tag -width indent -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl l | \-logfile= Ns Ar FILENAME +.It Fl l | -logfile= Ns Ar FILENAME Configure logging to write logs to .Ar FILENAME . -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. .El .Sh SEE ALSO diff --git a/doc/man/gnunet-vpn.1 b/doc/man/gnunet-vpn.1 index 477358f22..210476b79 100644 --- a/doc/man/gnunet-vpn.1 +++ b/doc/man/gnunet-vpn.1 @@ -29,19 +29,19 @@ .Nd manually setup a GNUnet VPN tunnel .Sh SYNOPSIS .Nm -.Op Fl 4 | \-ipv4 -.Op Fl 6 | \-ipv6 -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl d Ar TIME | Fl \-duration Ar TIME -.Op Fl h | \-help -.Op Fl i Ar IP | Fl \-ip Ar IP -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl p Ar PEERID | Fl \-peer= Ns Ar PEERID -.Op Fl s Ar NAME | Fl \-service= Ns Ar NAME -.Op Fl t | \-tcp -.Op Fl u | \-udp -.Op Fl V | \-verbose -.Op Fl v | \-version +.Op Fl 4 | -ipv4 +.Op Fl 6 | -ipv6 +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl d Ar TIME | Fl -duration Ar TIME +.Op Fl h | -help +.Op Fl i Ar IP | Fl -ip Ar IP +.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL +.Op Fl p Ar PEERID | Fl -peer= Ns Ar PEERID +.Op Fl s Ar NAME | Fl -service= Ns Ar NAME +.Op Fl t | -tcp +.Op Fl u | -udp +.Op Fl V | -verbose +.Op Fl v | -version .Sh DESCRIPTION .Nm can be used to manually setup a VPN tunnel via the GNUnet network. @@ -70,41 +70,41 @@ The address can be displayed as soon as it has been allocated, or only after .Pq Fl a the tunnel has been created. .Bl -tag -width indent -.It Fl 4 | \-ipv4 +.It Fl 4 | -ipv4 Desired IP address on this end of the tunnel should be an IPv4 address. -.It Fl 6 | \-ipv6 +.It Fl 6 | -ipv6 Desired IP address on this end of the tunnel should be an IPv6 address. -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl d Ar TIME | Fl \-duration Ar TIME +.It Fl d Ar TIME | Fl -duration Ar TIME The mapping should be established for TIME. The value given must be a number followed by a space and a time unit, for example "500 ms". Note that the quotes are required on the shell. The default vaue is 5 minutes. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl i Ar IP | Fl \-ip Ar IP +.It Fl i Ar IP | Fl -ip Ar IP Tunnel should be to an exit node and connect to the given IPv4 or IPv6 IP address. Note that you can specify an IPv6 address as the target here, even in -combination with "\-4" (4to6) and similarly you can specify an IPv4 -address in combination with "\-6" (6to4). -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL +combination with "-4" (4to6) and similarly you can specify an IPv4 +address in combination with "-6" (6to4). +.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl p Ar PEERID | Fl \-peer= Ns Ar PEERID +.It Fl p Ar PEERID | Fl -peer= Ns Ar PEERID Name of the peer offering the service to connect to. Cannot be used in conjunction with .Fl i , requires .Fl s . -.It Fl s Ar NAME | Fl \-service= Ns Ar NAME +.It Fl s Ar NAME | Fl -service= Ns Ar NAME Name of the service running on the target peer. Cannot be used in conjunction with .Fl i , requires .Fl p . -.It Fl t | \-tcp +.It Fl t | -tcp Service runs TCP. Either .Fl t @@ -112,7 +112,7 @@ or .Fl u must be specified when using .Fl s . -.It Fl u | \-udp +.It Fl u | -udp Service runs UDP. Either .Fl t @@ -120,9 +120,9 @@ or .Fl u must be specified when using .Fl s . -.It Fl V | \-verbose +.It Fl V | -verbose Be verbose. -.It Fl v | \-version +.It Fl v | -version Print GNUnet version number. .El .Sh SEE ALSO diff --git a/doc/man/gnunet-zoneimport.1 b/doc/man/gnunet-zoneimport.1 index f09544912..f3f60bfb4 100644 --- a/doc/man/gnunet-zoneimport.1 +++ b/doc/man/gnunet-zoneimport.1 @@ -30,11 +30,11 @@ import DNS zone into GNS zone .Sh SYNOPSIS .Nm -.Op Fl c Ar FILENAME | \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl m Ar RELATIVETIME | Fl \-minimum-expiration= Ns Ar RELATIVETIME -.Op Fl s Ar MAPSIZE | Fl \-size= Ns Ar MAPSIZE -.Op Ar \IP +.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME +.Op Fl h | -help +.Op Fl m Ar RELATIVETIME | Fl -minimum-expiration= Ns Ar RELATIVETIME +.Op Fl s Ar MAPSIZE | Fl -size= Ns Ar MAPSIZE +.Ao Ar IP Ac .Sh DESCRIPTION .Nm reads a list of domain names (FQDN) from stdin and issues DNS queries for each of the domain names given. @@ -56,27 +56,27 @@ Thus, it is fine to restart gnunet-zoneimport whenever the list of domain names Finally, gnunet-zoneimport keeps information for each domain name in memory. This consumes about 200 bytes per domain name, or 1 GB for 5 million labels. .Bl -tag -width indent -.It Fl c Ar FILENAME | \-config= Ns Ar FILENAME +.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME Use the configuration file FILENAME. -.It Fl h | \-help +.It Fl h | -help Print short help on options. -.It Fl m Ar RELATIVETIME | Fl \-minimum-expiration= Ns Ar RELATIVETIME +.It Fl m Ar RELATIVETIME | Fl -minimum-expiration= Ns Ar RELATIVETIME Ensure that imported DNS records never have an expiration time that is less than RELATIVETIME into the future. RELATIVETIME is a time given like "1 week" or "1 h". -If DNS returns records with a shorter lifetime, gnunet\-zoneimport will simply bump the lifetime to the specified value (relative to the time of the import). +If DNS returns records with a shorter lifetime, gnunet-zoneimport will simply bump the lifetime to the specified value (relative to the time of the import). Default is zero. -.It Fl s Ar MAPSIZE | Fl \-size= Ns Ar MAPSIZE +.It Fl s Ar MAPSIZE | Fl -size= Ns Ar MAPSIZE Specifies the size (in number of entries) to use for the main hash map. The value provided should be at least twice the number of domain names that will be given to the tool. This option is required for very large zones where the number of records encountered is too large for the automatic growth mechanism to work (that one is limited to at most 16 MB allocations for security reasons). Do not worry about this unless you are importing millions of domain names from a zone. -.It Ar \IP +.It Ao Ar IP Ac IP Is the list of IPs given. .El .Sh EXAMPLES -Typical invocaton would be: +Typical invocation would be: .Pp -.Dl $ gnunet\-zoneimport 1.2.3.4 < names.txt +.Dl $ gnunet-zoneimport 1.2.3.4 < names.txt .Sh SEE ALSO .Xr gnunet-gns 1 , .Xr gnunet-namestore 1 -- cgit v1.2.3 From 2967fde1d510ce2ec2adb339f5b705385bbe9f05 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 16 Oct 2019 18:20:21 +0000 Subject: follow-up to ce63ca3ca49d8a4dc741cd014601584e3d5cfe54 --- doc/man/gnunet-auto-share.1 | 3 +-- doc/man/gnunet-bcd.1 | 3 +-- doc/man/gnunet-cadet.1 | 3 +-- doc/man/gnunet-config.1 | 3 +-- doc/man/gnunet-conversation-test.1 | 3 +-- doc/man/gnunet-conversation.1 | 3 +-- doc/man/gnunet-directory.1 | 3 +-- doc/man/gnunet-download.1 | 3 +-- doc/man/gnunet-ecc.1 | 3 +-- doc/man/gnunet-gns-proxy.1 | 3 +-- doc/man/gnunet-gns.1 | 3 +-- doc/man/gnunet-namecache.1 | 3 +-- doc/man/gnunet-namestore-fcfsd.1 | 3 +-- doc/man/gnunet-namestore.1 | 3 +-- doc/man/gnunet-nat-auto.1 | 3 +-- doc/man/gnunet-nat-server.1 | 3 +-- doc/man/gnunet-nat.1 | 3 +-- doc/man/gnunet-peerinfo.1 | 3 +-- doc/man/gnunet-publish.1 | 3 +-- doc/man/gnunet-reclaim.1 | 3 +-- doc/man/gnunet-resolver.1 | 3 +-- doc/man/gnunet-revocation.1 | 3 +-- doc/man/gnunet-search.1 | 3 +-- doc/man/gnunet-testbed-profiler.1 | 3 +-- doc/man/gnunet-testing-run-service.1 | 3 +-- doc/man/gnunet-testing.1 | 3 +-- doc/man/gnunet-timeout.1 | 3 +-- doc/man/gnunet-transport-certificate-creation.1 | 3 +-- doc/man/gnunet-unindex.1 | 3 +-- doc/man/gnunet-zoneimport.1 | 3 +-- 30 files changed, 30 insertions(+), 60 deletions(-) diff --git a/doc/man/gnunet-auto-share.1 b/doc/man/gnunet-auto-share.1 index 0a50de21c..939a75888 100644 --- a/doc/man/gnunet-auto-share.1 +++ b/doc/man/gnunet-auto-share.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-auto-share -.Nd -a command line tool to automatically share an entire directory with other users +.Nd a command line tool to automatically share an entire directory with other users .Sh SYNOPSIS .Nm .Op Fl a Ar LEVEL | Fl -anonymity= Ns Ar LEVEL diff --git a/doc/man/gnunet-bcd.1 b/doc/man/gnunet-bcd.1 index edc0fea41..b12446cac 100644 --- a/doc/man/gnunet-bcd.1 +++ b/doc/man/gnunet-bcd.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-bcd -.Nd -run HTTP server to create GNS business cards +.Nd run HTTP server to create GNS business cards .Sh SYNOPSIS .Nm .Op Fl p Ar PORT | Fl -port= Ns Ar PORT diff --git a/doc/man/gnunet-cadet.1 b/doc/man/gnunet-cadet.1 index fcc4fb2a5..224ac98b4 100644 --- a/doc/man/gnunet-cadet.1 +++ b/doc/man/gnunet-cadet.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-cadet -.Nd -create or obtain information about CADET tunnels and peers +.Nd create or obtain information about CADET tunnels and peers .Sh SYNOPSIS .Nm .Op Fl C Ar CONNECTION_ID | Fl -connection= Ns Ar CONNECTION_ID diff --git a/doc/man/gnunet-config.1 b/doc/man/gnunet-config.1 index e5babce2d..f6166cbca 100644 --- a/doc/man/gnunet-config.1 +++ b/doc/man/gnunet-config.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-config -.Nd -manipulate GNUnet configuration files +.Nd manipulate GNUnet configuration files .Sh SYNOPSIS .Nm .Op Fl b Ar BACKEND | Fl -supported-backend= Ns Ar BACKEND diff --git a/doc/man/gnunet-conversation-test.1 b/doc/man/gnunet-conversation-test.1 index 395f27244..c2b50ff79 100644 --- a/doc/man/gnunet-conversation-test.1 +++ b/doc/man/gnunet-conversation-test.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-conversation-test -.Nd -check your speaker and microphone settings +.Nd check your speaker and microphone settings .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME diff --git a/doc/man/gnunet-conversation.1 b/doc/man/gnunet-conversation.1 index c319a231b..709cbed72 100644 --- a/doc/man/gnunet-conversation.1 +++ b/doc/man/gnunet-conversation.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-conversation -.Nd -have a conversation with your peers +.Nd have a conversation with your peers .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME diff --git a/doc/man/gnunet-directory.1 b/doc/man/gnunet-directory.1 index 65c8e41ae..8ea92edb2 100644 --- a/doc/man/gnunet-directory.1 +++ b/doc/man/gnunet-directory.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-directory -.Nd -display directories +.Nd display directories .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME diff --git a/doc/man/gnunet-download.1 b/doc/man/gnunet-download.1 index 951c4a979..6244dbf6b 100644 --- a/doc/man/gnunet-download.1 +++ b/doc/man/gnunet-download.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-download -.Nd -a command line interface for downloading files from GNUnet +.Nd a command line interface for downloading files from GNUnet .Sh SYNOPSIS .Nm .Op Fl a Ar LEVEL | Fl -anonymity= Ns Ar LEVEL diff --git a/doc/man/gnunet-ecc.1 b/doc/man/gnunet-ecc.1 index 432a039c4..cb8f8b45c 100644 --- a/doc/man/gnunet-ecc.1 +++ b/doc/man/gnunet-ecc.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-ecc -.Nd -manipulate GNUnet ECC key files +.Nd manipulate GNUnet ECC key files .Sh SYNOPSIS .Nm .Op Fl g Ar COUNT | Fl -generate-keys= Ns Ar COUNT diff --git a/doc/man/gnunet-gns-proxy.1 b/doc/man/gnunet-gns-proxy.1 index 770cb4fe2..16b3b42f1 100644 --- a/doc/man/gnunet-gns-proxy.1 +++ b/doc/man/gnunet-gns-proxy.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-gns-proxy -.Nd -run a client side GNS SOCKS proxy +.Nd run a client-side GNS SOCKS proxy .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME diff --git a/doc/man/gnunet-gns.1 b/doc/man/gnunet-gns.1 index 310198f74..5595981b0 100644 --- a/doc/man/gnunet-gns.1 +++ b/doc/man/gnunet-gns.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-gns -.Nd -access to GNU Name System +.Nd access to GNU Name System .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME diff --git a/doc/man/gnunet-namecache.1 b/doc/man/gnunet-namecache.1 index 7abd9a449..5917fe079 100644 --- a/doc/man/gnunet-namecache.1 +++ b/doc/man/gnunet-namecache.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-namecache -.Nd -inspect namecache +.Nd inspect namecache .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME diff --git a/doc/man/gnunet-namestore-fcfsd.1 b/doc/man/gnunet-namestore-fcfsd.1 index ee79a1784..39bb9fcbc 100644 --- a/doc/man/gnunet-namestore-fcfsd.1 +++ b/doc/man/gnunet-namestore-fcfsd.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-namestore-fcfsd -.Nd -HTTP server for GNU Name System First-Come-First-Served name registration +.Nd HTTP server for GNU Name System First-Come-First-Served name registration .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME diff --git a/doc/man/gnunet-namestore.1 b/doc/man/gnunet-namestore.1 index e0d68fed1..b9bbff027 100644 --- a/doc/man/gnunet-namestore.1 +++ b/doc/man/gnunet-namestore.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-namestore -.Nd -manipulate GNU Name System (GNS) zone data +.Nd manipulate GNU Name System (GNS) zone data .Sh SYNOPSIS .Nm .Op Fl a | -add diff --git a/doc/man/gnunet-nat-auto.1 b/doc/man/gnunet-nat-auto.1 index f6d52abc6..f5ec12d47 100644 --- a/doc/man/gnunet-nat-auto.1 +++ b/doc/man/gnunet-nat-auto.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-nat-auto -.Nd -autoconfigure and test NAT traversal +.Nd autoconfigure and test NAT traversal .Sh SYNOPSIS .Nm .Op Fl a | -auto diff --git a/doc/man/gnunet-nat-server.1 b/doc/man/gnunet-nat-server.1 index 92ea9fd38..bb772139a 100644 --- a/doc/man/gnunet-nat-server.1 +++ b/doc/man/gnunet-nat-server.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-nat-server -.Nd -help GNUnet setup test network setup with NAT +.Nd help GNUnet setup test network setup with NAT .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME diff --git a/doc/man/gnunet-nat.1 b/doc/man/gnunet-nat.1 index f0e36cb29..585b84605 100644 --- a/doc/man/gnunet-nat.1 +++ b/doc/man/gnunet-nat.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-nat -.Nd -interact with the NAT service +.Nd interact with the NAT service .Sh SYNOPSIS .Nm .Op Fl b Ar ADDRESS | Fl -bind= Ns Ar ADDRESS diff --git a/doc/man/gnunet-peerinfo.1 b/doc/man/gnunet-peerinfo.1 index 49d059d4f..94951af86 100644 --- a/doc/man/gnunet-peerinfo.1 +++ b/doc/man/gnunet-peerinfo.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-peerinfo -.Nd -display information about other peers +.Nd display information about other peers .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME diff --git a/doc/man/gnunet-publish.1 b/doc/man/gnunet-publish.1 index a54a1717f..b6985463a 100644 --- a/doc/man/gnunet-publish.1 +++ b/doc/man/gnunet-publish.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-publish -.Nd -a command line interface for publishing new content into GNUnet +.Nd a command line interface for publishing new content into GNUnet .Sh SYNOPSIS .Nm .Op Fl a Ar LEVEL | Fl -anonymity= Ns Ar LEVEL diff --git a/doc/man/gnunet-reclaim.1 b/doc/man/gnunet-reclaim.1 index 5003ef070..049bff155 100644 --- a/doc/man/gnunet-reclaim.1 +++ b/doc/man/gnunet-reclaim.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-reclaim -.Nd -Command-line tools for re:claimID subsystem +.Nd Command-line tools for re:claimID subsystem .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME diff --git a/doc/man/gnunet-resolver.1 b/doc/man/gnunet-resolver.1 index 8952dc14e..71ec25b77 100644 --- a/doc/man/gnunet-resolver.1 +++ b/doc/man/gnunet-resolver.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-resolver -.Nd -built-in GNUnet stub resolver +.Nd built-in GNUnet stub resolver .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME diff --git a/doc/man/gnunet-revocation.1 b/doc/man/gnunet-revocation.1 index 812c2633e..0c447a94f 100644 --- a/doc/man/gnunet-revocation.1 +++ b/doc/man/gnunet-revocation.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-revocation -.Nd -revoke private keys (of egos) in GNUnet +.Nd revoke private keys (of egos) in GNUnet .Sh SYNOPSIS .Nm .Op Fl t Ar KEY | Fl -test= Ns Ar KEY diff --git a/doc/man/gnunet-search.1 b/doc/man/gnunet-search.1 index c670da3d2..a1c88f869 100644 --- a/doc/man/gnunet-search.1 +++ b/doc/man/gnunet-search.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-search -.Nd -a command line interface to search for content on GNUnet +.Nd a command line interface to search for content on GNUnet .Sh SYNOPSIS .Nm .Op Fl a Ar LEVEL | Fl -anonymity= Ns Ar LEVEL diff --git a/doc/man/gnunet-testbed-profiler.1 b/doc/man/gnunet-testbed-profiler.1 index 5d1737e72..b39544641 100644 --- a/doc/man/gnunet-testbed-profiler.1 +++ b/doc/man/gnunet-testbed-profiler.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-testbed-profiler -.Nd -profiling driver for the testbed +.Nd profiling driver for the testbed .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME diff --git a/doc/man/gnunet-testing-run-service.1 b/doc/man/gnunet-testing-run-service.1 index 5aa13fd22..8ec81d846 100644 --- a/doc/man/gnunet-testing-run-service.1 +++ b/doc/man/gnunet-testing-run-service.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-testing-run-service -.Nd -command line tool to start a service for testing +.Nd command line tool to start a service for testing .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME diff --git a/doc/man/gnunet-testing.1 b/doc/man/gnunet-testing.1 index c1dad78e0..7d40152ac 100644 --- a/doc/man/gnunet-testing.1 +++ b/doc/man/gnunet-testing.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-testing -.Nd -command line tool to access the testing library +.Nd command line tool to access the testing library .Sh SYNOPSIS .Nm .Op Fl C | -cfg diff --git a/doc/man/gnunet-timeout.1 b/doc/man/gnunet-timeout.1 index 1ac99cebd..a36141c36 100644 --- a/doc/man/gnunet-timeout.1 +++ b/doc/man/gnunet-timeout.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-timeout -.Nd -run process with timeout +.Nd run process with timeout .Sh SYNOPSIS .Nm .Ao Ar duration Ac diff --git a/doc/man/gnunet-transport-certificate-creation.1 b/doc/man/gnunet-transport-certificate-creation.1 index 7e4086d83..c10e2c8fc 100644 --- a/doc/man/gnunet-transport-certificate-creation.1 +++ b/doc/man/gnunet-transport-certificate-creation.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-transport-certificate-creation -.Nd -create certificate for HTTPS transport +.Nd create certificate for HTTPS transport .Sh SYNOPSIS .Nm .Op privatekey diff --git a/doc/man/gnunet-unindex.1 b/doc/man/gnunet-unindex.1 index 36d59edf0..546db559d 100644 --- a/doc/man/gnunet-unindex.1 +++ b/doc/man/gnunet-unindex.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-unindex -.Nd -a command line interface for deleting indexed files from GNUnet +.Nd a command line interface for deleting indexed files from GNUnet .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME diff --git a/doc/man/gnunet-zoneimport.1 b/doc/man/gnunet-zoneimport.1 index f3f60bfb4..657038428 100644 --- a/doc/man/gnunet-zoneimport.1 +++ b/doc/man/gnunet-zoneimport.1 @@ -26,8 +26,7 @@ .Os .Sh NAME .Nm gnunet-zoneimport -.Nd -import DNS zone into GNS zone +.Nd import DNS zone into GNS zone .Sh SYNOPSIS .Nm .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME -- cgit v1.2.3 From 22ad43e23641318de7f50084aa816a6fda14d7ec Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 16 Oct 2019 20:51:12 +0000 Subject: this comment seems to be not true; tarfile will at least not require tar(1) or any other tool, if at all other modules are required. --- src/fs/test_gnunet_fs_rec.py.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in index 0e1512b26..f827aa3a5 100755 --- a/src/fs/test_gnunet_fs_rec.py.in +++ b/src/fs/test_gnunet_fs_rec.py.in @@ -59,9 +59,6 @@ else: arm = subprocess.Popen([gnunetarm, '-sq', '-c', 'test_gnunet_fs_rec_data.conf']) arm.communicate() -# pray that `tar' is in PATH. -# FIXME: Actually we should check for that and output -# a message if it isn't found. tar = tarfile.open('test_gnunet_fs_rec_data.tgz') tar.extractall() # first, basic publish-search-download run -- cgit v1.2.3 From 9d41ec39756a783c53bb06581ea189c95e08c4d6 Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 17 Oct 2019 13:49:49 +0000 Subject: Add support for doas. --- ChangeLog | 6 +++++- configure.ac | 5 ++++- src/dns/Makefile.am | 10 +++++++++- src/exit/Makefile.am | 10 +++++++++- src/gns/Makefile.am | 10 +++++++++- src/nat/Makefile.am | 22 +++++++++++++++------- src/transport/Makefile.am | 12 ++++++++++-- src/vpn/Makefile.am | 10 +++++++++- 8 files changed, 70 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 315c869e4..3e083f2eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ +Thu Oct 17 00:00:00 UTC 2019 + Added support for doas, use it in some places conditionally + if sudo is not present. -ng0 + Mon Oct 14 00:00:00 UTC 2019 - Add 'pretty' make rule to run uncrustify over the source tree. + Added 'pretty' make rule to run uncrustify over the source tree. -ng0 Mon Sep 16 00:00:00 UTC 2019 diff --git a/configure.ac b/configure.ac index f56d2f508..f1c93b309 100644 --- a/configure.ac +++ b/configure.ac @@ -1357,7 +1357,6 @@ DATAROOTDIR=$datarootdir AC_SUBST(DATAROOTDIR) # test for sudo -# TODO: do we need to change anything for "doas" on openbsd? AC_MSG_CHECKING(for sudo) AC_ARG_WITH(sudo, [ --with-sudo=PATH path to sudo binary (or just yes)], @@ -1371,6 +1370,10 @@ AC_SUBST(SUDO_BINARY) AM_CONDITIONAL([HAVE_SUDO], [test "x$SUDO_BINARY" != "x" -o -w /]) +# test for doas +AC_MSG_CHECKING(for doas) +AC_CHECK_PROGS(DOAS_BINARY, [doas], false) +AM_CONDITIONAL(HAVE_DOAS_BINARY, test x$DOAS_BINARY != xfalse) # test for gnunetdns group name GNUNETDNS_GROUP=gnunetdns diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index 33ec8ef85..acf9660f7 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am @@ -14,10 +14,18 @@ plugindir = $(libdir)/gnunet pkgcfg_DATA = \ dns.conf +if HAVE_SUDO +SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) +else +if HAVE_DOAS_BINARY +SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) +endif +endif + if LINUX HIJACKBIN = gnunet-helper-dns install-exec-hook: - $(top_srcdir)/src/dns/install-dns-helper.sh $(DESTDIR)$(libexecdir) $(GNUNETDNS_GROUP) $(SUDO_BINARY) || true + $(top_srcdir)/src/dns/install-dns-helper.sh $(DESTDIR)$(libexecdir) $(GNUNETDNS_GROUP) $(SUDO_OR_DOAS_BINARY) || true else install-exec-hook: endif diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am index b7286349d..bca0f1d9f 100644 --- a/src/exit/Makefile.am +++ b/src/exit/Makefile.am @@ -14,10 +14,18 @@ plugindir = $(libdir)/gnunet dist_pkgcfg_DATA = \ exit.conf +if HAVE_SUDO +SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) +else +if HAVE_DOAS_BINARY +SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) +endif +endif + if LINUX EXITBIN = gnunet-helper-exit install-exec-hook: - $(top_srcdir)/src/exit/install-exit-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true + $(top_srcdir)/src/exit/install-exit-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true else install-exec-hook: endif diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 6cc09c098..48d13e3c0 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am @@ -158,10 +158,18 @@ gnunet_dns2gns_LDADD = \ $(top_builddir)/src/identity/libgnunetidentity.la \ $(GN_LIBINTL) +if HAVE_SUDO +SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) +else +if HAVE_DOAS_BINARY +SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) +endif +endif + if LINUX HIJACKBIN = gnunet-dns2gns install-exec-hook: - $(SUDO_BINARY) setcap 'cap_net_bind_service=+ep' $(DESTDIR)$(libexecdir)/gnunet-dns2gns || true + $(SUDO_OR_DOAS_BINARY) setcap 'cap_net_bind_service=+ep' $(DESTDIR)$(libexecdir)/gnunet-dns2gns || true else install-exec-hook: endif diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index db104d194..d88dd6db4 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am @@ -8,19 +8,27 @@ pkgcfgdir= $(pkgdatadir)/config.d/ pkgcfg_DATA = \ nat.conf +if HAVE_SUDO +SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) +else +if HAVE_DOAS_BINARY +SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) +endif +endif + if LINUX NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client NATSERVER = gnunet-helper-nat-server.c NATCLIENT = gnunet-helper-nat-client.c install-exec-hook: - $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true + $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true else if XFREEBSD NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client NATSERVER = gnunet-helper-nat-server.c NATCLIENT = gnunet-helper-nat-client.c install-exec-hook: - $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true + $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true endif else install-exec-hook: @@ -61,7 +69,7 @@ libgnunetnatnew_la_SOURCES = \ nat.h libgnunetnatnew_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(GN_LIBINTL) @EXT_LIBS@ + $(GN_LIBINTL) @EXT_LIBS@ libgnunetnatnew_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -version-info 2:0:0 @@ -94,25 +102,25 @@ endif # test_nat.c #test_nat_LDADD = \ # libgnunetnat.la \ -# $(top_builddir)/src/util/libgnunetutil.la +# $(top_builddir)/src/util/libgnunetutil.la #test_nat_mini_SOURCES = \ # test_nat_mini.c #test_nat_mini_LDADD = \ # libgnunetnat.la \ -# $(top_builddir)/src/util/libgnunetutil.la +# $(top_builddir)/src/util/libgnunetutil.la #test_nat_test_SOURCES = \ # test_nat_test.c #test_nat_test_LDADD = \ # libgnunetnat.la \ -# $(top_builddir)/src/util/libgnunetutil.la +# $(top_builddir)/src/util/libgnunetutil.la #test_stun_SOURCES = \ # test_stun.c #test_stun_LDADD = \ # libgnunetnat.la \ -# $(top_builddir)/src/util/libgnunetutil.la +# $(top_builddir)/src/util/libgnunetutil.la EXTRA_DIST = \ test_nat_data.conf \ diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 0f5b2e8be..178ecc737 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -93,11 +93,19 @@ if LINUX test_quota_compliance_wlan_asymmetric endif +if HAVE_SUDO +SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) +else +if HAVE_DOAS_BINARY +SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) +endif +endif + if LINUX install-exec-hook: - $(top_srcdir)/src/transport/install-wlan-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true + $(top_srcdir)/src/transport/install-wlan-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true if HAVE_LIBBLUETOOTH - $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true + $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true endif else install-exec-hook: diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index 3ad9b1a54..4d7ca087e 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am @@ -14,10 +14,18 @@ plugindir = $(libdir)/gnunet pkgcfg_DATA = \ vpn.conf +if HAVE_SUDO +SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) +else +if HAVE_DOAS_BINARY +SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) +endif +endif + if LINUX VPNBIN = gnunet-helper-vpn install-exec-hook: - $(top_srcdir)/src/vpn/install-vpn-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true + $(top_srcdir)/src/vpn/install-vpn-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true else install-exec-hook: endif -- cgit v1.2.3 From c08cc5aeb3b2daa8711c86162575953a271e6b3e Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 17 Oct 2019 14:10:55 +0000 Subject: test_gnunet_dns.sh: check if user 'nobody' exists and return 77 if not. --- src/dns/test_gnunet_dns.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/dns/test_gnunet_dns.sh b/src/dns/test_gnunet_dns.sh index 0fa338c9b..e0fcb711d 100755 --- a/src/dns/test_gnunet_dns.sh +++ b/src/dns/test_gnunet_dns.sh @@ -42,6 +42,12 @@ then exit 77 fi +if test ! `id nobody`; +then + echo "This tests requires a user account 'nobody'. Skipping." + exit 77 +fi + export PATH=".:$PATH" gnunet-service-dns -c dns.conf & gnunet-dns-redirector -c dns.conf -4 127.0.0.1 & -- cgit v1.2.3 From f497ba4fe3c613c04f02378831f43664dbed6601 Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 17 Oct 2019 14:34:23 +0000 Subject: maybe improve sudo detection. --- configure.ac | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index f1c93b309..7e86b6276 100644 --- a/configure.ac +++ b/configure.ac @@ -1358,17 +1358,19 @@ AC_SUBST(DATAROOTDIR) # test for sudo AC_MSG_CHECKING(for sudo) -AC_ARG_WITH(sudo, - [ --with-sudo=PATH path to sudo binary (or just yes)], - [AC_MSG_RESULT("$with_sudo") - AS_CASE([$with_sudo], - [no],[SUDO_BINARY=], - [yes],[SUDO_BINARY=sudo], - [SUDO_BINARY=$with_sudo])], - [AC_MSG_RESULT([no])]) -AC_SUBST(SUDO_BINARY) -AM_CONDITIONAL([HAVE_SUDO], - [test "x$SUDO_BINARY" != "x" -o -w /]) +AC_CHECK_PROGS(SUDO_BINARY, [sudo], false) +AM_CONDITIONAL(HAVE_SUDO, test x$SUDO_BINARY != xfalse) +#AC_ARG_WITH(sudo, +# [ --with-sudo=PATH path to sudo binary (or just yes)], +# [AC_MSG_RESULT("$with_sudo") +# AS_CASE([$with_sudo], +# [no],[SUDO_BINARY=], +# [yes],[SUDO_BINARY=sudo], +# [SUDO_BINARY=$with_sudo])], +# [AC_MSG_RESULT([no])]) +#AC_SUBST(SUDO_BINARY) +#AM_CONDITIONAL([HAVE_SUDO], +# [test "x$SUDO_BINARY" != "x" -o -w /]) # test for doas AC_MSG_CHECKING(for doas) -- cgit v1.2.3 From 969a1fe90087ea5799945afc85169a2dc8711b76 Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 17 Oct 2019 14:42:38 +0000 Subject: update ChangeLog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3e083f2eb..e835da236 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ Thu Oct 17 00:00:00 UTC 2019 Added support for doas, use it in some places conditionally - if sudo is not present. -ng0 + if sudo is not present. Fixed sudo detection. -ng0 Mon Oct 14 00:00:00 UTC 2019 Added 'pretty' make rule to run uncrustify over the source tree. -- cgit v1.2.3 From c4cd5da52ee63b5d920f3cb6f87e5a1a3140b148 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 23 Oct 2019 12:52:18 +0000 Subject: fix failure to install with sudo for now. real change coming tonight. --- configure.ac | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 7e86b6276..13c1cad35 100644 --- a/configure.ac +++ b/configure.ac @@ -1358,19 +1358,19 @@ AC_SUBST(DATAROOTDIR) # test for sudo AC_MSG_CHECKING(for sudo) -AC_CHECK_PROGS(SUDO_BINARY, [sudo], false) -AM_CONDITIONAL(HAVE_SUDO, test x$SUDO_BINARY != xfalse) -#AC_ARG_WITH(sudo, -# [ --with-sudo=PATH path to sudo binary (or just yes)], -# [AC_MSG_RESULT("$with_sudo") -# AS_CASE([$with_sudo], -# [no],[SUDO_BINARY=], -# [yes],[SUDO_BINARY=sudo], -# [SUDO_BINARY=$with_sudo])], -# [AC_MSG_RESULT([no])]) -#AC_SUBST(SUDO_BINARY) -#AM_CONDITIONAL([HAVE_SUDO], -# [test "x$SUDO_BINARY" != "x" -o -w /]) +#AC_CHECK_PROGS(SUDO_BINARY, [sudo], false) +#AM_CONDITIONAL(HAVE_SUDO, test x$SUDO_BINARY != xfalse) +AC_ARG_WITH(sudo, + [ --with-sudo=PATH path to sudo binary (or just yes)], + [AC_MSG_RESULT("$with_sudo") + AS_CASE([$with_sudo], + [no],[SUDO_BINARY=], + [yes],[SUDO_BINARY=sudo], + [SUDO_BINARY=$with_sudo])], + [AC_MSG_RESULT([no])]) +AC_SUBST(SUDO_BINARY) +AM_CONDITIONAL([HAVE_SUDO], + [test "x$SUDO_BINARY" != "x" -o -w /]) # test for doas AC_MSG_CHECKING(for doas) -- cgit v1.2.3 From 9b3e4fc84b4bebbf6d070e1917cbbed19afaa49a Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Wed, 23 Oct 2019 20:55:12 +0200 Subject: start rest per user --- src/rest/rest.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rest/rest.conf b/src/rest/rest.conf index 2b690b5b3..0d6e33ada 100644 --- a/src/rest/rest.conf +++ b/src/rest/rest.conf @@ -9,3 +9,4 @@ REST_ALLOW_HEADERS=Authorization,Accept,Content-Type REST_ECHO_ORIGIN_WEBEXT=YES REST_ALLOW_ORIGIN=http://localhost:4200 REST_ALLOW_CREDENTIALS=true +RUN_PER_USER=YES -- cgit v1.2.3 From fb5a4bff07c34012cc188ff5d8c3d174e9d8c131 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 23 Oct 2019 20:24:46 +0000 Subject: first test commit to make sudo + sh scripts obsolete. install(1) is too unportable to handle this job so we take the content of the scripts. --- src/dns/Makefile.am | 7 ++++++- src/exit/Makefile.am | 3 ++- src/nat/Makefile.am | 12 +++++++++--- src/transport/Makefile.am | 6 ++++-- src/vpn/Makefile.am | 3 ++- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index acf9660f7..8082cbab5 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am @@ -25,7 +25,12 @@ endif if LINUX HIJACKBIN = gnunet-helper-dns install-exec-hook: - $(top_srcdir)/src/dns/install-dns-helper.sh $(DESTDIR)$(libexecdir) $(GNUNETDNS_GROUP) $(SUDO_OR_DOAS_BINARY) || true + chown root $(DESTDIR)$(libexecdir)/gnunt-helper-dns + chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunt-helper-dns + chmod 4750 $(DESTDIR)$(libexecdir)/gnunt-helper-dns + chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunt-helper-dns + chown gnunet:$(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunt-helper-dns + chmod 2750 $(DESTDIR)$(libexecdir)/gnunt-helper-dns else install-exec-hook: endif diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am index bca0f1d9f..c45354256 100644 --- a/src/exit/Makefile.am +++ b/src/exit/Makefile.am @@ -25,7 +25,8 @@ endif if LINUX EXITBIN = gnunet-helper-exit install-exec-hook: - $(top_srcdir)/src/exit/install-exit-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true + chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-exit + chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-exit else install-exec-hook: endif diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index d88dd6db4..2c04741da 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am @@ -21,14 +21,20 @@ if LINUX NATSERVER = gnunet-helper-nat-server.c NATCLIENT = gnunet-helper-nat-client.c install-exec-hook: - $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true + chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server + chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client + chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server + chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client else if XFREEBSD NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client NATSERVER = gnunet-helper-nat-server.c NATCLIENT = gnunet-helper-nat-client.c install-exec-hook: - $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true + chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server + chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client + chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server + chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client endif else install-exec-hook: @@ -61,7 +67,7 @@ if USE_COVERAGE endif lib_LTLIBRARIES = \ - libgnunetnatnew.la + libgnunetnatnew.la libgnunetnatnew_la_SOURCES = \ nat_api.c \ diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 178ecc737..b690fa345 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -103,9 +103,11 @@ endif if LINUX install-exec-hook: - $(top_srcdir)/src/transport/install-wlan-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true + chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-transport-wlan + chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-transport-wlan if HAVE_LIBBLUETOOTH - $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true + chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-transport-bluetooth + chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-transport-bluetooth endif else install-exec-hook: diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index 4d7ca087e..9992fa5ed 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am @@ -25,7 +25,8 @@ endif if LINUX VPNBIN = gnunet-helper-vpn install-exec-hook: - $(top_srcdir)/src/vpn/install-vpn-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true + chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-vpn + chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-vpn else install-exec-hook: endif -- cgit v1.2.3 From 0c13e270c31ef2896d56eb3d53ac7a5714ea1e58 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 23 Oct 2019 20:45:50 +0000 Subject: fix typo --- src/dns/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index 8082cbab5..1aea7f09a 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am @@ -25,12 +25,12 @@ endif if LINUX HIJACKBIN = gnunet-helper-dns install-exec-hook: - chown root $(DESTDIR)$(libexecdir)/gnunt-helper-dns - chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunt-helper-dns - chmod 4750 $(DESTDIR)$(libexecdir)/gnunt-helper-dns - chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunt-helper-dns - chown gnunet:$(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunt-helper-dns - chmod 2750 $(DESTDIR)$(libexecdir)/gnunt-helper-dns + chown root $(DESTDIR)$(libexecdir)/gnunet-helper-dns + chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns + chmod 4750 $(DESTDIR)$(libexecdir)/gnunet-helper-dns + chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns + chown gnunet:$(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns + chmod 2750 $(DESTDIR)$(libexecdir)/gnunet-helper-dns else install-exec-hook: endif -- cgit v1.2.3 From 4993eac25ce2737fc45aec08f21226f523405804 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 23 Oct 2019 21:51:46 +0000 Subject: remove never working setuid helper code from the build-system. refer to the Changelog for a longer reason. In conclusion, this is what people expect, this is what Package Managers patch away for portability, and we can't use install(1) for this because it's not a portable tool. --- ChangeLog | 11 +++++++++++ README | 26 ++++++++++++++++++++++++++ src/dns/Makefile.am | 17 ----------------- src/dns/install-dns-helper.sh | 12 ------------ src/exit/Makefile.am | 13 ------------- src/exit/install-exit-helper.sh | 5 ----- src/nat/Makefile.am | 18 ------------------ src/nat/install-nat-helper.sh | 5 ----- src/transport/Makefile.am | 20 -------------------- src/transport/install-bluetooth-helper.sh | 5 ----- src/transport/install-wlan-helper.sh | 5 ----- src/vpn/Makefile.am | 13 ------------- src/vpn/install-vpn-helper.sh | 5 ----- 13 files changed, 37 insertions(+), 118 deletions(-) delete mode 100755 src/dns/install-dns-helper.sh delete mode 100755 src/exit/install-exit-helper.sh delete mode 100755 src/nat/install-nat-helper.sh delete mode 100755 src/transport/install-bluetooth-helper.sh delete mode 100755 src/transport/install-wlan-helper.sh delete mode 100755 src/vpn/install-vpn-helper.sh diff --git a/ChangeLog b/ChangeLog index e835da236..8c24a7e5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Wed Oct 23 00:00:00 UTC 2019 + Remove setuid helpers. They never worked as intended. The + fixed version is not portable and the defacto good way to + handle this which is most portable is to let package managers + handle this (as they do right now, the good ones), and let + people handle this who read the documentation. + This commit removes what would be patched out by the majority + of package managers, which is setuid handling in Makefiles. + It is very likely that no one will notice this code is gone. + -ng0 + Thu Oct 17 00:00:00 UTC 2019 Added support for doas, use it in some places conditionally if sudo is not present. Fixed sudo detection. -ng0 diff --git a/README b/README index 31ab18727..75dd75694 100644 --- a/README +++ b/README @@ -189,6 +189,32 @@ Recommended autotools for compiling the Git version are: more details. However, this leak is just a minor concern. +Notes on setuid +=============== + +For a correct functionality depending on the host OS, you need +to run the equivalent of these steps after installation: + +chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-vpn +chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-vpn +chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-transport-wlan +chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-transport-wlan +chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-transport-bluetooth +chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-transport-bluetooth +chown root $(DESTDIR)$(libexecdir)/gnunet-helper-dns +chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns +chmod 4750 $(DESTDIR)$(libexecdir)/gnunet-helper-dns +chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns +chown gnunet:$(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns +chmod 2750 $(DESTDIR)$(libexecdir)/gnunet-helper-dns +chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-exit +chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-exit +chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server +chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client +chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server +chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client + + Requirements ============ diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index 1aea7f09a..d2598bd8a 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am @@ -14,25 +14,8 @@ plugindir = $(libdir)/gnunet pkgcfg_DATA = \ dns.conf -if HAVE_SUDO -SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) -else -if HAVE_DOAS_BINARY -SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) -endif -endif - if LINUX HIJACKBIN = gnunet-helper-dns -install-exec-hook: - chown root $(DESTDIR)$(libexecdir)/gnunet-helper-dns - chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns - chmod 4750 $(DESTDIR)$(libexecdir)/gnunet-helper-dns - chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns - chown gnunet:$(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns - chmod 2750 $(DESTDIR)$(libexecdir)/gnunet-helper-dns -else -install-exec-hook: endif lib_LTLIBRARIES = \ diff --git a/src/dns/install-dns-helper.sh b/src/dns/install-dns-helper.sh deleted file mode 100755 index 14d5caa70..000000000 --- a/src/dns/install-dns-helper.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# $1 - bindir -# $2 - gnunetdns group -# $3 - sudo binary (optional) -$3 chown root $1/gnunet-helper-dns -$3 chgrp $2 $1/gnunet-helper-dns -$3 chmod 4750 $1/gnunet-helper-dns -# In case user 'gnunet' does not exist, at least set the group -$3 chgrp $2 $1/gnunet-service-dns -# Usually we want both... -$3 chown gnunet:$2 $1/gnunet-service-dns -$3 chmod 2750 $1/gnunet-service-dns diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am index c45354256..c0323d0d6 100644 --- a/src/exit/Makefile.am +++ b/src/exit/Makefile.am @@ -14,21 +14,8 @@ plugindir = $(libdir)/gnunet dist_pkgcfg_DATA = \ exit.conf -if HAVE_SUDO -SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) -else -if HAVE_DOAS_BINARY -SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) -endif -endif - if LINUX EXITBIN = gnunet-helper-exit -install-exec-hook: - chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-exit - chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-exit -else -install-exec-hook: endif diff --git a/src/exit/install-exit-helper.sh b/src/exit/install-exit-helper.sh deleted file mode 100755 index d9ae14106..000000000 --- a/src/exit/install-exit-helper.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# $1 - bindir -# $2 - sudo binary (optional) -$2 chown root:root $1/gnunet-helper-exit || true -$2 chmod u+s $1/gnunet-helper-exit || true diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index 2c04741da..67f5e4dbc 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am @@ -8,33 +8,15 @@ pkgcfgdir= $(pkgdatadir)/config.d/ pkgcfg_DATA = \ nat.conf -if HAVE_SUDO -SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) -else -if HAVE_DOAS_BINARY -SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) -endif -endif - if LINUX NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client NATSERVER = gnunet-helper-nat-server.c NATCLIENT = gnunet-helper-nat-client.c -install-exec-hook: - chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server - chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client - chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server - chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client else if XFREEBSD NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client NATSERVER = gnunet-helper-nat-server.c NATCLIENT = gnunet-helper-nat-client.c -install-exec-hook: - chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server - chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client - chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server - chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client endif else install-exec-hook: diff --git a/src/nat/install-nat-helper.sh b/src/nat/install-nat-helper.sh deleted file mode 100755 index d5ee91fa3..000000000 --- a/src/nat/install-nat-helper.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# $1 - bindir -# $2 - sudo binary (optional) -$2 chown root:root $1/gnunet-helper-nat-server $1/gnunet-helper-nat-client || true -$2 chmod u+s $1/gnunet-helper-nat-server $1/gnunet-helper-nat-client || true diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index b690fa345..8221b7847 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -93,26 +93,6 @@ if LINUX test_quota_compliance_wlan_asymmetric endif -if HAVE_SUDO -SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) -else -if HAVE_DOAS_BINARY -SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) -endif -endif - -if LINUX -install-exec-hook: - chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-transport-wlan - chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-transport-wlan -if HAVE_LIBBLUETOOTH - chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-transport-bluetooth - chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-transport-bluetooth -endif -else -install-exec-hook: -endif - if LINUX if HAVE_LIBBLUETOOTH BT_BIN = gnunet-helper-transport-bluetooth diff --git a/src/transport/install-bluetooth-helper.sh b/src/transport/install-bluetooth-helper.sh deleted file mode 100755 index 5c40250fa..000000000 --- a/src/transport/install-bluetooth-helper.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# $1 - bindir -# $2 - sudo binary (optional) -$2 chown root:root $1/gnunet-helper-transport-bluetooth || true -$2 chmod u+s $1/gnunet-helper-transport-bluetooth || true diff --git a/src/transport/install-wlan-helper.sh b/src/transport/install-wlan-helper.sh deleted file mode 100755 index 0fa9c9806..000000000 --- a/src/transport/install-wlan-helper.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# $1 - bindir -# $2 - sudo binary (optional) -$2 chown root:root $1/gnunet-helper-transport-wlan || true -$2 chmod u+s $1/gnunet-helper-transport-wlan || true diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index 9992fa5ed..407d8ba92 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am @@ -14,21 +14,8 @@ plugindir = $(libdir)/gnunet pkgcfg_DATA = \ vpn.conf -if HAVE_SUDO -SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) -else -if HAVE_DOAS_BINARY -SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) -endif -endif - if LINUX VPNBIN = gnunet-helper-vpn -install-exec-hook: - chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-vpn - chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-vpn -else -install-exec-hook: endif diff --git a/src/vpn/install-vpn-helper.sh b/src/vpn/install-vpn-helper.sh deleted file mode 100755 index 086dabb67..000000000 --- a/src/vpn/install-vpn-helper.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# $1 - bindir -# $2 - sudo binary (optional) -$2 chown root:root $1/gnunet-helper-vpn || true -$2 chmod u+s $1/gnunet-helper-vpn || true -- cgit v1.2.3 From 6c009f8555997295cd99ef9e7a6909c0c9ca90b2 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 23 Oct 2019 21:58:15 +0000 Subject: rewrite note on setuid. --- README | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README b/README index 75dd75694..3724d6573 100644 --- a/README +++ b/README @@ -323,11 +323,13 @@ in 'contrib/services' or by running: # sudo -u gnunet gnunet-arm -s -Note that running the 'configure' and 'make install' steps as -root (or with sudo) is required as some parts of the installation -require the creation of SUID binaries. The installation will -work if you do not run these steps as root, but some components -may not be installed in the perfect place or with the right +Note that you must read paragraph "Notes on setuid", which documents +steps you have to follow after the installation, as a priviledged +user. We require some binaries to be setuid. The most portable +approach across all supported platforms and targets is to let this be handled +manually. +The installation will work if you do not run these steps as root, but some +components may not be installed in the perfect place or with the right permissions and thus won't work. This will create the users and groups needed for running GNUnet -- cgit v1.2.3 From 2767a0a55b20369e9206f6e8dcd93373324f3b69 Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 24 Oct 2019 09:35:52 +0000 Subject: rewrite parts of the README. --- README | 113 +++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 57 insertions(+), 56 deletions(-) diff --git a/README b/README index 3724d6573..ac4a2618c 100644 --- a/README +++ b/README @@ -10,11 +10,12 @@ ToC o test suite dependencies o optional dependencies o autotools -* Requirements +* Notes on setuid +* Scope of Operating System support * How to install o binary packages - o Scope of Operating System support o Building GNUnet from source + o Notes on compiling from Git * Configuration * Usage * Hacking GNUnet @@ -51,6 +52,10 @@ Online documentation is provided at Dependencies: ============= +The dependencies for building GNUnet will require around 0.74 GiB +diskspace. GNUnet itself will require 8 - 9.2 MiB depending on +configuration. + These are the direct dependencies for running GNUnet: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -166,12 +171,12 @@ Recommended autotools for compiling the Git version are: fix in. [*4] We are commited to portable tools and solutions - where possible. New scripts should be Posix SH + where possible. New scripts should be Posix sh compatible, current and older scripts are in the process of being rewritten to comply with this requirement. -[*5] While libextractor is optional, it is recommended to +[*5] While libextractor ("LE") is optional, it is recommended to build gnunet against it. If you install it later, you won't benefit from libextractor. If you are a distributor, we recommend to split @@ -193,7 +198,10 @@ Notes on setuid =============== For a correct functionality depending on the host OS, you need -to run the equivalent of these steps after installation: +to run the equivalent of these steps after installation. +Replace $(DESTDIR)$(libexecdir) with the appropriate paths, +for example /usr/local/lib/gnunet/libexec/. Note that this +obviously must be run as priviledged user. chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-vpn chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-vpn @@ -215,22 +223,36 @@ chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client -Requirements -============ +Scope of Operating System support +================================= + +We actively support GNUnet on a broad range of Free Software Operating +Systems. + +For proprietary Operating Systems, like for example Microsoft Windows +or Apple OS X, we accept patches if they don't break anything for +other Operating Systems. +If you are implementing support for a proprietary Operating System, +you should be aware that progress in our codebase could break +functionality on your OS and cause unpredicted behavior we can +not test. However, we do not break support on Operating Systems +with malicious intent. +Regressions which do occur on these Operating Systems are 3rd +class issues and we expect users and developers of these +Operating Systems to send proposed patches to fix regressions. + +For more information about our stand on some of the motivating +points here, read the 'Philosophy' Chapter of our handbook. -GNUnet's directed acyclic graph (DAG) will require around 0.74 GiB -Diskspace, with GNUnet itself taking around 8 - 9.2 MiB reported by -the build on GNU Guix. How to install? =============== - binary packages ~~~~~~~~~~~~~~~ -We recommend to use binary packages provided by your Operating System's -package manager. GNUnet is reportedly available for at least: +We recommend to use binary packages provided by the package manager integrated +within your Operating System. GNUnet is reportedly available for at least: ALT Linux, Archlinux, Debian, Deepin, Devuan, GNU Guix, Hyperbola, Kali Linux, LEDE/OpenWRT, Manjaro, Nix, Parabola, Pardus, Parrot, @@ -250,26 +272,6 @@ $ apt-get install gnunet Generic installation instructions are in the INSTALL file in this directory. -Scope of Operating System support -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -We actively support GNUnet on a broad range of Free Software Operating -Systems. - -For proprietary Operating Systems, like for example Microsoft Windows -or Apple OS X, we accept patches if they don't break anything for -other Operating Systems. -If you are implementing support for a proprietary Operating System, -you should be aware that progress in our codebase could break -functionality on your OS and cause unpredicted behavior we can -not test. However, we do not break support on Operating Systems -with malicious intent. -Regressions which do occur on these Operating Systems are 3rd -class issues and we expect users and developers of these -Operating Systems to send proposed patches to fix regressions. - -For more information about our stand on some of the motivating -points here, read the 'Philosophy' Chapter of our handbook. - Building GNUnet from source ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -323,11 +325,10 @@ in 'contrib/services' or by running: # sudo -u gnunet gnunet-arm -s -Note that you must read paragraph "Notes on setuid", which documents -steps you have to follow after the installation, as a priviledged -user. We require some binaries to be setuid. The most portable -approach across all supported platforms and targets is to let this be handled -manually. +Note that you must read paragraph "Notes on setuid", which documents steps you +have to follow after the installation, as a priviledged user. We require some +binaries to be setuid. The most portable approach across all supported +platforms and targets is to let this be handled manually. The installation will work if you do not run these steps as root, but some components may not be installed in the perfect place or with the right permissions and thus won't work. @@ -350,26 +351,26 @@ this case (instead of ~gnunet/.config/gnunet.conf"). In this case, you need to start GNUnet using "gnunet-arm -s -c /etc/gnunet.conf" or set "XDG_CONFIG_HOME=/etc/". -You can avoid running 'make install' as root if you run configure -with the "--with-sudo=yes" option and have extensive sudo rights -(can run "chmod +s" and "chown" via 'sudo'). If you run 'make install' -as a normal user without sudo rights (or the configure option), -certain binaries that require additional privileges will not be -installed properly (and autonomous NAT traversal, WLAN, DNS/GNS and -the VPN will then not work). - -If you run 'configure' and 'make install' as root or use the '--with-sudo' -option, GNUnet's build system will install "libnss_gns*" libraries to -"/lib/" regardless (!) of the $GNUNET_PREFIX you might have specified, -as those libraries must be in "/lib/". If you are packaging GNUnet -for binary distribution, this may cause your packaging script to miss -those plugins, so you might need to do some additional manual work to -include those libraries in your binary package(s). Similarly, if you -want to use the GNUnet naming system and did NOT run GNUnet's 'make -install' process with sudo rights, the libraries will be installed to -"$GNUNET_PREFIX" and you will have to move them to "/lib/" +You can avoid running 'make install' as root if you have extensive sudo rights +(can run "chmod +s" and "chown" via 'sudo'). If you run 'make install' as a +normal user without sudo rights (or the configure option), certain binaries +that require additional privileges will not be installed properly (and +autonomous NAT traversal, WLAN, DNS/GNS and the VPN will then not work). + +If you run 'configure' and 'make install' as root, GNUnet's build system will +install "libnss_gns*" libraries to "/lib/" regardless (!) of the +$GNUNET_PREFIX you might have specified, as those libraries must be in +"/lib/". If you are packaging GNUnet for binary distribution, this may cause +your packaging script to miss those plugins, so you might need to do some +additional manual work to include those libraries in your binary package(s). +Similarly, if you want to use the GNUnet Name System and did NOT run +GNUnet's 'make install' process with priviledged rights, the libraries will be +installed to "$GNUNET_PREFIX" and you will have to move them to "/lib/" manually. +Notes on compiling from Git +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Finally, if you are compiling the code from git, you have to run "sh ./bootstrap" before running "./configure". If you receive an error during the running of "sh ./bootstrap" that looks like "macro `AM_PATH_GTK' -- cgit v1.2.3 From 7bacf9e51edaa9ccb30a4e13b45df9931ea4256d Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 24 Oct 2019 10:20:13 +0000 Subject: Add python3.8 to configure.ac, some minor formating and solve one TODO. --- configure.ac | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 13c1cad35..bf4e13320 100644 --- a/configure.ac +++ b/configure.ac @@ -228,8 +228,10 @@ AM_CONDITIONAL(HAVE_SSH_KEY, ssh -D 12345 -o "BatchMode yes" -o "UserKnownHosts rm -f /tmp/gnunet_test_cosks_ssh_garbage # autotools' m4 for python has no maximum version! -# python3.4 - python3.7 for tests -m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python3 python3.4 python3.5 python3.6 python3.7 python]) +# python3.4 - python3.8 for tests (3.8 unchecked) +# TODO: document how to override the lowest version +# TODO: found by this. +m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python3 python3.4 python3.5 python3.6 python3.7 python3.8 python]) AM_PATH_PYTHON([3.4],, [:]) AC_SUBST([PYTHON]) AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) @@ -359,10 +361,10 @@ AS_IF([test $gcrypt = 0], AC_MSG_ERROR([[ *** *** You need libgcrypt to build this program. -** This library is for example available at -*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/ -*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) -*** is required.) +*** This library is for example available at +*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/. +*** At least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) +*** is required. ***]]) ]) AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [required libgcrypt version]) @@ -411,8 +413,9 @@ AC_MSG_RESULT($texi2mdoc_generation) AS_IF([test "x$texi2mdoc_generation" = "xyes"], [AS_IF([test "$texi2mdoc" = 0], [AC_MSG_WARN([ERROR: transpiled mdoc output requires texi2mdoc.]) - AC_MSG_WARN([ERROR: texi2mdoc can be obtained via your Operating System]) - AC_MSG_WARN([ERROR: package manager or from https://mandoc.bsd.lv/texi2mdoc/])], + AC_MSG_WARN([ERROR: texi2mdoc can be obtained via your]) + AC_MSG_WARN([ERROR: Operating System package manager or from]) + AC_MSG_WARN([ERROR: https://mandoc.bsd.lv/texi2mdoc/])], [AM_CONDITIONAL([TEXI2MDOC_GENERATION],true) AC_DEFINE([TEXI2MDOC_GENERATION], [1], @@ -426,7 +429,8 @@ AS_IF([test "x$texi2mdoc_generation" = "xyes"], # should the build process be building only the documentation? AC_MSG_CHECKING(whether to build only documentation) AC_ARG_ENABLE([documentation-only], - [AS_HELP_STRING([--enable-documentation-only], [build only the documentation])], + [AS_HELP_STRING([--enable-documentation-only], + [build only the documentation])], [documentation_only=${enableval}], [documentation_only=no]) AC_MSG_RESULT($documentation_only) @@ -436,15 +440,14 @@ AS_IF([test "x$documentation_only" = "xyes"], AC_DEFINE([DOCUMENTATION_ONLY],[1],[Building only the documentation]) ],[ AM_CONDITIONAL([DOCUMENTATION_ONLY],false) - # TODO: Double negation might be a bit hard to parse for some - # TODO: people reading the output. - AC_DEFINE([DOCUMENTATION_ONLY],[0],[Not building only the documentation]) + AC_DEFINE([DOCUMENTATION_ONLY],[0],[Doing a normal build, more than only documentation]) ]) # should the build process be including the manpages? (default: yes) AC_MSG_CHECKING(whether to include man pages) AC_ARG_ENABLE([include-manpages], - [AS_HELP_STRING([--disable-include-manpages], [Do not include the man pages in build and installation])], + [AS_HELP_STRING([--disable-include-manpages], + [Do not include the man pages in build and installation])], [include_manpages=${enableval}], [include_manpages=yes]) AC_MSG_RESULT($include_manpages) -- cgit v1.2.3 From df3eda06c84b86939956d64fca7aedc5deeb5ecb Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 24 Oct 2019 10:22:49 +0000 Subject: move contrib/alpine to contrib/packages/alpine --- contrib/alpine/gnunet-gtk/APKBUILD | 38 --------- contrib/alpine/gnunet/APKBUILD | 98 ---------------------- contrib/alpine/gnunet/gnunet-system-services.initd | 16 ---- contrib/alpine/gnunet/gnunet-system.conf | 3 - contrib/alpine/gnunet/gnunet-user-services.initd | 33 -------- contrib/alpine/gnunet/gnunet-user.conf | 3 - contrib/alpine/gnunet/gnunet.post-deinstall | 6 -- contrib/alpine/gnunet/gnunet.post-install | 40 --------- contrib/alpine/gnunet/gnunet.pre-deinstall | 28 ------- contrib/alpine/gnunet/gnunet.pre-install | 17 ---- contrib/alpine/gnunet/gnunet.xsession | 54 ------------ contrib/alpine/gnurl/APKBUILD | 77 ----------------- contrib/packages/alpine/gnunet-gtk/APKBUILD | 38 +++++++++ contrib/packages/alpine/gnunet/APKBUILD | 98 ++++++++++++++++++++++ .../alpine/gnunet/gnunet-system-services.initd | 16 ++++ contrib/packages/alpine/gnunet/gnunet-system.conf | 3 + .../alpine/gnunet/gnunet-user-services.initd | 33 ++++++++ contrib/packages/alpine/gnunet/gnunet-user.conf | 3 + .../packages/alpine/gnunet/gnunet.post-deinstall | 6 ++ contrib/packages/alpine/gnunet/gnunet.post-install | 40 +++++++++ .../packages/alpine/gnunet/gnunet.pre-deinstall | 28 +++++++ contrib/packages/alpine/gnunet/gnunet.pre-install | 17 ++++ contrib/packages/alpine/gnunet/gnunet.xsession | 54 ++++++++++++ contrib/packages/alpine/gnurl/APKBUILD | 77 +++++++++++++++++ 24 files changed, 413 insertions(+), 413 deletions(-) delete mode 100644 contrib/alpine/gnunet-gtk/APKBUILD delete mode 100644 contrib/alpine/gnunet/APKBUILD delete mode 100644 contrib/alpine/gnunet/gnunet-system-services.initd delete mode 100644 contrib/alpine/gnunet/gnunet-system.conf delete mode 100644 contrib/alpine/gnunet/gnunet-user-services.initd delete mode 100644 contrib/alpine/gnunet/gnunet-user.conf delete mode 100644 contrib/alpine/gnunet/gnunet.post-deinstall delete mode 100644 contrib/alpine/gnunet/gnunet.post-install delete mode 100644 contrib/alpine/gnunet/gnunet.pre-deinstall delete mode 100644 contrib/alpine/gnunet/gnunet.pre-install delete mode 100644 contrib/alpine/gnunet/gnunet.xsession delete mode 100644 contrib/alpine/gnurl/APKBUILD create mode 100644 contrib/packages/alpine/gnunet-gtk/APKBUILD create mode 100644 contrib/packages/alpine/gnunet/APKBUILD create mode 100644 contrib/packages/alpine/gnunet/gnunet-system-services.initd create mode 100644 contrib/packages/alpine/gnunet/gnunet-system.conf create mode 100644 contrib/packages/alpine/gnunet/gnunet-user-services.initd create mode 100644 contrib/packages/alpine/gnunet/gnunet-user.conf create mode 100644 contrib/packages/alpine/gnunet/gnunet.post-deinstall create mode 100644 contrib/packages/alpine/gnunet/gnunet.post-install create mode 100644 contrib/packages/alpine/gnunet/gnunet.pre-deinstall create mode 100644 contrib/packages/alpine/gnunet/gnunet.pre-install create mode 100644 contrib/packages/alpine/gnunet/gnunet.xsession create mode 100644 contrib/packages/alpine/gnurl/APKBUILD diff --git a/contrib/alpine/gnunet-gtk/APKBUILD b/contrib/alpine/gnunet-gtk/APKBUILD deleted file mode 100644 index 75ccadbf0..000000000 --- a/contrib/alpine/gnunet-gtk/APKBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Contributor: xrs -# Maintainer: xrs -pkgname=gnunet-gtk -pkgver=0.11.5 -pkgrel=0 -pkgdesc="Graphical user interface for GNUnet" -url="https://gnunet.org" -arch="all" -license="GPL-3.0" -depends="gnunet gtk+3.0 glade" -makedepends="gnunet-dev gtk+3.0-dev glade-dev" -subpackages="$pkgname-dev $pkgname-doc" -source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/gnunet-gtk-$pkgver.tar.gz" -options="!check" # The GNUnet project lacks a good CI at the moment. - -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --disable-fs-app \ - --disable-conversation-app - make -} - -check() { - make DESTDIR="$pkgdir" check - exit 0 -} - -package() { - make DESTDIR="$pkgdir" install -} - -sha512sums="8cd5bcadba070396b9b9b4849678bda362ba274f7d8e0c4dfc0bd793ac103a8a94949a472d992c90f21ddb7db16b14ea23a199acd4cf2e52f985e15205d2f5a9 gnunet-gtk-0.11.5.tar.gz" diff --git a/contrib/alpine/gnunet/APKBUILD b/contrib/alpine/gnunet/APKBUILD deleted file mode 100644 index da2b2dec4..000000000 --- a/contrib/alpine/gnunet/APKBUILD +++ /dev/null @@ -1,98 +0,0 @@ -# Contributor: xrs -# Maintainer: xrs -pkgname=gnunet -pkgver=0.11.6 -pkgrel=0 -pkgdesc="A framework for secure and privacy enhancing peer-to-peer networking" -url="https://gnunet.org" -arch="all" -license="AGPL-3.0" -depends="libgpg-error libgcrypt nettle unbound-libs gnutls gnutls-utils gnurl - libgnurl libmicrohttpd openssl libunistring libidn2 nss sqlite zlib - miniupnpc gmp gettext bash which iptables coreutils sudo" -depends_dev="libgpg-error-dev libgcrypt-dev nettle-dev unbound-dev gnutls-dev - gnurl-dev libmicrohttpd-dev openssl-dev libunistring-dev libidn2-dev - nss-dev sqlite-dev zlib-dev miniupnpc-dev gmp-dev gettext" -makedepends="$depends_dev autoconf automake libtool gettext-dev python3 - texlive texinfo" -install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-deinstall" -pkgusers="gnunet" -pkggroups="gnunet gnunetdns" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -options="!check suid" # No check because The GNUnet project lacks a good CI at the moment. -source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/gnunet-$pkgver.tar.gz - gnunet-system.conf - gnunet-user.conf - gnunet-system-services.initd - gnunet-user-services.initd - gnunet.xsession - " - -prepare() { - default_prepare - autoreconf -if # FIXME: See https://bugs.gnunet.org/view.php?id=5902 -} - -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --enable-logging=verbose - make -} - -check() { - make DESTDIR="$pkgdir" check - exit 0 -} - -package() { - make DESTDIR="$pkgdir" install - - libexecdir=$pkgdir/usr/lib/gnunet/libexec/ - # Limit access to critical gnunet-helper-dns to group "gnunetdns" - chgrp gnunetdns $libexecdir/gnunet-helper-dns - chgrp gnunetdns $libexecdir/gnunet-service-dns - # Limit access to certain SUID binaries by group "gnunet" - chgrp gnunet $libexecdir/gnunet-helper-exit - chgrp gnunet $libexecdir/gnunet-helper-vpn - chgrp gnunet $libexecdir/gnunet-helper-nat-client - chgrp gnunet $libexecdir/gnunet-helper-nat-server - chmod u+s $libexecdir/gnunet-helper-exit - chmod u+s $libexecdir/gnunet-helper-vpn - chmod 2750 $libexecdir/gnunet-helper-dns - chmod 2700 $libexecdir/gnunet-service-dns - chmod u+s $libexecdir/gnunet-helper-nat-client - chmod u+s $libexecdir/gnunet-helper-nat-server - - install -m644 -D $srcdir/$pkgname-user.conf \ - $pkgdir/etc/skel/.config/$pkgname.conf - install -m644 -D $srcdir/$pkgname-system.conf \ - $pkgdir/etc/$pkgname.conf - install -m755 -D $srcdir/$pkgname-system-services.initd \ - $pkgdir/etc/init.d/$pkgname-system-services - install -m755 -D $srcdir/$pkgname-user-services.initd \ - $pkgdir/etc/init.d/$pkgname-user-services - install -m755 -D $srcdir/$pkgname.xsession \ - $pkgdir/etc/X11/xinit/xinitrc.d/80-$pkgname-user-services -} - -dev() { - default_dev - - # dev() will move gnunet-config from $pkg to $pkg-dev, but it's an - # intended part of $pkg. - install -m755 -D $builddir/src/util/.libs/gnunet-config \ - $pkgdir/usr/bin/gnunet-config -} - -sha512sums="1c6ea2ac7280d2edb30df627b79e017d199e93cd3970ce49f3f049abfb1dddfed541118e55766c422edf4a80e140c4eb2cfc681e0d4a1384e39811d024df9278 gnunet-0.11.6.tar.gz -a0f55413ed2c6edd6746a751d92ddac95ba70f20eefb07330817870d749456448f44bba95d245911a00f6078e0c2ac626004e3b764be5e5e049c00626c4c5ac0 gnunet-system.conf -b21112ff16aee771332aa9c33f55b0c7f46fe0266053543241e3efbe25dba56482c0e11112a192eefe59f1c74d2af5d7071b6a4e1e875cfc7e9d55b5fe8a0a33 gnunet-user.conf -96ab78bb48d5fb10f0b34336ad05e73b543c4362c73436ef20b3bb83dff214e997acf38a2ea493b1901bdc37c8877d83cdaebd73a0e50831e2f23413c8edda76 gnunet-system-services.initd -f67252e18c5fd701338653efe4cc14caae9213c1955f690cddec9fd7ad31a22680e931fbe908a1c5a78dc05094e547b2279f9a488f2ed80cc169590ad5ffa064 gnunet-user-services.initd -839a081aca19b863f378db980e6447ad30c6c0ee72fac6e11c65e57e86886d675ebc61069e17f696b6ca868e8ce259cabf80feb90b04b23f3da3c628f7beb915 gnunet.xsession" diff --git a/contrib/alpine/gnunet/gnunet-system-services.initd b/contrib/alpine/gnunet/gnunet-system-services.initd deleted file mode 100644 index 19248d23e..000000000 --- a/contrib/alpine/gnunet/gnunet-system-services.initd +++ /dev/null @@ -1,16 +0,0 @@ -#!/sbin/openrc-run -# Contributor: xrs -# Maintainer: xrs - -name="gnunet-system-service" -description="A secure and privacy enhancing peer-to-peer overlay network" -command="/usr/lib/gnunet/libexec/gnunet-service-arm" -command_args="-c /etc/gnunet.conf" -command_user="gnunet:gnunet" -command_background="yes" -pidfile="/run/${SVCNAME}.pid" - -depend() { - need net - before gnunet-user-services -} diff --git a/contrib/alpine/gnunet/gnunet-system.conf b/contrib/alpine/gnunet/gnunet-system.conf deleted file mode 100644 index 303cf5f16..000000000 --- a/contrib/alpine/gnunet/gnunet-system.conf +++ /dev/null @@ -1,3 +0,0 @@ -[arm] -START_SYSTEM_SERVICES = YES -START_USER_SERVICES = NO diff --git a/contrib/alpine/gnunet/gnunet-user-services.initd b/contrib/alpine/gnunet/gnunet-user-services.initd deleted file mode 100644 index 6c960944e..000000000 --- a/contrib/alpine/gnunet/gnunet-user-services.initd +++ /dev/null @@ -1,33 +0,0 @@ -#!/sbin/openrc-run -# Contributor: xrs -# Maintainer: xrs - -name="gnunet-user-services" -description="GNUnet user services" -command_background="yes" -pidfile="/run/${SVCNAME}.pid" -users=`awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd` - -depend() { - need gnunet-system-services -} - -start() { - for user in $users; do - if test -z "`ps|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 - then - sudo -u $user gnunet-arm \ - -c /home/$user/.config/gnunet.conf -s - fi - done -} - -stop() { - for user in $users; do - if test -n "`ps|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 - then - sudo -u $user gnunet-arm \ - -c /home/$user/.config/gnunet.conf -e - fi - done -} diff --git a/contrib/alpine/gnunet/gnunet-user.conf b/contrib/alpine/gnunet/gnunet-user.conf deleted file mode 100644 index 22f1fe37a..000000000 --- a/contrib/alpine/gnunet/gnunet-user.conf +++ /dev/null @@ -1,3 +0,0 @@ -[arm] -START_SYSTEM_SERVICES = NO -START_USER_SERVICES = YES diff --git a/contrib/alpine/gnunet/gnunet.post-deinstall b/contrib/alpine/gnunet/gnunet.post-deinstall deleted file mode 100644 index ab98ab535..000000000 --- a/contrib/alpine/gnunet/gnunet.post-deinstall +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -deluser --remove-home gnunet # implicitly removes group gnunet -delgroup gnunetdns - -exit 0 diff --git a/contrib/alpine/gnunet/gnunet.post-install b/contrib/alpine/gnunet/gnunet.post-install deleted file mode 100644 index f7c19b26f..000000000 --- a/contrib/alpine/gnunet/gnunet.post-install +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -# Enumerate users. -users=`awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd` - -# Install gnunet.conf for existing users. -for user in $users; do - install -m644 -o $user -g $user -D /etc/skel/.config/gnunet.conf \ - /home/$user/.config/gnunet.conf -done - -# Enable GNS proxy for users, if desired. -echo "Use GNU Name System in Firefox/Chromium by default? [y,N]" -read -r yn -case $yn in -y|Y ) - # Enable GNS proxy for existant users. - for user in $users; do - port=$((8000+$(id -u $user))) - gnunet-config -c /home/$user/.config/gnunet.conf \ - --rewrite \ - --section=gns-proxy \ - --option=IMMEDIATE_START \ - --value=YES - gnunet-config -c /home/$user/.config/gnunet.conf \ - --rewrite \ - --section=gns-proxy \ - --option=OPTIONS \ - --value="-p $port" - done - - # Enable GNS proxy for future users. - echo "[gns-proxy]" >> /etc/skel/.config/gnunet.conf - echo "IMMEDIATE_START = YES" >> /etc/skel/.config/gnunet.conf - ;; -* ) - ;; -esac - -exit 0 diff --git a/contrib/alpine/gnunet/gnunet.pre-deinstall b/contrib/alpine/gnunet/gnunet.pre-deinstall deleted file mode 100644 index 3334c6d67..000000000 --- a/contrib/alpine/gnunet/gnunet.pre-deinstall +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -# Remove proxy settings from browser. -users=`awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd` -for user in $users; do - gnunet_proxy=`grep -i "gns-proxy" /home/$user/.config/gnunet.conf` - if [ "$gnunet_proxy" ]; then - for ffprofile in /home/"$user"/.mozilla/firefox/*.*/; do - # Reset proxy preferences - js=$ffprofile/user.js - if [ -f $js ]; then - sed -i '/Preferences for using the GNU Name System/d' $js - sed -i '/network.proxy.socks/d' $js - sed -i '/network.proxy.socks_port/d' $js - sed -i '/network.proxy.socks_remote_dns/d' $js - sed -i '/network.proxy.type/d' $js - fi - done - - # Chromium - profile=/home/$user/.profile - if [ -f $profile ]; then - sed -i '/CHROMIUM_USER_FLAGS/d' $profile - fi - fi -done - -exit 0 diff --git a/contrib/alpine/gnunet/gnunet.pre-install b/contrib/alpine/gnunet/gnunet.pre-install deleted file mode 100644 index bbb629cb1..000000000 --- a/contrib/alpine/gnunet/gnunet.pre-install +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# Add special group gnunetdns for controlling access to "gnunet-helper-dns". -addgroup -S gnunetdns 2>/dev/null -addgroup -S gnunet 2>/dev/null - -# Add system user/group gnunet for system services -adduser -S -h "/var/lib/gnunet" -s /bin/sh \ - -G gnunet -g gnunet gnunet 2>/dev/null - -# add users on host system to group "gnunet" -users=`awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd` -for user in $users; do - adduser $user gnunet 2>/dev/null -done - -exit 0 diff --git a/contrib/alpine/gnunet/gnunet.xsession b/contrib/alpine/gnunet/gnunet.xsession deleted file mode 100644 index f19d6baf7..000000000 --- a/contrib/alpine/gnunet/gnunet.xsession +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -user=$(whoami) -gnunet_proxy=$(gnunet-config -c /etc/skel/.config/gnunet.conf -s gns-proxy|grep 'IMMEDIATE_START = YES') - -# Enable GNS proxy for new users informed by /etc/skel. -if [ "$gnunet_proxy" ]; then - - # Calculate user specific port - port=$((8000+$(id -u $user))) - - gnunet-config -c /home/$user/.config/gnunet.conf \ - --rewrite \ - --section=gns-proxy \ - --option=OPTIONS \ - --value="-p $port" - - # Firefox - if [ ! -d ~/.mozilla/firefox/*.default ];then - timeout 3s firefox --headless # dirty: create profile if not existent - fi - for ffprofile in ~/.mozilla/firefox/*.*/; do - js=$ffprofile/user.js - if [ -f $js ]; then - sed -i '/Preferences for using the GNU Name System/d' $js - sed -i '/network.proxy.socks/d' $js - sed -i '/network.proxy.socks_port/d' $js - sed -i '/network.proxy.socks_remote_dns/d' $js - sed -i '/network.proxy.type/d' $js - fi - echo "// Preferences for using the GNU Name System" >> $js - echo "user_pref(\"network.proxy.socks\", \"localhost\");" >> $js - echo "user_pref(\"network.proxy.socks_port\", $port);" >> $js - echo "user_pref(\"network.proxy.socks_remote_dns\", true);" >> $js - echo "user_pref(\"network.proxy.type\", 1);" >> $js - done - - # Chromium - profile=/home/$user/.profile - if [ -f $profile ]; then - sed -i '/CHROMIUM_USER_FLAGS/d' $profile - fi - echo "export CHROMIUM_USER_FLAGS=--proxy-server=socks5://localhost:$port" \ - >> $profile -fi - -# Create/Renew GNS certificate authority (CA) per user. -gnunet-gns-proxy-setup-ca - -# In case a new user was added and gnunet-user-services has not been -# restarted afterwards, start user services after login. -if test -z "`ps|grep -v grep|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 -then - gnunet-arm -c /home/$user/.config/gnunet.conf -s -fi diff --git a/contrib/alpine/gnurl/APKBUILD b/contrib/alpine/gnurl/APKBUILD deleted file mode 100644 index f14a9bd97..000000000 --- a/contrib/alpine/gnurl/APKBUILD +++ /dev/null @@ -1,77 +0,0 @@ -# Contributor: xrs -# Maintainer: xrs -pkgname=gnurl -pkgver=7.65.3 -pkgrel=0 -pkgdesc="curl with only HTTP/HTTPS support and GnuTLS" -url="https://gnunet.org/en/gnurl.html" -arch="all" -license="MIT" -depends="ca-certificates gnutls libidn2 zlib" -depends_dev="gnutls-dev libidn2-dev zlib-dev" -makedepends="$depends_dev autoconf automake libtool perl pkgconf python3" -subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libgnurl" -source="https://ftp.gnu.org/gnu/gnunet/gnurl-$pkgver.tar.gz" - -prepare() { - default_prepare - autoreconf -vfi -} - -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ - --prefix=/usr \ - --disable-static \ - --enable-ipv6 \ - --with-gnutls \ - --with-libidn2 \ - --without-libpsl \ - --without-libssh2 \ - --without-libmetalink \ - --without-winidn \ - --without-librtmp \ - --without-nghttp2 \ - --without-nss \ - --without-cyassl \ - --without-polarssl \ - --without-ssl \ - --without-winssl \ - --without-darwinssl \ - --disable-sspi \ - --disable-ntlm-wb \ - --disable-ldap \ - --disable-rtsp \ - --disable-dict \ - --disable-telnet \ - --disable-tftp \ - --disable-pop3 \ - --disable-imap \ - --disable-smtp \ - --disable-gopher \ - --disable-file \ - --disable-ftp \ - --disable-smb \ - --disable-ares - make -} - -check() { - make -C tests nonflaky-test -} - -package() { - make DESTDIR="$pkgdir" install -} - -libgnurl() { - pkgdesc="curl library with only HTTP/HTTPS support and GnuTLS" - - mkdir -p "$subpkgdir"/usr - mv "$pkgdir"/usr/lib "$subpkgdir"/usr -} - - -sha512sums="51aa71352dfe2e65dbcf542cb616af1eaa7e80fbc4ddb455a338e74eea245724ac1fa7ff226c418101e8ba298a8f85c2be9e7d9190a57c66e2e8c65d0c5186f8 gnurl-7.65.3.tar.gz" diff --git a/contrib/packages/alpine/gnunet-gtk/APKBUILD b/contrib/packages/alpine/gnunet-gtk/APKBUILD new file mode 100644 index 000000000..75ccadbf0 --- /dev/null +++ b/contrib/packages/alpine/gnunet-gtk/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: xrs +# Maintainer: xrs +pkgname=gnunet-gtk +pkgver=0.11.5 +pkgrel=0 +pkgdesc="Graphical user interface for GNUnet" +url="https://gnunet.org" +arch="all" +license="GPL-3.0" +depends="gnunet gtk+3.0 glade" +makedepends="gnunet-dev gtk+3.0-dev glade-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/gnunet-gtk-$pkgver.tar.gz" +options="!check" # The GNUnet project lacks a good CI at the moment. + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-fs-app \ + --disable-conversation-app + make +} + +check() { + make DESTDIR="$pkgdir" check + exit 0 +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="8cd5bcadba070396b9b9b4849678bda362ba274f7d8e0c4dfc0bd793ac103a8a94949a472d992c90f21ddb7db16b14ea23a199acd4cf2e52f985e15205d2f5a9 gnunet-gtk-0.11.5.tar.gz" diff --git a/contrib/packages/alpine/gnunet/APKBUILD b/contrib/packages/alpine/gnunet/APKBUILD new file mode 100644 index 000000000..da2b2dec4 --- /dev/null +++ b/contrib/packages/alpine/gnunet/APKBUILD @@ -0,0 +1,98 @@ +# Contributor: xrs +# Maintainer: xrs +pkgname=gnunet +pkgver=0.11.6 +pkgrel=0 +pkgdesc="A framework for secure and privacy enhancing peer-to-peer networking" +url="https://gnunet.org" +arch="all" +license="AGPL-3.0" +depends="libgpg-error libgcrypt nettle unbound-libs gnutls gnutls-utils gnurl + libgnurl libmicrohttpd openssl libunistring libidn2 nss sqlite zlib + miniupnpc gmp gettext bash which iptables coreutils sudo" +depends_dev="libgpg-error-dev libgcrypt-dev nettle-dev unbound-dev gnutls-dev + gnurl-dev libmicrohttpd-dev openssl-dev libunistring-dev libidn2-dev + nss-dev sqlite-dev zlib-dev miniupnpc-dev gmp-dev gettext" +makedepends="$depends_dev autoconf automake libtool gettext-dev python3 + texlive texinfo" +install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-deinstall" +pkgusers="gnunet" +pkggroups="gnunet gnunetdns" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +options="!check suid" # No check because The GNUnet project lacks a good CI at the moment. +source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/gnunet-$pkgver.tar.gz + gnunet-system.conf + gnunet-user.conf + gnunet-system-services.initd + gnunet-user-services.initd + gnunet.xsession + " + +prepare() { + default_prepare + autoreconf -if # FIXME: See https://bugs.gnunet.org/view.php?id=5902 +} + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-logging=verbose + make +} + +check() { + make DESTDIR="$pkgdir" check + exit 0 +} + +package() { + make DESTDIR="$pkgdir" install + + libexecdir=$pkgdir/usr/lib/gnunet/libexec/ + # Limit access to critical gnunet-helper-dns to group "gnunetdns" + chgrp gnunetdns $libexecdir/gnunet-helper-dns + chgrp gnunetdns $libexecdir/gnunet-service-dns + # Limit access to certain SUID binaries by group "gnunet" + chgrp gnunet $libexecdir/gnunet-helper-exit + chgrp gnunet $libexecdir/gnunet-helper-vpn + chgrp gnunet $libexecdir/gnunet-helper-nat-client + chgrp gnunet $libexecdir/gnunet-helper-nat-server + chmod u+s $libexecdir/gnunet-helper-exit + chmod u+s $libexecdir/gnunet-helper-vpn + chmod 2750 $libexecdir/gnunet-helper-dns + chmod 2700 $libexecdir/gnunet-service-dns + chmod u+s $libexecdir/gnunet-helper-nat-client + chmod u+s $libexecdir/gnunet-helper-nat-server + + install -m644 -D $srcdir/$pkgname-user.conf \ + $pkgdir/etc/skel/.config/$pkgname.conf + install -m644 -D $srcdir/$pkgname-system.conf \ + $pkgdir/etc/$pkgname.conf + install -m755 -D $srcdir/$pkgname-system-services.initd \ + $pkgdir/etc/init.d/$pkgname-system-services + install -m755 -D $srcdir/$pkgname-user-services.initd \ + $pkgdir/etc/init.d/$pkgname-user-services + install -m755 -D $srcdir/$pkgname.xsession \ + $pkgdir/etc/X11/xinit/xinitrc.d/80-$pkgname-user-services +} + +dev() { + default_dev + + # dev() will move gnunet-config from $pkg to $pkg-dev, but it's an + # intended part of $pkg. + install -m755 -D $builddir/src/util/.libs/gnunet-config \ + $pkgdir/usr/bin/gnunet-config +} + +sha512sums="1c6ea2ac7280d2edb30df627b79e017d199e93cd3970ce49f3f049abfb1dddfed541118e55766c422edf4a80e140c4eb2cfc681e0d4a1384e39811d024df9278 gnunet-0.11.6.tar.gz +a0f55413ed2c6edd6746a751d92ddac95ba70f20eefb07330817870d749456448f44bba95d245911a00f6078e0c2ac626004e3b764be5e5e049c00626c4c5ac0 gnunet-system.conf +b21112ff16aee771332aa9c33f55b0c7f46fe0266053543241e3efbe25dba56482c0e11112a192eefe59f1c74d2af5d7071b6a4e1e875cfc7e9d55b5fe8a0a33 gnunet-user.conf +96ab78bb48d5fb10f0b34336ad05e73b543c4362c73436ef20b3bb83dff214e997acf38a2ea493b1901bdc37c8877d83cdaebd73a0e50831e2f23413c8edda76 gnunet-system-services.initd +f67252e18c5fd701338653efe4cc14caae9213c1955f690cddec9fd7ad31a22680e931fbe908a1c5a78dc05094e547b2279f9a488f2ed80cc169590ad5ffa064 gnunet-user-services.initd +839a081aca19b863f378db980e6447ad30c6c0ee72fac6e11c65e57e86886d675ebc61069e17f696b6ca868e8ce259cabf80feb90b04b23f3da3c628f7beb915 gnunet.xsession" diff --git a/contrib/packages/alpine/gnunet/gnunet-system-services.initd b/contrib/packages/alpine/gnunet/gnunet-system-services.initd new file mode 100644 index 000000000..19248d23e --- /dev/null +++ b/contrib/packages/alpine/gnunet/gnunet-system-services.initd @@ -0,0 +1,16 @@ +#!/sbin/openrc-run +# Contributor: xrs +# Maintainer: xrs + +name="gnunet-system-service" +description="A secure and privacy enhancing peer-to-peer overlay network" +command="/usr/lib/gnunet/libexec/gnunet-service-arm" +command_args="-c /etc/gnunet.conf" +command_user="gnunet:gnunet" +command_background="yes" +pidfile="/run/${SVCNAME}.pid" + +depend() { + need net + before gnunet-user-services +} diff --git a/contrib/packages/alpine/gnunet/gnunet-system.conf b/contrib/packages/alpine/gnunet/gnunet-system.conf new file mode 100644 index 000000000..303cf5f16 --- /dev/null +++ b/contrib/packages/alpine/gnunet/gnunet-system.conf @@ -0,0 +1,3 @@ +[arm] +START_SYSTEM_SERVICES = YES +START_USER_SERVICES = NO diff --git a/contrib/packages/alpine/gnunet/gnunet-user-services.initd b/contrib/packages/alpine/gnunet/gnunet-user-services.initd new file mode 100644 index 000000000..6c960944e --- /dev/null +++ b/contrib/packages/alpine/gnunet/gnunet-user-services.initd @@ -0,0 +1,33 @@ +#!/sbin/openrc-run +# Contributor: xrs +# Maintainer: xrs + +name="gnunet-user-services" +description="GNUnet user services" +command_background="yes" +pidfile="/run/${SVCNAME}.pid" +users=`awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd` + +depend() { + need gnunet-system-services +} + +start() { + for user in $users; do + if test -z "`ps|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 + then + sudo -u $user gnunet-arm \ + -c /home/$user/.config/gnunet.conf -s + fi + done +} + +stop() { + for user in $users; do + if test -n "`ps|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 + then + sudo -u $user gnunet-arm \ + -c /home/$user/.config/gnunet.conf -e + fi + done +} diff --git a/contrib/packages/alpine/gnunet/gnunet-user.conf b/contrib/packages/alpine/gnunet/gnunet-user.conf new file mode 100644 index 000000000..22f1fe37a --- /dev/null +++ b/contrib/packages/alpine/gnunet/gnunet-user.conf @@ -0,0 +1,3 @@ +[arm] +START_SYSTEM_SERVICES = NO +START_USER_SERVICES = YES diff --git a/contrib/packages/alpine/gnunet/gnunet.post-deinstall b/contrib/packages/alpine/gnunet/gnunet.post-deinstall new file mode 100644 index 000000000..ab98ab535 --- /dev/null +++ b/contrib/packages/alpine/gnunet/gnunet.post-deinstall @@ -0,0 +1,6 @@ +#!/bin/sh + +deluser --remove-home gnunet # implicitly removes group gnunet +delgroup gnunetdns + +exit 0 diff --git a/contrib/packages/alpine/gnunet/gnunet.post-install b/contrib/packages/alpine/gnunet/gnunet.post-install new file mode 100644 index 000000000..f7c19b26f --- /dev/null +++ b/contrib/packages/alpine/gnunet/gnunet.post-install @@ -0,0 +1,40 @@ +#!/bin/sh + +# Enumerate users. +users=`awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd` + +# Install gnunet.conf for existing users. +for user in $users; do + install -m644 -o $user -g $user -D /etc/skel/.config/gnunet.conf \ + /home/$user/.config/gnunet.conf +done + +# Enable GNS proxy for users, if desired. +echo "Use GNU Name System in Firefox/Chromium by default? [y,N]" +read -r yn +case $yn in +y|Y ) + # Enable GNS proxy for existant users. + for user in $users; do + port=$((8000+$(id -u $user))) + gnunet-config -c /home/$user/.config/gnunet.conf \ + --rewrite \ + --section=gns-proxy \ + --option=IMMEDIATE_START \ + --value=YES + gnunet-config -c /home/$user/.config/gnunet.conf \ + --rewrite \ + --section=gns-proxy \ + --option=OPTIONS \ + --value="-p $port" + done + + # Enable GNS proxy for future users. + echo "[gns-proxy]" >> /etc/skel/.config/gnunet.conf + echo "IMMEDIATE_START = YES" >> /etc/skel/.config/gnunet.conf + ;; +* ) + ;; +esac + +exit 0 diff --git a/contrib/packages/alpine/gnunet/gnunet.pre-deinstall b/contrib/packages/alpine/gnunet/gnunet.pre-deinstall new file mode 100644 index 000000000..3334c6d67 --- /dev/null +++ b/contrib/packages/alpine/gnunet/gnunet.pre-deinstall @@ -0,0 +1,28 @@ +#!/bin/sh + +# Remove proxy settings from browser. +users=`awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd` +for user in $users; do + gnunet_proxy=`grep -i "gns-proxy" /home/$user/.config/gnunet.conf` + if [ "$gnunet_proxy" ]; then + for ffprofile in /home/"$user"/.mozilla/firefox/*.*/; do + # Reset proxy preferences + js=$ffprofile/user.js + if [ -f $js ]; then + sed -i '/Preferences for using the GNU Name System/d' $js + sed -i '/network.proxy.socks/d' $js + sed -i '/network.proxy.socks_port/d' $js + sed -i '/network.proxy.socks_remote_dns/d' $js + sed -i '/network.proxy.type/d' $js + fi + done + + # Chromium + profile=/home/$user/.profile + if [ -f $profile ]; then + sed -i '/CHROMIUM_USER_FLAGS/d' $profile + fi + fi +done + +exit 0 diff --git a/contrib/packages/alpine/gnunet/gnunet.pre-install b/contrib/packages/alpine/gnunet/gnunet.pre-install new file mode 100644 index 000000000..bbb629cb1 --- /dev/null +++ b/contrib/packages/alpine/gnunet/gnunet.pre-install @@ -0,0 +1,17 @@ +#!/bin/sh + +# Add special group gnunetdns for controlling access to "gnunet-helper-dns". +addgroup -S gnunetdns 2>/dev/null +addgroup -S gnunet 2>/dev/null + +# Add system user/group gnunet for system services +adduser -S -h "/var/lib/gnunet" -s /bin/sh \ + -G gnunet -g gnunet gnunet 2>/dev/null + +# add users on host system to group "gnunet" +users=`awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd` +for user in $users; do + adduser $user gnunet 2>/dev/null +done + +exit 0 diff --git a/contrib/packages/alpine/gnunet/gnunet.xsession b/contrib/packages/alpine/gnunet/gnunet.xsession new file mode 100644 index 000000000..f19d6baf7 --- /dev/null +++ b/contrib/packages/alpine/gnunet/gnunet.xsession @@ -0,0 +1,54 @@ +#!/bin/sh +user=$(whoami) +gnunet_proxy=$(gnunet-config -c /etc/skel/.config/gnunet.conf -s gns-proxy|grep 'IMMEDIATE_START = YES') + +# Enable GNS proxy for new users informed by /etc/skel. +if [ "$gnunet_proxy" ]; then + + # Calculate user specific port + port=$((8000+$(id -u $user))) + + gnunet-config -c /home/$user/.config/gnunet.conf \ + --rewrite \ + --section=gns-proxy \ + --option=OPTIONS \ + --value="-p $port" + + # Firefox + if [ ! -d ~/.mozilla/firefox/*.default ];then + timeout 3s firefox --headless # dirty: create profile if not existent + fi + for ffprofile in ~/.mozilla/firefox/*.*/; do + js=$ffprofile/user.js + if [ -f $js ]; then + sed -i '/Preferences for using the GNU Name System/d' $js + sed -i '/network.proxy.socks/d' $js + sed -i '/network.proxy.socks_port/d' $js + sed -i '/network.proxy.socks_remote_dns/d' $js + sed -i '/network.proxy.type/d' $js + fi + echo "// Preferences for using the GNU Name System" >> $js + echo "user_pref(\"network.proxy.socks\", \"localhost\");" >> $js + echo "user_pref(\"network.proxy.socks_port\", $port);" >> $js + echo "user_pref(\"network.proxy.socks_remote_dns\", true);" >> $js + echo "user_pref(\"network.proxy.type\", 1);" >> $js + done + + # Chromium + profile=/home/$user/.profile + if [ -f $profile ]; then + sed -i '/CHROMIUM_USER_FLAGS/d' $profile + fi + echo "export CHROMIUM_USER_FLAGS=--proxy-server=socks5://localhost:$port" \ + >> $profile +fi + +# Create/Renew GNS certificate authority (CA) per user. +gnunet-gns-proxy-setup-ca + +# In case a new user was added and gnunet-user-services has not been +# restarted afterwards, start user services after login. +if test -z "`ps|grep -v grep|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 +then + gnunet-arm -c /home/$user/.config/gnunet.conf -s +fi diff --git a/contrib/packages/alpine/gnurl/APKBUILD b/contrib/packages/alpine/gnurl/APKBUILD new file mode 100644 index 000000000..f14a9bd97 --- /dev/null +++ b/contrib/packages/alpine/gnurl/APKBUILD @@ -0,0 +1,77 @@ +# Contributor: xrs +# Maintainer: xrs +pkgname=gnurl +pkgver=7.65.3 +pkgrel=0 +pkgdesc="curl with only HTTP/HTTPS support and GnuTLS" +url="https://gnunet.org/en/gnurl.html" +arch="all" +license="MIT" +depends="ca-certificates gnutls libidn2 zlib" +depends_dev="gnutls-dev libidn2-dev zlib-dev" +makedepends="$depends_dev autoconf automake libtool perl pkgconf python3" +subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libgnurl" +source="https://ftp.gnu.org/gnu/gnunet/gnurl-$pkgver.tar.gz" + +prepare() { + default_prepare + autoreconf -vfi +} + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ + --prefix=/usr \ + --disable-static \ + --enable-ipv6 \ + --with-gnutls \ + --with-libidn2 \ + --without-libpsl \ + --without-libssh2 \ + --without-libmetalink \ + --without-winidn \ + --without-librtmp \ + --without-nghttp2 \ + --without-nss \ + --without-cyassl \ + --without-polarssl \ + --without-ssl \ + --without-winssl \ + --without-darwinssl \ + --disable-sspi \ + --disable-ntlm-wb \ + --disable-ldap \ + --disable-rtsp \ + --disable-dict \ + --disable-telnet \ + --disable-tftp \ + --disable-pop3 \ + --disable-imap \ + --disable-smtp \ + --disable-gopher \ + --disable-file \ + --disable-ftp \ + --disable-smb \ + --disable-ares + make +} + +check() { + make -C tests nonflaky-test +} + +package() { + make DESTDIR="$pkgdir" install +} + +libgnurl() { + pkgdesc="curl library with only HTTP/HTTPS support and GnuTLS" + + mkdir -p "$subpkgdir"/usr + mv "$pkgdir"/usr/lib "$subpkgdir"/usr +} + + +sha512sums="51aa71352dfe2e65dbcf542cb616af1eaa7e80fbc4ddb455a338e74eea245724ac1fa7ff226c418101e8ba298a8f85c2be9e7d9190a57c66e2e8c65d0c5186f8 gnurl-7.65.3.tar.gz" -- cgit v1.2.3 From 5d719df51dd80414b60e82a81d71100eef84c815 Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 24 Oct 2019 10:26:58 +0000 Subject: contrib: include all files in packages in EXTRA_DIST --- contrib/Makefile.am | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 83c68d828..26d570101 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -17,6 +17,25 @@ INITD_FILES = \ services/openrc/gnunet.initd \ services/systemd/gnunet.service +PACKAGES_FILES = \ + guix/guix-env-py2.scm \ + guix/guix-env-gillmann.scm \ + guix/notest-guix-env.scm \ + nix/gnunet-dev.nix \ + nix/default.nix \ + alpine/gnunet-gtk/APKBUILD \ + alpine/gnunet/APKBUILD \ + alpine/gnunet/gnunet-system-services.initd \ + alpine/gnunet/gnunet-system.conf \ + alpine/gnunet/gnunet-user-services.initd \ + alpine/gnunet/gnunet-user.conf \ + alpine/gnunet/gnunet.post-deinstall \ + alpine/gnunet/gnunet.post-install \ + alpine/gnunet/gnunet.pre-deinstall \ + alpine/gnunet/gnunet.pre-install \ + alpine/gnunet/gnunet.xsession \ + alpine/gnurl/APKBUILD + EXTRA_DIST = \ conf/colorit/colorit.conf \ conf/.style.yapf \ @@ -27,8 +46,7 @@ EXTRA_DIST = \ conf/gnunet/gnunet-user.conf \ conf/nss/nssswitch.conf \ conf/wireshark/wireshark.lua \ - packages/nix/default.nix \ - packages/nix/gnunet-dev.nix \ + $(PACKAGES_FILES) \ $(INITD_FILES) check_PROGRAMS = \ -- cgit v1.2.3 From 8ac01c67a941fdb7336ec274450adffacf1dcc02 Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 24 Oct 2019 12:45:19 +0000 Subject: path->PATHS --- doc/handbook/chapters/installation.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/handbook/chapters/installation.texi b/doc/handbook/chapters/installation.texi index 327cffeaf..53d49af6d 100644 --- a/doc/handbook/chapters/installation.texi +++ b/doc/handbook/chapters/installation.texi @@ -2130,7 +2130,7 @@ the "Enable connecting to NATed peers using ICMP method" box. @node Peer configuration for distributors (e.g. Operating Systems) @subsection Peer configuration for distributors (e.g. Operating Systems) -The "GNUNET_DATA_HOME" in "[path]" in @file{/etc/gnunet.conf} should be +The "GNUNET_DATA_HOME" in "[PATHS]" in @file{/etc/gnunet.conf} should be manually set to "/var/lib/gnunet/data/" as the default "~/.local/share/gnunet/" is probably not that appropriate in this case. Similarly, distributors may consider pointing "GNUNET_RUNTIME_DIR" to -- cgit v1.2.3 From 4d21b22fd4353535d8023a3ac63370e6cc4c0407 Mon Sep 17 00:00:00 2001 From: ng0 Date: Fri, 25 Oct 2019 09:25:46 +0000 Subject: follow-up to win32 removal. --- src/arm/Makefile.am | 2 +- src/ats/Makefile.am | 2 +- src/cadet/Makefile.am | 2 +- src/conversation/Makefile.am | 30 +++++++++++++++--------------- src/core/Makefile.am | 2 +- src/datacache/Makefile.am | 2 +- src/datastore/Makefile.am | 2 +- src/dht/Makefile.am | 2 +- src/fs/Makefile.am | 2 +- src/gnsrecord/Makefile.am | 2 +- src/identity/Makefile.am | 2 +- src/namecache/Makefile.am | 2 +- src/namestore/Makefile.am | 2 +- src/nat-auto/Makefile.am | 2 +- src/nat/Makefile.am | 2 +- src/nse/Makefile.am | 2 +- src/peerinfo/Makefile.am | 2 +- src/reclaim-attribute/Makefile.am | 2 +- src/reclaim/Makefile.am | 2 +- src/regex/Makefile.am | 2 +- src/revocation/Makefile.am | 2 +- src/rps/Makefile.am | 2 +- src/statistics/Makefile.am | 2 +- src/topology/Makefile.am | 2 +- src/transport/Makefile.am | 10 +++++----- 25 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am index 28440d857..422084bfe 100644 --- a/src/arm/Makefile.am +++ b/src/arm/Makefile.am @@ -21,7 +21,7 @@ libgnunetarm_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) libgnunetarm_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 2:0:0 diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index bd8962158..0b8e7309a 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am @@ -30,7 +30,7 @@ libgnunetats_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) libgnunetats_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 4:0:0 libgnunet_plugin_ats_proportional_la_SOURCES = \ diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am index cd4beb4b7..b6e72688d 100644 --- a/src/cadet/Makefile.am +++ b/src/cadet/Makefile.am @@ -40,7 +40,7 @@ libgnunetcadet_la_LIBADD = \ $(XLIB) \ $(LTLIBINTL) libgnunetcadet_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 7:0:0 gnunet_cadet_SOURCES = \ diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am index dc8283e9b..2be4ba796 100644 --- a/src/conversation/Makefile.am +++ b/src/conversation/Makefile.am @@ -52,7 +52,7 @@ libgnunetmicrophone_la_SOURCES = \ libgnunetmicrophone_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la libgnunetmicrophone_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 libgnunetspeaker_la_SOURCES = \ @@ -60,7 +60,7 @@ libgnunetspeaker_la_SOURCES = \ libgnunetspeaker_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la libgnunetspeaker_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 @@ -76,7 +76,7 @@ libgnunetconversation_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la libgnunetconversation_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 @@ -117,7 +117,7 @@ gnunet_helper_audio_record_LDADD = \ -lpulse -lopus -logg \ $(INTLLIBS) gnunet_helper_audio_record_LDFLAGS = \ - $(WINFLAGS) + gnunet_helper_audio_playback_SOURCES = \ gnunet-helper-audio-playback.c @@ -126,7 +126,7 @@ gnunet_helper_audio_playback_LDADD = \ -lpulse -lopus -logg \ $(INTLLIBS) gnunet_helper_audio_playback_LDFLAGS = \ - $(WINFLAGS) + else if BUILD_GST_HELPERS gnunet_helper_audio_record_SOURCES = \ @@ -136,7 +136,7 @@ gnunet_helper_audio_record_LDADD = \ $(GST_LIBS) \ $(INTLLIBS) gnunet_helper_audio_record_LDFLAGS = \ - $(WINFLAGS) $(GST_LDFLAGS) + $(GST_LDFLAGS) gnunet_helper_audio_record_CFLAGS = \ $(GST_CFLAGS) @@ -147,7 +147,7 @@ gnunet_helper_audio_playback_LDADD = \ $(GST_LIBS) \ $(INTLLIBS) gnunet_helper_audio_playback_LDFLAGS = \ - $(WINFLAGS) $(GST_LDFLAGS) + $(GST_LDFLAGS) gnunet_helper_audio_playback_CFLAGS = \ $(GST_CFLAGS) -DIS_SPEAKER else @@ -159,7 +159,7 @@ gnunet_helper_audio_record_LDADD = \ $(GST_LIBS) \ $(INTLLIBS) gnunet_helper_audio_record_LDFLAGS = \ - $(WINFLAGS) $(GST_LDFLAGS) + $(GST_LDFLAGS) gnunet_helper_audio_record_CFLAGS = \ $(GST_CFLAGS) -DIS_MIC @@ -170,7 +170,7 @@ gnunet_helper_audio_playback_LDADD = \ $(GST_LIBS) \ $(INTLLIBS) gnunet_helper_audio_playback_LDFLAGS = \ - $(WINFLAGS) $(GST_LDFLAGS) + $(GST_LDFLAGS) gnunet_helper_audio_playback_CFLAGS = \ $(GST_CFLAGS) -DIS_SPEAKER endif @@ -187,7 +187,7 @@ gnunet_service_conversation_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(INTLLIBS) gnunet_service_conversation_LDFLAGS = \ - $(WINFLAGS) + gnunet_conversation_SOURCES = \ gnunet-conversation.c @@ -202,7 +202,7 @@ gnunet_conversation_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(INTLLIBS) gnunet_conversation_LDFLAGS = \ - $(WINFLAGS) + gnunet_conversation_test_SOURCES = \ gnunet-conversation-test.c @@ -212,7 +212,7 @@ gnunet_conversation_test_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(INTLLIBS) gnunet_conversation_test_LDFLAGS = \ - $(WINFLAGS) + test_conversation_api_SOURCES = \ @@ -227,7 +227,7 @@ test_conversation_api_LDADD = \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la test_conversation_api_LDFLAGS = \ - $(WINFLAGS) -export-dynamic + -export-dynamic test_conversation_api_twocalls_SOURCES = \ test_conversation_api_twocalls.c @@ -241,7 +241,7 @@ test_conversation_api_twocalls_LDADD = \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la test_conversation_api_twocalls_LDFLAGS = \ - $(WINFLAGS) -export-dynamic + -export-dynamic test_conversation_api_reject_SOURCES = \ test_conversation_api_reject.c @@ -255,7 +255,7 @@ test_conversation_api_reject_LDADD = \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la test_conversation_api_reject_LDFLAGS = \ - $(WINFLAGS) -export-dynamic + -export-dynamic diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 902be3599..80bdca812 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -24,7 +24,7 @@ libgnunetcore_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) libgnunetcore_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:1:0 diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am index 9fc00bace..ecb02d1c3 100644 --- a/src/datacache/Makefile.am +++ b/src/datacache/Makefile.am @@ -30,7 +30,7 @@ libgnunetdatacache_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunetdatacache_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:1:0 diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am index ba65143af..cd1df4e5e 100644 --- a/src/datastore/Makefile.am +++ b/src/datastore/Makefile.am @@ -26,7 +26,7 @@ libgnunetdatastore_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunetdatastore_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 1:0:0 bin_PROGRAMS = \ diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index 82d76f33c..0b2bc0946 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am @@ -25,7 +25,7 @@ libgnunetdht_la_LIBADD = \ $(XLIB) \ $(LTLIBINTL) libgnunetdht_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 3:0:0 diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 0840242ea..f0efefc4b 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -55,7 +55,7 @@ libgnunetfs_la_LIBADD += \ endif libgnunetfs_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 3:1:1 diff --git a/src/gnsrecord/Makefile.am b/src/gnsrecord/Makefile.am index 81bee5a6b..3da9af9ca 100644 --- a/src/gnsrecord/Makefile.am +++ b/src/gnsrecord/Makefile.am @@ -37,7 +37,7 @@ libgnunetgnsrecord_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunetgnsrecord_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am index 39d423506..9f580f0f9 100644 --- a/src/identity/Makefile.am +++ b/src/identity/Makefile.am @@ -46,7 +46,7 @@ libgnunetidentity_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) libgnunetidentity_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 1:0:0 bin_PROGRAMS = \ diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am index 8abae68a4..5e80ea4c5 100644 --- a/src/namecache/Makefile.am +++ b/src/namecache/Makefile.am @@ -68,7 +68,7 @@ libgnunetnamecache_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunetnamecache_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 646effd9b..12d730f36 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am @@ -154,7 +154,7 @@ libgnunetnamestore_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunetnamestore_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:1:0 diff --git a/src/nat-auto/Makefile.am b/src/nat-auto/Makefile.am index 14f3f2330..e42ce9491 100644 --- a/src/nat-auto/Makefile.am +++ b/src/nat-auto/Makefile.am @@ -43,7 +43,7 @@ libgnunetnatauto_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) @EXT_LIBS@ libgnunetnatauto_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 gnunet_service_nat_auto_SOURCES = \ diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index 67f5e4dbc..63a11f1fe 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am @@ -59,7 +59,7 @@ libgnunetnatnew_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) @EXT_LIBS@ libgnunetnatnew_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 2:0:0 gnunet_service_nat_SOURCES = \ diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am index 3a79cdd97..85ae4d3be 100644 --- a/src/nse/Makefile.am +++ b/src/nse/Makefile.am @@ -29,7 +29,7 @@ libgnunetnse_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) libgnunetnse_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index 7d1204100..831162366 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am @@ -27,7 +27,7 @@ libgnunetpeerinfo_la_LIBADD = \ $(XLIB) \ $(LTLIBINTL) libgnunetpeerinfo_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 diff --git a/src/reclaim-attribute/Makefile.am b/src/reclaim-attribute/Makefile.am index cbbcb37d6..490e77398 100644 --- a/src/reclaim-attribute/Makefile.am +++ b/src/reclaim-attribute/Makefile.am @@ -22,7 +22,7 @@ libgnunetreclaimattribute_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunetreclaimattribute_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am index 851b0d71e..51b9b9c5b 100644 --- a/src/reclaim/Makefile.am +++ b/src/reclaim/Makefile.am @@ -111,7 +111,7 @@ libgnunetreclaim_la_LIBADD = \ $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ $(GN_LIBINTL) $(XLIB) libgnunetreclaim_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 gnunet_reclaim_SOURCES = \ diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am index ba5e0af00..2fd00dd09 100644 --- a/src/regex/Makefile.am +++ b/src/regex/Makefile.am @@ -45,7 +45,7 @@ libgnunetregexblock_la_LIBADD = \ $(XLIB) \ $(LTLIBINTL) libgnunetregexblock_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 1:0:0 diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am index a6fff3524..5e48fb29f 100644 --- a/src/revocation/Makefile.am +++ b/src/revocation/Makefile.am @@ -50,7 +50,7 @@ libgnunetrevocation_la_LIBADD = \ $(LIBGCRYPT_LIBS) \ $(GN_LIBINTL) $(XLIB) -lgcrypt libgnunetrevocation_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 libexec_PROGRAMS = \ diff --git a/src/rps/Makefile.am b/src/rps/Makefile.am index 0c739589f..b9de6b5e3 100644 --- a/src/rps/Makefile.am +++ b/src/rps/Makefile.am @@ -36,7 +36,7 @@ libgnunetrps_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) libgnunetrps_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 # Fix 'created both with libtool and without' error: libgnunetrps_la_CFLAGS = $(AM_CFLAGS) diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am index bde35da2d..6d69d58d8 100644 --- a/src/statistics/Makefile.am +++ b/src/statistics/Makefile.am @@ -21,7 +21,7 @@ libgnunetstatistics_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) libgnunetstatistics_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 2:0:0 libexec_PROGRAMS = \ diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am index ae69ee8bc..8580d200c 100644 --- a/src/topology/Makefile.am +++ b/src/topology/Makefile.am @@ -21,7 +21,7 @@ libgnunetfriends_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) libgnunetfriends_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 8221b7847..d776e99e4 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -185,7 +185,7 @@ libgnunettransport_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunettransport_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 4:0:2 libgnunettransportapplication_la_SOURCES = \ @@ -194,7 +194,7 @@ libgnunettransportapplication_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) libgnunettransportapplication_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 @@ -204,7 +204,7 @@ libgnunettransportcore_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunettransportcore_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 libgnunettransportcommunicator_la_SOURCES = \ @@ -213,7 +213,7 @@ libgnunettransportcommunicator_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunettransportcommunicator_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 @@ -223,7 +223,7 @@ libgnunettransportmonitor_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunettransportmonitor_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 -- cgit v1.2.3 From 3650b47b46c944473c28d73b3c148e985879026c Mon Sep 17 00:00:00 2001 From: ng0 Date: Fri, 25 Oct 2019 09:37:14 +0000 Subject: fix syntax --- src/conversation/Makefile.am | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am index 2be4ba796..7645b7973 100644 --- a/src/conversation/Makefile.am +++ b/src/conversation/Makefile.am @@ -116,8 +116,8 @@ gnunet_helper_audio_record_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ -lpulse -lopus -logg \ $(INTLLIBS) -gnunet_helper_audio_record_LDFLAGS = \ - +#gnunet_helper_audio_record_LDFLAGS = \ +# gnunet_helper_audio_playback_SOURCES = \ gnunet-helper-audio-playback.c @@ -125,8 +125,8 @@ gnunet_helper_audio_playback_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ -lpulse -lopus -logg \ $(INTLLIBS) -gnunet_helper_audio_playback_LDFLAGS = \ - +#gnunet_helper_audio_playback_LDFLAGS = \ +# else if BUILD_GST_HELPERS gnunet_helper_audio_record_SOURCES = \ @@ -186,8 +186,8 @@ gnunet_service_conversation_LDADD = \ $(top_builddir)/src/cadet/libgnunetcadet.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(INTLLIBS) -gnunet_service_conversation_LDFLAGS = \ - +#gnunet_service_conversation_LDFLAGS = \ +# gnunet_conversation_SOURCES = \ gnunet-conversation.c @@ -201,8 +201,8 @@ gnunet_conversation_LDADD = \ $(top_builddir)/src/identity/libgnunetidentity.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(INTLLIBS) -gnunet_conversation_LDFLAGS = \ - +#gnunet_conversation_LDFLAGS = \ +# gnunet_conversation_test_SOURCES = \ gnunet-conversation-test.c @@ -211,8 +211,8 @@ gnunet_conversation_test_LDADD = \ libgnunetspeaker.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(INTLLIBS) -gnunet_conversation_test_LDFLAGS = \ - +#gnunet_conversation_test_LDFLAGS = \ +# test_conversation_api_SOURCES = \ -- cgit v1.2.3 From 853b43d07307de32a012703cafbc583fdac412a9 Mon Sep 17 00:00:00 2001 From: ng0 Date: Fri, 25 Oct 2019 12:07:06 +0000 Subject: remove glpk. --- ChangeLog | 3 +++ README | 1 - configure.ac | 14 -------------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c24a7e5f..c719c4b37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Fri Oct 25 00:00:00 UTC 2019 + Dropped glpk dependency(-check). -ng0 + Wed Oct 23 00:00:00 UTC 2019 Remove setuid helpers. They never worked as intended. The fixed version is not portable and the defacto good way to diff --git a/README b/README index ac4a2618c..c1e7db2e5 100644 --- a/README +++ b/README @@ -122,7 +122,6 @@ These are the optional dependencies: - grof (for linting of man pages) - libextractor >= 0.6.1 (highly recommended[*5]) - libjansson -- libglpk >= 4.45 (for experimental code) - libopus >= 1.0.1 (for experimental conversation tool) - libpulse >= 2.0 (for experimental conversation tool) - libogg >= 1.3.0 (for experimental conversation tool) diff --git a/configure.ac b/configure.ac index bf4e13320..fc0d75fbf 100644 --- a/configure.ac +++ b/configure.ac @@ -791,20 +791,6 @@ AM_CONDITIONAL(HAVE_LIBATOMIC, [test "$have_libatomic" = 1]) LIBS=$SAVE_LIBS CPPFLAGS=$SAVE_CPPFLAGS -AC_CHECK_HEADERS([glpk.h],[glpk=true],[glpk=false]) -# GLPK must support glpk_init_env, version >= 4.43 -AC_CHECK_LIB([glpk],[glp_init_env],,[glpk=false]) -# GLPK must support atm MLP presolving, version >= 4.32 -AC_CHECK_MEMBERS(glp_iocp.presolve,,[glpk=false],[[#include ]]) -AS_IF([test "x$glpk" = xfalse], -[ - AM_CONDITIONAL(HAVE_LIBGLPK, false) - AC_MSG_WARN([ERROR: GNUnet requires GLPK >= 4.32]) -],[ - AM_CONDITIONAL(HAVE_LIBGLPK, true) - AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK]) -]) - AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false]) AS_IF([test x$nss = xfalse], -- cgit v1.2.3 From 49b41f0bdbcdaf8ce8ef09a876288790e0ceea0a Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 26 Oct 2019 07:32:46 +0000 Subject: conversation is no longer guarded by 'experimental' in the Makefiles. Reflect this in the README. --- README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index c1e7db2e5..15879c4c4 100644 --- a/README +++ b/README @@ -122,9 +122,9 @@ These are the optional dependencies: - grof (for linting of man pages) - libextractor >= 0.6.1 (highly recommended[*5]) - libjansson -- libopus >= 1.0.1 (for experimental conversation tool) -- libpulse >= 2.0 (for experimental conversation tool) -- libogg >= 1.3.0 (for experimental conversation tool) +- libopus >= 1.0.1 (for conversation tool) +- libpulse >= 2.0 (for conversation tool) +- libogg >= 1.3.0 (for conversation tool) - libnss (certtool binary (for convenient installation of GNS proxy)) - libzbar >= 0.10 (for gnunet-qr) -- cgit v1.2.3 From c074e07068940dd4a60bef8bcea8df31c3df45ca Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 26 Oct 2019 12:03:58 +0000 Subject: configure: Add --with[out]-libbluetooth=PREFIX --- configure.ac | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index fc0d75fbf..ba8fdb8c6 100644 --- a/configure.ac +++ b/configure.ac @@ -605,11 +605,38 @@ AC_LANG_POP(C) # check for bluetooth library bluetooth=0 -CHECK_LIBHEADER(BLUETOOTH, bluetooth, ba2str, bluetooth/bluetooth.h,bluetooth=1,) +AC_MSG_CHECKING(for libbluetooth) +AC_ARG_WITH(libbluetooth, + [ --with-libbluetooth=PREFIX (base of libbluetooth installation)], + [AC_MSG_RESULT([$with_libbluetooth]) + AS_CASE([$with_libbluetooth], + [no],[], + [yes],[ + CHECK_LIBHEADER(BLUETOOTH, + bluetooth, + ba2str, + bluetooth/bluetooth.h, + bluetooth=1,) + ],[ + LDFLAGS="-L$with_libbluetooth/lib $LDFLAGS" + CPPFLAGS="-I$with_libbluetooth/include $CPPFLAGS" + AC_CHECK_HEADERS(bluetooth/bluetooth.h, + AC_CHECK_LIB([bluetooth], + [ba2str], + EXT_LIB_PATH="-L$with_libbluetooth/lib $EXT_LIB_PATH" + bluetooth=1)) + ]) + ], + [AC_MSG_RESULT([--with-libbluetooth not specified]) + CHECK_LIBHEADER(BLUETOOTH, + bluetooth, + ba2str, + bluetooth/bluetooth.h, + bluetooth=1,)]) AM_CONDITIONAL(HAVE_LIBBLUETOOTH, [test "$bluetooth" = 1]) AS_IF([test "$bluetooth" = 1], - [AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])], - [AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library])]) + [AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])], + [AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library])]) # check for zbar library zbar=0 -- cgit v1.2.3 From 9bd7a50d91af224ea8befaa36f7e1400601267b2 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 26 Oct 2019 12:21:41 +0000 Subject: configure: Add --with-libpulse=PREFIX --- configure.ac | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index ba8fdb8c6..9580756f5 100644 --- a/configure.ac +++ b/configure.ac @@ -694,10 +694,42 @@ AS_IF([test "x$jansson" = x1], # check for libpulse(audio) library pulse=0 libpulse_msg="no" -CHECK_LIBHEADER(LIBPULSE, pulse, pa_stream_peek, pulse/simple.h,pulse=1,) -AS_IF([test "$pulse" = 1], +AC_MSG_CHECKING(for libpulse) +# TODO: --with-libpulse or --with-pulseaudio? What is more established +# TODO: in this context? +AC_ARG_WITH(libpulse, + [ --with-libpulse=PREFIX (base of libpulse installation)], + [AC_MSG_RESULT([$with_libpulse]) + AS_CASE([$with_libpulse], + [no],[], + [yes],[ + CHECK_LIBHEADER(LIBPULSE, + pulse, + pa_stream_peek, + pulse/simple.h, + pulse=1,) + ],[ + LDFLAGS="-L$with_libpulse/lib $LDFLAGS" + CPPFLAGS="-I$with_libpulse/include $CPPFLAGS" + AC_CHECK_HEADERS(pulse/simple.h, + AC_CHECK_LIB([pulse], + [pa_stream_peek], + EXT_LIB_PATH="-L$with_pulse/lib $EXT_LIB_PATH" + pulse=1)) + ]) + ], + [AC_MSG_RESULT([--with-libpulse not specified]) + CHECK_LIBHEADER(LIBPULSE, + pulse, + pa_stream_peek, + pulse/simple.h, + pulse=1,)]) +AM_CONDITIONAL(HAVE_PULSE, [test "$pulse" = 1]) +AS_IF([test x"$pulse" = x1], [AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library]) - libpulse_msg="yes"]) + libpulse_msg="yes"], + [AC_DEFINE([HAVE_PULSE],[0],[Lacking libpulse(audio) library]) + libpulse_msg="no"]) # check for libopus(audio) library opus=0 -- cgit v1.2.3 From b25840c3b2239ba1e1beb20adf7ada2db1227153 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 26 Oct 2019 12:38:32 +0000 Subject: configure: Add --with-libopus=PREFIX --- configure.ac | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 9580756f5..0d19ae2f3 100644 --- a/configure.ac +++ b/configure.ac @@ -734,14 +734,50 @@ AS_IF([test x"$pulse" = x1], # check for libopus(audio) library opus=0 libopus_msg="no" -CHECK_LIBHEADER(LIBOPUS, - opus, - opus_decode_float, - opus/opus.h, - AC_CHECK_DECL([OPUS_SET_GAIN],[opus=1],[],[[#include ]])) +AC_MSG_CHECKING(for libopus) +AC_ARG_WITH(libopus, + [ --with-libopus=PREFIX (base of libopus installation)], + [AC_MSG_RESULT([$with_libopus]) + AS_CASE([$with_libopus], + [no],[], + [yes],[ + CHECK_LIBHEADER(LIBOPUS, + opus, + opus_decode_float, + opus/opus.h, + AC_CHECK_DECL([OPUS_SET_GAIN], + [opus=1], + [], + [[ + #include + ]])) + ],[ + LDFLAGS="-L$with_libopus/lib $LDFLAGS" + CPPFLAGS="-I$with_libopus/include $CPPFLAGS" + AC_CHECK_HEADERS(opus/opus.h, + AC_CHECK_LIB([opus], + [OPUS_SET_GAIN], + EXT_LIB_PATH="-L$with_libopus/lib $EXT_LIB_PATH" + opus=1)) + ]) + ], + [AC_MSG_RESULT([--with-libopus not specified]) + CHECK_LIBHEADER(LIBOPUS, + opus, + opus_decode_float, + opus/opus.h, + AC_CHECK_DECL([OPUS_SET_GAIN], + [opus=1], + [], + [[ + #include + ]]))]) +AM_CONDITIONAL(HAVE_OPUS, [test "$opus" = 1]) AS_IF([test "x$opus" = x1], [AC_DEFINE([HAVE_OPUS],[1],[Have libopus library]) - libopus_msg="yes"]) + libopus_msg="yes"], + [AC_DEFINE([HAVE_OPUS],[0],[Lacking libopus library]) + libopus_msg="no"]) # libogg AC_CHECK_LIB(ogg, ogg_stream_flush_fill, -- cgit v1.2.3 From 01f5a8120cc609782547fbcff27a0dc81d1129de Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 26 Oct 2019 12:59:28 +0000 Subject: configure: Add --with-libogg=PREFIX --- configure.ac | 62 ++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index 0d19ae2f3..4cc74e4fe 100644 --- a/configure.ac +++ b/configure.ac @@ -714,7 +714,7 @@ AC_ARG_WITH(libpulse, AC_CHECK_HEADERS(pulse/simple.h, AC_CHECK_LIB([pulse], [pa_stream_peek], - EXT_LIB_PATH="-L$with_pulse/lib $EXT_LIB_PATH" + EXT_LIB_PATH="-L$with_libpulse/lib $EXT_LIB_PATH" pulse=1)) ]) ], @@ -763,15 +763,15 @@ AC_ARG_WITH(libopus, ], [AC_MSG_RESULT([--with-libopus not specified]) CHECK_LIBHEADER(LIBOPUS, - opus, - opus_decode_float, - opus/opus.h, - AC_CHECK_DECL([OPUS_SET_GAIN], - [opus=1], - [], - [[ - #include - ]]))]) + opus, + opus_decode_float, + opus/opus.h, + AC_CHECK_DECL([OPUS_SET_GAIN], + [opus=1], + [], + [[ + #include + ]]))]) AM_CONDITIONAL(HAVE_OPUS, [test "$opus" = 1]) AS_IF([test "x$opus" = x1], [AC_DEFINE([HAVE_OPUS],[1],[Have libopus library]) @@ -780,16 +780,38 @@ AS_IF([test "x$opus" = x1], libopus_msg="no"]) # libogg -AC_CHECK_LIB(ogg, ogg_stream_flush_fill, - [AC_CHECK_HEADERS([ogg/ogg.h], - AM_CONDITIONAL(HAVE_OGG, true) - ogg=1 - AC_DEFINE(HAVE_OGG,1,[Have ogg]), - AM_CONDITIONAL(HAVE_OGG, false) - ogg=0 - AC_DEFINE(HAVE_OGG,0,[lacking ogg]))], - AM_CONDITIONAL(HAVE_OGG, false) - ogg=0) +AC_MSG_CHECKING(for libogg) +AC_ARG_WITH(libogg, + [ --with-libogg=PREFIX (base of libogg installation)], + [AC_MSG_RESULT([$with_libogg]) + AS_CASE([$with_libogg], + [no],[], + [yes],[ + CHECK_LIBHEADER(LIBOGG, + ogg, + ogg_stream_flush_fill, + ogg/ogg.h, + ogg=1,) + ],[ + LDFLAGS="-L$with_libogg/lib $LDFLAGS" + CPPFLAGS="-I$with_libogg/include $CPPFLAGS" + AC_CHECK_HEADERS(ogg/ogg.h, + AC_CHECK_LIB([ogg], + [ogg_stream_flush_fill], + EXT_LIB_PATH="-L$with_libogg/lib $EXT_LIB_PATH" + ogg=1)) + ]) + ], + [AC_MSG_RESULT([--with-libogg not specified]) + CHECK_LIBHEADER(LIBOGG, + ogg, + ogg_stream_flush_fill, + ogg/ogg.h, + ogg=1,)]) +AM_CONDITIONAL(HAVE_OGG, [test "$ogg" = 1]) +AS_IF([test x"$ogg" = x1], + [AC_DEFINE([HAVE_OGG],[1],[Have ogg])] + [AC_DEFINE([HAVE_OGG],[0],[Lacking ogg])]) PKG_CHECK_MODULES([GLIB], -- cgit v1.2.3