diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-04-27 23:29:48 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2021-04-28 10:25:39 +0200 |
commit | 1b87a306f0ec3da8bdb1907e2b4efb9e1b3cb9bd (patch) | |
tree | b2c2e39f0815220bc8f23af2c97dbe4d4612ad0e /src | |
parent | 5e347ac9df8b49503a1fdfa38707a99a6b2b3b0c (diff) | |
download | gnunet-1b87a306f0ec3da8bdb1907e2b4efb9e1b3cb9bd.tar.gz gnunet-1b87a306f0ec3da8bdb1907e2b4efb9e1b3cb9bd.zip |
- fix misc typos
Diffstat (limited to 'src')
-rwxr-xr-x | src/abd/test_abd_own.sh | 3 | ||||
-rw-r--r-- | src/arm/arm.conf.in | 2 | ||||
-rw-r--r-- | src/arm/test_gnunet_arm.py.in | 20 | ||||
-rw-r--r-- | src/ats/ats.conf.in | 48 | ||||
-rw-r--r-- | src/ats/perf_ats_solver.conf | 51 | ||||
-rw-r--r-- | src/cadet/cadet.conf.in | 2 | ||||
-rw-r--r-- | src/consensus/test_consensus.conf | 2 | ||||
-rw-r--r-- | src/dht/test_dht_tools.py.in | 18 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy-ca.template | 12 | ||||
-rw-r--r-- | src/gns/openssl.cnf | 9 | ||||
-rw-r--r-- | src/namestore/test_namestore_put_multiple.sh | 2 | ||||
-rw-r--r-- | src/nat/test_nat_data.conf | 3 | ||||
-rw-r--r-- | src/nat/test_nat_test_data.conf | 10 | ||||
-rw-r--r-- | src/nse/nse.conf.in | 2 | ||||
-rw-r--r-- | src/rps/profiler_rps.conf | 2 | ||||
-rw-r--r-- | src/rps/rps.conf.in | 2 | ||||
-rw-r--r-- | src/rps/test_rps.conf | 2 | ||||
-rw-r--r-- | src/secretsharing/test_secretsharing.conf | 2 | ||||
-rw-r--r-- | src/set/test_set.conf | 2 | ||||
-rw-r--r-- | src/seti/test_seti.conf | 2 | ||||
-rw-r--r-- | src/setu/test_setu.conf | 2 | ||||
-rw-r--r-- | src/testbed/barriers.README.org | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_barriers.conf.in | 2 | ||||
-rw-r--r-- | src/util/util.conf | 2 |
24 files changed, 52 insertions, 152 deletions
diff --git a/src/abd/test_abd_own.sh b/src/abd/test_abd_own.sh index f4780ea90..3fc210284 100755 --- a/src/abd/test_abd_own.sh +++ b/src/abd/test_abd_own.sh | |||
@@ -58,7 +58,7 @@ END_ATTR="end" | |||
58 | 58 | ||
59 | gnunet-identity -d | 59 | gnunet-identity -d |
60 | 60 | ||
61 | # FORWARD, subject side stored (different constallations) | 61 | # FORWARD, subject side stored (different constellations) |
62 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=a --attribute="a" --subject="$AKEY b.c" --ttl="2019-12-12 10:00:00"` | 62 | SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=a --attribute="a" --subject="$AKEY b.c" --ttl="2019-12-12 10:00:00"` |
63 | gnunet-abd --createSubjectSide --ego=a --import="$SIGNED" | 63 | gnunet-abd --createSubjectSide --ego=a --import="$SIGNED" |
64 | gnunet-namestore -D -z a | 64 | gnunet-namestore -D -z a |
@@ -137,4 +137,3 @@ else | |||
137 | echo "FAIL: Failed to verify credential." | 137 | echo "FAIL: Failed to verify credential." |
138 | exit 1 | 138 | exit 1 |
139 | fi | 139 | fi |
140 | |||
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in index 383d578d5..8015e0e15 100644 --- a/src/arm/arm.conf.in +++ b/src/arm/arm.conf.in | |||
@@ -33,7 +33,7 @@ OPTIONS = -l $GNUNET_CACHE_HOME/gnunet-%Y-%m-%d.log | |||
33 | # If set to YES, ARM will only start services that are marked as | 33 | # If set to YES, ARM will only start services that are marked as |
34 | # per-user services (and we'll expect a system user to run ARM to | 34 | # per-user services (and we'll expect a system user to run ARM to |
35 | # provide system-level services). Per-user services enable | 35 | # provide system-level services). Per-user services enable |
36 | # better personalization and priviledge separation and in particular | 36 | # better personalization and privilege separation and in particular |
37 | # ensures that personal data is stored under $HOME, which might | 37 | # ensures that personal data is stored under $HOME, which might |
38 | # be important in a multi-user system (or if $HOME is encrypted | 38 | # be important in a multi-user system (or if $HOME is encrypted |
39 | # and /var/ is not). | 39 | # and /var/ is not). |
diff --git a/src/arm/test_gnunet_arm.py.in b/src/arm/test_gnunet_arm.py.in index e657d4a3f..2b30b6b97 100644 --- a/src/arm/test_gnunet_arm.py.in +++ b/src/arm/test_gnunet_arm.py.in | |||
@@ -53,7 +53,7 @@ def fail(result): | |||
53 | sys.exit(1) | 53 | sys.exit(1) |
54 | 54 | ||
55 | 55 | ||
56 | def end_arm_failer(command, rc, stdo, stde, normal): | 56 | def end_arm_failure(command, rc, stdo, stde, normal): |
57 | if normal: | 57 | if normal: |
58 | if rc != 0: | 58 | if rc != 0: |
59 | fail( | 59 | fail( |
@@ -69,7 +69,7 @@ def end_arm_failer(command, rc, stdo, stde, normal): | |||
69 | ) | 69 | ) |
70 | 70 | ||
71 | 71 | ||
72 | def print_only_failer(command, rc, stdo, stde, normal): | 72 | def print_only_failure(command, rc, stdo, stde, normal): |
73 | if normal: | 73 | if normal: |
74 | if rc != 0: | 74 | if rc != 0: |
75 | print( | 75 | print( |
@@ -87,12 +87,12 @@ def print_only_failer(command, rc, stdo, stde, normal): | |||
87 | sys.exit(1) | 87 | sys.exit(1) |
88 | 88 | ||
89 | 89 | ||
90 | def r_something(to_run, extra_args, failer=None, normal=True, **kw): | 90 | def r_something(to_run, extra_args, failure=None, normal=True, **kw): |
91 | rc, stdo, stde = sub_run( | 91 | rc, stdo, stde = sub_run( |
92 | to_run + extra_args, nofail=True, want_stde=True, **kw | 92 | to_run + extra_args, nofail=True, want_stde=True, **kw |
93 | ) | 93 | ) |
94 | if failer is not None: | 94 | if failure is not None: |
95 | failer(to_run + extra_args, rc, stdo, stde, normal) | 95 | failure(to_run + extra_args, rc, stdo, stde, normal) |
96 | return (rc, stdo, stde) | 96 | return (rc, stdo, stde) |
97 | 97 | ||
98 | 98 | ||
@@ -103,26 +103,26 @@ def r_arm(extra_args, **kw): | |||
103 | cleanup() | 103 | cleanup() |
104 | 104 | ||
105 | print("TEST: Bad argument checking...", end='') | 105 | print("TEST: Bad argument checking...", end='') |
106 | r_arm(['-x'], normal=False, failer=print_only_failer) | 106 | r_arm(['-x'], normal=False, failure=print_only_failure) |
107 | print("PASS") | 107 | print("PASS") |
108 | 108 | ||
109 | print("TEST: Start ARM...", end='') | 109 | print("TEST: Start ARM...", end='') |
110 | r_arm(['-s'], failer=print_only_failer) | 110 | r_arm(['-s'], failure=print_only_failure) |
111 | time.sleep(1) | 111 | time.sleep(1) |
112 | print("PASS") | 112 | print("PASS") |
113 | 113 | ||
114 | print("TEST: Start another service...", end='') | 114 | print("TEST: Start another service...", end='') |
115 | r_arm(['-i', 'resolver'], failer=end_arm_failer) | 115 | r_arm(['-i', 'resolver'], failure=end_arm_failure) |
116 | time.sleep(1) | 116 | time.sleep(1) |
117 | print("PASS") | 117 | print("PASS") |
118 | 118 | ||
119 | print("TEST: Stop a service...", end='') | 119 | print("TEST: Stop a service...", end='') |
120 | r_arm(['-k', 'resolver'], failer=end_arm_failer) | 120 | r_arm(['-k', 'resolver'], failure=end_arm_failure) |
121 | time.sleep(1) | 121 | time.sleep(1) |
122 | print("PASS") | 122 | print("PASS") |
123 | 123 | ||
124 | print("TEST: Stop ARM...", end='') | 124 | print("TEST: Stop ARM...", end='') |
125 | r_arm(['-e'], failer=print_only_failer) | 125 | r_arm(['-e'], failure=print_only_failure) |
126 | time.sleep(1) | 126 | time.sleep(1) |
127 | print("PASS") | 127 | print("PASS") |
128 | 128 | ||
diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in index 7691f98c0..4abddd99c 100644 --- a/src/ats/ats.conf.in +++ b/src/ats/ats.conf.in | |||
@@ -37,54 +37,8 @@ BLUETOOTH_QUOTA_OUT = 10 MiB | |||
37 | # Proportional specific settings | 37 | # Proportional specific settings |
38 | # How proportional to preferences is bandwidth distribution in a network | 38 | # How proportional to preferences is bandwidth distribution in a network |
39 | # 1.0: Fair with respect to addresses without preferences | 39 | # 1.0: Fair with respect to addresses without preferences |
40 | # > 1.0: The bigger, the more respect is payed to preferences | 40 | # > 1.0: The bigger, the more respect is paid to preferences |
41 | PROP_PROPORTIONALITY_FACTOR = 2.00 | 41 | PROP_PROPORTIONALITY_FACTOR = 2.00 |
42 | # Should we stick to existing connections are prefer to switch? | 42 | # Should we stick to existing connections are prefer to switch? |
43 | # [1.0...2.0], lower value prefers to switch, bigger value is more tolerant | 43 | # [1.0...2.0], lower value prefers to switch, bigger value is more tolerant |
44 | PROP_STABILITY_FACTOR = 1.25 | 44 | PROP_STABILITY_FACTOR = 1.25 |
45 | |||
46 | # MLP specific settings | ||
47 | # MLP defaults | ||
48 | |||
49 | # Maximum duration for a solution process (both LP and MILP) | ||
50 | # MLP_MAX_DURATION = 3 s | ||
51 | # Maximum numbero of iterations for a solution process (only LP) | ||
52 | # MLP_MAX_ITERATIONS = | ||
53 | # Tolerated MIP Gap [0.0 .. 1.0], default 0.025 | ||
54 | MLP_MAX_MIP_GAP = 0.025 | ||
55 | # Tolerated LP/MIP Gap [0.0 .. 1.0], default 0.025 | ||
56 | MLP_MAX_LP_MIP_GAP = 0.025 | ||
57 | |||
58 | |||
59 | # Maximum number of iterations for a solution process | ||
60 | # MLP_MAX_ITERATIONS = 1024 | ||
61 | # MLP_COEFFICIENT_D = 1.0 | ||
62 | # MLP_COEFFICIENT_U = 1.0 | ||
63 | # MLP_COEFFICIENT_R = 1.0 | ||
64 | # MLP_MIN_BANDWIDTH = 1024 | ||
65 | # MLP_MIN_CONNECTIONS = 4 | ||
66 | |||
67 | # MLP Log settings | ||
68 | # Dump all problems to disk | ||
69 | # MLP_DUMP_PROBLEM_ALL = YES | ||
70 | # Dump all solution to disk | ||
71 | # MLP_DUMP_SOLUTION_ALL = YES | ||
72 | # Print GLPK output | ||
73 | # MLP_GLPK_VERBOSE = YES | ||
74 | |||
75 | # Dump all problems to disk | ||
76 | MLP_DUMP_PROBLEM_ON_FAIL = YES | ||
77 | # Dump all solution to disk | ||
78 | MLP_DUMP_SOLUTION_ON_FAIL = YES | ||
79 | |||
80 | # RIL specifc settings | ||
81 | RIL_STEP_TIME_MIN = 500 ms | ||
82 | RIL_STEP_TIME_MAX = 1000 ms | ||
83 | |||
84 | # SARSA or Q-LEARNING | ||
85 | RIL_ALGORITHM = Q-LEARNING | ||
86 | RIL_DISCOUNT_BETA = 0.7 | ||
87 | RIL_GRADIENT_STEP_SIZE = 0.3 | ||
88 | RIL_TRACE_DECAY = 0.2 | ||
89 | RIL_EXPLORE_RATIO = 0.1 | ||
90 | RIL_GLOBAL_REWARD_SHARE = 1 | ||
diff --git a/src/ats/perf_ats_solver.conf b/src/ats/perf_ats_solver.conf index 00657d895..a535891df 100644 --- a/src/ats/perf_ats_solver.conf +++ b/src/ats/perf_ats_solver.conf | |||
@@ -21,57 +21,8 @@ BLUETOOTH_QUOTA_OUT = 10000000 | |||
21 | # Proportional specific settings | 21 | # Proportional specific settings |
22 | # How proportional to preferences is bandwidth distribution in a network | 22 | # How proportional to preferences is bandwidth distribution in a network |
23 | # 1: Fair with respect to addresses without preferences | 23 | # 1: Fair with respect to addresses without preferences |
24 | # > 10: The bigger, the more respect is payed to preferences | 24 | # > 10: The bigger, the more respect is paid to preferences |
25 | PROP_PROPORTIONALITY_FACTOR = 2.00 | 25 | PROP_PROPORTIONALITY_FACTOR = 2.00 |
26 | # Should we stick to existing connections are prefer to switch? | 26 | # Should we stick to existing connections are prefer to switch? |
27 | # [10...200], lower value prefers to switch, bigger value is more tolerant | 27 | # [10...200], lower value prefers to switch, bigger value is more tolerant |
28 | PROP_STABILITY_FACTOR = 1.25 | 28 | PROP_STABILITY_FACTOR = 1.25 |
29 | |||
30 | # MLP specific settings | ||
31 | # MLP defaults | ||
32 | |||
33 | # Maximum duration for a solution process | ||
34 | # MLP_MAX_DURATION = 30 s | ||
35 | |||
36 | # Maximum number of iterations for a solution process | ||
37 | # MLP_MAX_ITERATIONS = 1024 | ||
38 | # Tolerated MIP Gap [0.0 .. 1.0], default 0.025 | ||
39 | MLP_MAX_MIP_GAP = 0.025 | ||
40 | # Tolerated LP/MIP Gap [0.0 .. 1.0], default 0.025 | ||
41 | MLP_MAX_LP_MIP_GAP = 0.025 | ||
42 | |||
43 | # MLP_COEFFICIENT_D = 1.0 | ||
44 | # MLP_COEFFICIENT_U = 1.0 | ||
45 | # MLP_COEFFICIENT_R = 1.0 | ||
46 | MLP_MIN_BANDWIDTH = 10 | ||
47 | # MLP_MIN_CONNECTIONS = 4 | ||
48 | # MLP_DBG_FEASIBILITY_ONLY = YES | ||
49 | MLP_DBG_AUTOSCALE_PROBLEM = YES | ||
50 | # MLP_DBG_INTOPT_PRESOLVE = YES | ||
51 | # Print GLPK output | ||
52 | # MLP_DBG_GLPK_VERBOSE = YES | ||
53 | |||
54 | #MLP_DBG_OPTIMIZE_UTILITY = NO | ||
55 | #MLP_DBG_OPTIMIZE_QUALITY = NO | ||
56 | #MLP_DBG_OPTIMIZE_RELATIVITY = NO | ||
57 | #DLP_DBG_OPTIMIZE_DIVERSITY = NO | ||
58 | |||
59 | MLP_LOG_FORMAT = CPLEX | ||
60 | |||
61 | # MLP Log settings | ||
62 | # Dump all problems to disk | ||
63 | # MLP_DUMP_PROBLEM_ALL = YES | ||
64 | # Dump all solution to disk | ||
65 | # MLP_DUMP_SOLUTION_ALL = YES | ||
66 | |||
67 | # RIL specifc settings | ||
68 | RIL_STEP_TIME_MIN = 1 ms | ||
69 | RIL_STEP_TIME_MAX = 10 ms | ||
70 | |||
71 | RIL_ALGORITHM = Q | ||
72 | RIL_DISCOUNT_BETA = 0.7 | ||
73 | RIL_GRADIENT_STEP_SIZE = 0.3 | ||
74 | RIL_TRACE_DECAY = 0.2 | ||
75 | RIL_EXPLORE_RATIO = 0.1 | ||
76 | RIL_GLOBAL_REWARD_SHARE = 1 | ||
77 | |||
diff --git a/src/cadet/cadet.conf.in b/src/cadet/cadet.conf.in index d1ddcb96f..8f700951c 100644 --- a/src/cadet/cadet.conf.in +++ b/src/cadet/cadet.conf.in | |||
@@ -19,7 +19,7 @@ REFRESH_CONNECTION_TIME = 5 min | |||
19 | # Percentage of packets CADET is artificially dropping. Used for testing only! | 19 | # Percentage of packets CADET is artificially dropping. Used for testing only! |
20 | # DROP_PERCENT = | 20 | # DROP_PERCENT = |
21 | 21 | ||
22 | # How frequently do we usually anounce our presence in the DHT? | 22 | # How frequently do we usually announce our presence in the DHT? |
23 | ID_ANNOUNCE_TIME = 1 h | 23 | ID_ANNOUNCE_TIME = 1 h |
24 | 24 | ||
25 | # FIXME: document | 25 | # FIXME: document |
diff --git a/src/consensus/test_consensus.conf b/src/consensus/test_consensus.conf index 4f17fa359..67b366405 100644 --- a/src/consensus/test_consensus.conf +++ b/src/consensus/test_consensus.conf | |||
@@ -63,7 +63,7 @@ START_ON_DEMAND = NO | |||
63 | START_ON_DEMAND = NO | 63 | START_ON_DEMAND = NO |
64 | 64 | ||
65 | [nat] | 65 | [nat] |
66 | # Use addresses from the local network interfaces (inluding loopback, but also others) | 66 | # Use addresses from the local network interfaces (including loopback, but also others) |
67 | USE_LOCALADDR = YES | 67 | USE_LOCALADDR = YES |
68 | 68 | ||
69 | # Disable IPv6 support | 69 | # Disable IPv6 support |
diff --git a/src/dht/test_dht_tools.py.in b/src/dht/test_dht_tools.py.in index 20739c45f..84e297081 100644 --- a/src/dht/test_dht_tools.py.in +++ b/src/dht/test_dht_tools.py.in | |||
@@ -72,10 +72,10 @@ def fail(result): | |||
72 | cleanup(1) | 72 | cleanup(1) |
73 | 73 | ||
74 | 74 | ||
75 | def r_something(to_run, extra_args, failer=None, normal=True, **kw): | 75 | def r_something(to_run, extra_args, failure=None, normal=True, **kw): |
76 | rc, stdo, stde = sub_run(to_run + extra_args, nofail=True, **kw) | 76 | rc, stdo, stde = sub_run(to_run + extra_args, nofail=True, **kw) |
77 | if failer is not None: | 77 | if failure is not None: |
78 | failer(to_run + extra_args, rc, stdo, stde, normal) | 78 | failure(to_run + extra_args, rc, stdo, stde, normal) |
79 | return (rc, stdo, stde) | 79 | return (rc, stdo, stde) |
80 | 80 | ||
81 | 81 | ||
@@ -91,7 +91,7 @@ def r_put(extra_args, **kw): | |||
91 | return r_something(run_put, extra_args, **kw) | 91 | return r_something(run_put, extra_args, **kw) |
92 | 92 | ||
93 | 93 | ||
94 | def end_arm_failer(command, rc, stdo, stde, normal): | 94 | def end_arm_failure(command, rc, stdo, stde, normal): |
95 | if normal: | 95 | if normal: |
96 | if rc != 0: | 96 | if rc != 0: |
97 | fail( | 97 | fail( |
@@ -107,7 +107,7 @@ def end_arm_failer(command, rc, stdo, stde, normal): | |||
107 | ) | 107 | ) |
108 | 108 | ||
109 | 109 | ||
110 | def print_only_failer(command, rc, stdo, stde, normal): | 110 | def print_only_failure(command, rc, stdo, stde, normal): |
111 | if normal: | 111 | if normal: |
112 | if rc != 0: | 112 | if rc != 0: |
113 | print( | 113 | print( |
@@ -126,19 +126,19 @@ def print_only_failer(command, rc, stdo, stde, normal): | |||
126 | 126 | ||
127 | 127 | ||
128 | print("TEST: Starting ARM...", end='') | 128 | print("TEST: Starting ARM...", end='') |
129 | r_arm(['-s'], failer=end_arm_failer, want_stdo=False, want_stde=False) | 129 | r_arm(['-s'], failure=end_arm_failure, want_stdo=False, want_stde=False) |
130 | print("PASS") | 130 | print("PASS") |
131 | time.sleep(1) | 131 | time.sleep(1) |
132 | 132 | ||
133 | print("TEST: Testing put...", end='') | 133 | print("TEST: Testing put...", end='') |
134 | r_put(['-k', 'testkey', '-d', 'testdata', '-t', '8'], failer=end_arm_failer) | 134 | r_put(['-k', 'testkey', '-d', 'testdata', '-t', '8'], failure=end_arm_failure) |
135 | print("PASS") | 135 | print("PASS") |
136 | time.sleep(1) | 136 | time.sleep(1) |
137 | 137 | ||
138 | print("TEST: Testing get...", end='') | 138 | print("TEST: Testing get...", end='') |
139 | rc, stdo, stde = r_get(['-k', 'testkey', '-T', '50 ms', '-t', '8'], | 139 | rc, stdo, stde = r_get(['-k', 'testkey', '-T', '50 ms', '-t', '8'], |
140 | want_stdo=True, | 140 | want_stdo=True, |
141 | failer=end_arm_failer) | 141 | failure=end_arm_failure) |
142 | stdo = stdo.decode('utf-8').replace('\r', '').splitlines() | 142 | stdo = stdo.decode('utf-8').replace('\r', '').splitlines() |
143 | expect = "Result 0, type 8:\ntestdata".splitlines() | 143 | expect = "Result 0, type 8:\ntestdata".splitlines() |
144 | if len(stdo) != 2 or len(expect | 144 | if len(stdo) != 2 or len(expect |
@@ -146,4 +146,4 @@ if len(stdo) != 2 or len(expect | |||
146 | fail("output `{}' differs from expected `{}'".format(stdo, expect)) | 146 | fail("output `{}' differs from expected `{}'".format(stdo, expect)) |
147 | print("PASS") | 147 | print("PASS") |
148 | 148 | ||
149 | r_arm(['-e', '-d'], failer=print_only_failer) | 149 | r_arm(['-e', '-d'], failure=print_only_failure) |
diff --git a/src/gns/gnunet-gns-proxy-ca.template b/src/gns/gnunet-gns-proxy-ca.template index 541e3a355..b1a0d16fd 100644 --- a/src/gns/gnunet-gns-proxy-ca.template +++ b/src/gns/gnunet-gns-proxy-ca.template | |||
@@ -41,10 +41,10 @@ cn = "GNS Proxy CA" | |||
41 | # An alternative way to set the certificate's distinguished name directly | 41 | # An alternative way to set the certificate's distinguished name directly |
42 | # is with the "dn" option. The attribute names allowed are: | 42 | # is with the "dn" option. The attribute names allowed are: |
43 | # C (country), street, O (organization), OU (unit), title, CN (common name), | 43 | # C (country), street, O (organization), OU (unit), title, CN (common name), |
44 | # L (locality), ST (state), placeOfBirth, gender, countryOfCitizenship, | 44 | # L (locality), ST (state), placeOfBirth, gender, countryOfCitizenship, |
45 | # countryOfResidence, serialNumber, telephoneNumber, surName, initials, | 45 | # countryOfResidence, serialNumber, telephoneNumber, surName, initials, |
46 | # generationQualifier, givenName, pseudonym, dnQualifier, postalCode, name, | 46 | # generationQualifier, givenName, pseudonym, dnQualifier, postalCode, name, |
47 | # businessCategory, DC, UID, jurisdictionOfIncorporationLocalityName, | 47 | # businessCategory, DC, UID, jurisdictionOfIncorporationLocalityName, |
48 | # jurisdictionOfIncorporationStateOrProvinceName, | 48 | # jurisdictionOfIncorporationStateOrProvinceName, |
49 | # jurisdictionOfIncorporationCountryName, XmppAddr, and numeric OIDs. | 49 | # jurisdictionOfIncorporationCountryName, XmppAddr, and numeric OIDs. |
50 | 50 | ||
@@ -59,7 +59,7 @@ cn = "GNS Proxy CA" | |||
59 | # Use -1 if there is no expiration date. | 59 | # Use -1 if there is no expiration date. |
60 | expiration_days = 3650 | 60 | expiration_days = 3650 |
61 | 61 | ||
62 | # Alternatively you may set concrete dates and time. The GNU date string | 62 | # Alternatively you may set concrete dates and time. The GNU date string |
63 | # formats are accepted. See: | 63 | # formats are accepted. See: |
64 | # https://www.gnu.org/software/tar/manual/html_node/Date-input-formats.html | 64 | # https://www.gnu.org/software/tar/manual/html_node/Date-input-formats.html |
65 | 65 | ||
@@ -226,7 +226,7 @@ tls_www_server | |||
226 | #honor_crq_ext = 2.5.29.17 | 226 | #honor_crq_ext = 2.5.29.17 |
227 | #honor_crq_ext = 2.5.29.15 | 227 | #honor_crq_ext = 2.5.29.15 |
228 | 228 | ||
229 | # Path length contraint. Sets the maximum number of | 229 | # Path length constraint. Sets the maximum number of |
230 | # certificates that can be used to certify this certificate. | 230 | # certificates that can be used to certify this certificate. |
231 | # (i.e. the certificate chain length) | 231 | # (i.e. the certificate chain length) |
232 | #path_len = -1 | 232 | #path_len = -1 |
diff --git a/src/gns/openssl.cnf b/src/gns/openssl.cnf index 503460f9f..a2561b9b2 100644 --- a/src/gns/openssl.cnf +++ b/src/gns/openssl.cnf | |||
@@ -15,7 +15,7 @@ oid_section = new_oids | |||
15 | # To use this configuration file with the "-extfile" option of the | 15 | # To use this configuration file with the "-extfile" option of the |
16 | # "openssl x509" utility, name here the section containing the | 16 | # "openssl x509" utility, name here the section containing the |
17 | # X.509v3 extensions to use: | 17 | # X.509v3 extensions to use: |
18 | # extensions = | 18 | # extensions = |
19 | # (Alternatively, use a configuration file that has only | 19 | # (Alternatively, use a configuration file that has only |
20 | # X.509v3 extensions in its main [= default] section.) | 20 | # X.509v3 extensions in its main [= default] section.) |
21 | 21 | ||
@@ -46,7 +46,7 @@ crl = $dir/crl.pem # The current CRL | |||
46 | private_key = $dir/private/cakey.pem# The private key | 46 | private_key = $dir/private/cakey.pem# The private key |
47 | RANDFILE = $dir/private/.rand # private random number file | 47 | RANDFILE = $dir/private/.rand # private random number file |
48 | 48 | ||
49 | x509_extensions = usr_cert # The extentions to add to the cert | 49 | x509_extensions = usr_cert # The extensions to add to the cert |
50 | 50 | ||
51 | # Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs | 51 | # Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs |
52 | # so this is commented out by default to leave a V1 CRL. | 52 | # so this is commented out by default to leave a V1 CRL. |
@@ -89,13 +89,13 @@ default_bits = 1024 | |||
89 | default_keyfile = privkey.pem | 89 | default_keyfile = privkey.pem |
90 | distinguished_name = req_distinguished_name | 90 | distinguished_name = req_distinguished_name |
91 | attributes = req_attributes | 91 | attributes = req_attributes |
92 | x509_extensions = v3_ca # The extentions to add to the self signed cert | 92 | x509_extensions = v3_ca # The extensions to add to the self signed cert |
93 | 93 | ||
94 | # Passwords for private keys if not present they will be prompted for | 94 | # Passwords for private keys if not present they will be prompted for |
95 | # input_password = secret | 95 | # input_password = secret |
96 | # output_password = secret | 96 | # output_password = secret |
97 | 97 | ||
98 | # This sets a mask for permitted string types. There are several options. | 98 | # This sets a mask for permitted string types. There are several options. |
99 | # default: PrintableString, T61String, BMPString. | 99 | # default: PrintableString, T61String, BMPString. |
100 | # pkix : PrintableString, BMPString. | 100 | # pkix : PrintableString, BMPString. |
101 | # utf8only: only UTF8Strings. | 101 | # utf8only: only UTF8Strings. |
@@ -242,4 +242,3 @@ basicConstraints = CA:true | |||
242 | 242 | ||
243 | # issuerAltName=issuer:copy | 243 | # issuerAltName=issuer:copy |
244 | authorityKeyIdentifier=keyid:always,issuer:always | 244 | authorityKeyIdentifier=keyid:always,issuer:always |
245 | |||
diff --git a/src/namestore/test_namestore_put_multiple.sh b/src/namestore/test_namestore_put_multiple.sh index 81e1ad2b5..f33fb1c3a 100644 --- a/src/namestore/test_namestore_put_multiple.sh +++ b/src/namestore/test_namestore_put_multiple.sh | |||
@@ -15,7 +15,7 @@ if [ 0 -ne $ret ]; then | |||
15 | fi | 15 | fi |
16 | 16 | ||
17 | ## GNUNET part | 17 | ## GNUNET part |
18 | # Check if identity exists and delets and readds it to get rid of entries in zone | 18 | # Check if identity exists and deletes and readds it to get rid of entries in zone |
19 | gnunet-identity -d | grep randomtestingid 2>&1 /dev/null | 19 | gnunet-identity -d | grep randomtestingid 2>&1 /dev/null |
20 | ret=$? | 20 | ret=$? |
21 | 21 | ||
diff --git a/src/nat/test_nat_data.conf b/src/nat/test_nat_data.conf index cb018cecd..e139d0c05 100644 --- a/src/nat/test_nat_data.conf +++ b/src/nat/test_nat_data.conf | |||
@@ -14,7 +14,7 @@ PUNCHED_NAT = NO | |||
14 | # Disable UPNP by default until it gets cleaner! | 14 | # Disable UPNP by default until it gets cleaner! |
15 | ENABLE_UPNP = YES | 15 | ENABLE_UPNP = YES |
16 | 16 | ||
17 | # Use addresses from the local network interfaces (inluding loopback, but also others) | 17 | # Use addresses from the local network interfaces (including loopback, but also others) |
18 | USE_LOCALADDR = YES | 18 | USE_LOCALADDR = YES |
19 | 19 | ||
20 | # External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!) | 20 | # External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!) |
@@ -34,4 +34,3 @@ ENABLE_ICMP_SERVER = NO | |||
34 | 34 | ||
35 | # Disable IPv6 support | 35 | # Disable IPv6 support |
36 | DISABLEV6 = NO | 36 | DISABLEV6 = NO |
37 | |||
diff --git a/src/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf index 03850ec06..ca78ca9f3 100644 --- a/src/nat/test_nat_test_data.conf +++ b/src/nat/test_nat_test_data.conf | |||
@@ -18,14 +18,14 @@ PUNCHED_NAT = YES | |||
18 | # Disable UPNP by default until it gets cleaner! | 18 | # Disable UPNP by default until it gets cleaner! |
19 | ENABLE_UPNP = NO | 19 | ENABLE_UPNP = NO |
20 | 20 | ||
21 | # Use addresses from the local network interfaces (inluding loopback, but also others) | 21 | # Use addresses from the local network interfaces (including loopback, but also others) |
22 | USE_LOCALADDR = YES | 22 | USE_LOCALADDR = YES |
23 | RETURN_LOCAL_ADDRESSES = YES | 23 | RETURN_LOCAL_ADDRESSES = YES |
24 | 24 | ||
25 | # External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!) | 25 | # External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!) |
26 | # normal interface IP address for non-NATed peers; | 26 | # normal interface IP address for non-NATed peers; |
27 | # possibly auto-detected (using UPnP) if possible if not specified | 27 | # possibly auto-detected (using UPnP) if possible if not specified |
28 | # EXTERNAL_ADDRESS = | 28 | # EXTERNAL_ADDRESS = |
29 | 29 | ||
30 | # Should we use ICMP-based NAT traversal to try connect to NATed peers | 30 | # Should we use ICMP-based NAT traversal to try connect to NATed peers |
31 | # or, if we are behind NAT, to allow connections to us? | 31 | # or, if we are behind NAT, to allow connections to us? |
@@ -33,7 +33,7 @@ ENABLE_ICMP_CLIENT = NO | |||
33 | ENABLE_ICMP_SERVER = NO | 33 | ENABLE_ICMP_SERVER = NO |
34 | 34 | ||
35 | # IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY; | 35 | # IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY; |
36 | # normal interface IP address for non-NATed peers; | 36 | # normal interface IP address for non-NATed peers; |
37 | # likely auto-detected (via interface list) if not specified (!) | 37 | # likely auto-detected (via interface list) if not specified (!) |
38 | INTERNAL_ADDRESS = 127.0.0.1 | 38 | INTERNAL_ADDRESS = 127.0.0.1 |
39 | 39 | ||
@@ -43,5 +43,3 @@ DISABLEV6 = YES | |||
43 | 43 | ||
44 | [nse] | 44 | [nse] |
45 | START_ON_DEMAND = NO | 45 | START_ON_DEMAND = NO |
46 | |||
47 | |||
diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in index 6330254e9..0ac5621aa 100644 --- a/src/nse/nse.conf.in +++ b/src/nse/nse.conf.in | |||
@@ -11,7 +11,7 @@ UNIX_MATCH_UID = NO | |||
11 | UNIX_MATCH_GID = YES | 11 | UNIX_MATCH_GID = YES |
12 | PROOFFILE = $GNUNET_DATA_HOME/nse/proof.dat | 12 | PROOFFILE = $GNUNET_DATA_HOME/nse/proof.dat |
13 | 13 | ||
14 | # The directory where the NSE services logs timestamps everytime | 14 | # The directory where the NSE services logs timestamps every time |
15 | # a size estime flooding message is received | 15 | # a size estime flooding message is received |
16 | # This option is only used for benchmarking, not in production. | 16 | # This option is only used for benchmarking, not in production. |
17 | HISTOGRAM_DIR = $GNUNET_CACHE_HOME/nse/histogram | 17 | HISTOGRAM_DIR = $GNUNET_CACHE_HOME/nse/histogram |
diff --git a/src/rps/profiler_rps.conf b/src/rps/profiler_rps.conf index 5edd6d3ff..89e5e35f2 100644 --- a/src/rps/profiler_rps.conf +++ b/src/rps/profiler_rps.conf | |||
@@ -52,7 +52,7 @@ SETUP_TIMEOUT = 1 h | |||
52 | WORKBITS = 0 | 52 | WORKBITS = 0 |
53 | 53 | ||
54 | [nat] | 54 | [nat] |
55 | # Use addresses from the local network interfaces (inluding loopback, but also others) | 55 | # Use addresses from the local network interfaces (including loopback, but also others) |
56 | USE_LOCALADDR = YES | 56 | USE_LOCALADDR = YES |
57 | ENABLE_UPNP = NO | 57 | ENABLE_UPNP = NO |
58 | 58 | ||
diff --git a/src/rps/rps.conf.in b/src/rps/rps.conf.in index 9619c9889..8c7098747 100644 --- a/src/rps/rps.conf.in +++ b/src/rps/rps.conf.in | |||
@@ -27,7 +27,7 @@ FILENAME_VALID_PEERS = $GNUNET_DATA_HOME/rps/valid_peers.txt | |||
27 | # So, 50 is enough for a network of size 50^3 = 125000 | 27 | # So, 50 is enough for a network of size 50^3 = 125000 |
28 | MINSIZE = 10 | 28 | MINSIZE = 10 |
29 | 29 | ||
30 | # The probability whith which we want a sampler element to have observed all | 30 | # The probability with which we want a sampler element to have observed all |
31 | # peer ids in the network at least | 31 | # peer ids in the network at least |
32 | DESIRED_PROBABILITY = 0.9 | 32 | DESIRED_PROBABILITY = 0.9 |
33 | 33 | ||
diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf index 68f3982ec..2b1101786 100644 --- a/src/rps/test_rps.conf +++ b/src/rps/test_rps.conf | |||
@@ -51,7 +51,7 @@ SETUP_TIMEOUT = 2 m | |||
51 | WORKBITS = 0 | 51 | WORKBITS = 0 |
52 | 52 | ||
53 | [nat] | 53 | [nat] |
54 | # Use addresses from the local network interfaces (inluding loopback, but also others) | 54 | # Use addresses from the local network interfaces (including loopback, but also others) |
55 | USE_LOCALADDR = YES | 55 | USE_LOCALADDR = YES |
56 | ENABLE_UPNP = NO | 56 | ENABLE_UPNP = NO |
57 | 57 | ||
diff --git a/src/secretsharing/test_secretsharing.conf b/src/secretsharing/test_secretsharing.conf index 7c8e45480..9cbe3ebb1 100644 --- a/src/secretsharing/test_secretsharing.conf +++ b/src/secretsharing/test_secretsharing.conf | |||
@@ -22,7 +22,7 @@ OVERLAY_TOPOLOGY = CLIQUE | |||
22 | SERVERS = | 22 | SERVERS = |
23 | 23 | ||
24 | [nat] | 24 | [nat] |
25 | # Use addresses from the local network interfaces (inluding loopback, but also others) | 25 | # Use addresses from the local network interfaces (including loopback, but also others) |
26 | USE_LOCALADDR = YES | 26 | USE_LOCALADDR = YES |
27 | 27 | ||
28 | # Disable IPv6 support | 28 | # Disable IPv6 support |
diff --git a/src/set/test_set.conf b/src/set/test_set.conf index 21fe984f8..f9b4547e9 100644 --- a/src/set/test_set.conf +++ b/src/set/test_set.conf | |||
@@ -22,7 +22,7 @@ USE_LOCALADDR = YES | |||
22 | NO_IO = YES | 22 | NO_IO = YES |
23 | 23 | ||
24 | [nat] | 24 | [nat] |
25 | # Use addresses from the local network interfaces (inluding loopback, but also others) | 25 | # Use addresses from the local network interfaces (including loopback, but also others) |
26 | USE_LOCALADDR = YES | 26 | USE_LOCALADDR = YES |
27 | 27 | ||
28 | # Disable IPv6 support | 28 | # Disable IPv6 support |
diff --git a/src/seti/test_seti.conf b/src/seti/test_seti.conf index c87433419..aa4678b49 100644 --- a/src/seti/test_seti.conf +++ b/src/seti/test_seti.conf | |||
@@ -22,7 +22,7 @@ USE_LOCALADDR = YES | |||
22 | NO_IO = YES | 22 | NO_IO = YES |
23 | 23 | ||
24 | [nat] | 24 | [nat] |
25 | # Use addresses from the local network interfaces (inluding loopback, but also others) | 25 | # Use addresses from the local network interfaces (including loopback, but also others) |
26 | USE_LOCALADDR = YES | 26 | USE_LOCALADDR = YES |
27 | 27 | ||
28 | # Disable IPv6 support | 28 | # Disable IPv6 support |
diff --git a/src/setu/test_setu.conf b/src/setu/test_setu.conf index 4eaf3f0c0..6d132fc1f 100644 --- a/src/setu/test_setu.conf +++ b/src/setu/test_setu.conf | |||
@@ -22,7 +22,7 @@ USE_LOCALADDR = YES | |||
22 | NO_IO = YES | 22 | NO_IO = YES |
23 | 23 | ||
24 | [nat] | 24 | [nat] |
25 | # Use addresses from the local network interfaces (inluding loopback, but also others) | 25 | # Use addresses from the local network interfaces (including loopback, but also others) |
26 | USE_LOCALADDR = YES | 26 | USE_LOCALADDR = YES |
27 | 27 | ||
28 | # Disable IPv6 support | 28 | # Disable IPv6 support |
diff --git a/src/testbed/barriers.README.org b/src/testbed/barriers.README.org index 40488a0cc..159e1c355 100644 --- a/src/testbed/barriers.README.org +++ b/src/testbed/barriers.README.org | |||
@@ -11,7 +11,7 @@ the barrier. A barrier which is reached is deemed as crossed after all the | |||
11 | peers waiting on it are notified. | 11 | peers waiting on it are notified. |
12 | 12 | ||
13 | The barriers API provides the following functions: | 13 | The barriers API provides the following functions: |
14 | 1) GNUNET_TESTBED_barrier_init(): function to initialse a barrier in the | 14 | 1) GNUNET_TESTBED_barrier_init(): function to initialise a barrier in the |
15 | experiment | 15 | experiment |
16 | 2) GNUNET_TESTBED_barrier_cancel(): function to cancel a barrier which has been | 16 | 2) GNUNET_TESTBED_barrier_cancel(): function to cancel a barrier which has been |
17 | initialised before | 17 | initialised before |
diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in index ac0c9c400..2e9c0038d 100644 --- a/src/testbed/test_testbed_api_barriers.conf.in +++ b/src/testbed/test_testbed_api_barriers.conf.in | |||
@@ -12,7 +12,7 @@ PORT = 12366 | |||
12 | [test-barriers] | 12 | [test-barriers] |
13 | START_ON_DEMAND = NO | 13 | START_ON_DEMAND = NO |
14 | PORT = 12114 | 14 | PORT = 12114 |
15 | BINARY = /will/be/overwriten/in/test_testbed_api_barriers/ | 15 | BINARY = /will/be/overwritten/in/test_testbed_api_barriers/ |
16 | IMMEDIATE_START = YES | 16 | IMMEDIATE_START = YES |
17 | 17 | ||
18 | [fs] | 18 | [fs] |
diff --git a/src/util/util.conf b/src/util/util.conf index d8613f653..4f0860a49 100644 --- a/src/util/util.conf +++ b/src/util/util.conf | |||
@@ -14,7 +14,7 @@ GNUNET_HOME = ${GNUNET_TEST_HOME:-${HOME:-${USERPROFILE}}} | |||
14 | # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html | 14 | # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html |
15 | # for how these should be used. | 15 | # for how these should be used. |
16 | 16 | ||
17 | # Persistant data storage | 17 | # Persistent data storage |
18 | GNUNET_DATA_HOME = ${XDG_DATA_HOME:-$GNUNET_HOME/.local/share}/gnunet/ | 18 | GNUNET_DATA_HOME = ${XDG_DATA_HOME:-$GNUNET_HOME/.local/share}/gnunet/ |
19 | 19 | ||
20 | # Configuration files | 20 | # Configuration files |