diff options
author | t3sserakt <t3ss@posteo.de> | 2020-07-21 12:30:37 +0200 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2020-07-21 12:30:37 +0200 |
commit | 5fa1c7dc809aebb55ef062cb3a2757c54eb6b7e7 (patch) | |
tree | c26167460724fea683ef51a88ffd93d1fa830412 /src/core | |
parent | 17d84245fdfeeb1a6da4ffb97898903cb55f702c (diff) | |
parent | 7f4ddbcab8598e3d5e29c23ce883cdfa664408f1 (diff) | |
download | gnunet-5fa1c7dc809aebb55ef062cb3a2757c54eb6b7e7.tar.gz gnunet-5fa1c7dc809aebb55ef062cb3a2757c54eb6b7e7.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/core_api.c | 2 | ||||
-rw-r--r-- | src/core/test_core_api.c | 4 | ||||
-rw-r--r-- | src/core/test_core_api_reliability.c | 10 | ||||
-rw-r--r-- | src/core/test_core_api_start_only.c | 4 | ||||
-rw-r--r-- | src/core/test_core_quota_asymmetric_recv_limited_peer1.conf | 20 | ||||
-rw-r--r-- | src/core/test_core_quota_asymmetric_recv_limited_peer2.conf | 20 | ||||
-rw-r--r-- | src/core/test_core_quota_asymmetric_send_limit_peer1.conf | 20 | ||||
-rw-r--r-- | src/core/test_core_quota_asymmetric_send_limit_peer2.conf | 24 | ||||
-rw-r--r-- | src/core/test_core_quota_compliance.c | 4 | ||||
-rw-r--r-- | src/core/test_core_quota_peer1.conf | 69 | ||||
-rw-r--r-- | src/core/test_core_quota_peer2.conf | 60 |
11 files changed, 117 insertions, 120 deletions
diff --git a/src/core/core_api.c b/src/core/core_api.c index d24378654..81118693d 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c | |||
@@ -745,7 +745,7 @@ GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle) | |||
745 | GNUNET_MQ_destroy (handle->mq); | 745 | GNUNET_MQ_destroy (handle->mq); |
746 | handle->mq = NULL; | 746 | handle->mq = NULL; |
747 | } | 747 | } |
748 | GNUNET_free_non_null (handle->handlers); | 748 | GNUNET_free (handle->handlers); |
749 | GNUNET_free (handle); | 749 | GNUNET_free (handle); |
750 | } | 750 | } |
751 | 751 | ||
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index dda60215d..064964292 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c | |||
@@ -251,8 +251,8 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
251 | 251 | ||
252 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); | 252 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); |
253 | p->cfg = GNUNET_CONFIGURATION_create (); | 253 | p->cfg = GNUNET_CONFIGURATION_create (); |
254 | p->arm_proc = GNUNET_OS_start_process (GNUNET_YES, | 254 | p->arm_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR |
255 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 255 | | GNUNET_OS_USE_PIPE_CONTROL, |
256 | NULL, | 256 | NULL, |
257 | NULL, | 257 | NULL, |
258 | NULL, | 258 | NULL, |
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index b510e8993..debf808ca 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c | |||
@@ -384,7 +384,7 @@ process_hello (void *cls, | |||
384 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 384 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
385 | "Received (my) `%s' from transport service\n", "HELLO"); | 385 | "Received (my) `%s' from transport service\n", "HELLO"); |
386 | GNUNET_assert (message != NULL); | 386 | GNUNET_assert (message != NULL); |
387 | GNUNET_free_non_null (p->hello); | 387 | GNUNET_free (p->hello); |
388 | p->hello = GNUNET_copy_message (message); | 388 | p->hello = GNUNET_copy_message (message); |
389 | if ((p == &p1) && (NULL == p2.oh)) | 389 | if ((p == &p1) && (NULL == p2.oh)) |
390 | p2.oh = GNUNET_TRANSPORT_offer_hello (p2.cfg, | 390 | p2.oh = GNUNET_TRANSPORT_offer_hello (p2.cfg, |
@@ -419,8 +419,8 @@ setup_peer (struct PeerContext *p, | |||
419 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); | 419 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); |
420 | p->cfg = GNUNET_CONFIGURATION_create (); | 420 | p->cfg = GNUNET_CONFIGURATION_create (); |
421 | p->arm_proc | 421 | p->arm_proc |
422 | = GNUNET_OS_start_process (GNUNET_YES, | 422 | = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR |
423 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 423 | | GNUNET_OS_USE_PIPE_CONTROL, |
424 | NULL, NULL, NULL, | 424 | NULL, NULL, NULL, |
425 | binary, | 425 | binary, |
426 | "gnunet-service-arm", | 426 | "gnunet-service-arm", |
@@ -523,8 +523,8 @@ main (int argc, | |||
523 | &ok); | 523 | &ok); |
524 | stop_arm (&p1); | 524 | stop_arm (&p1); |
525 | stop_arm (&p2); | 525 | stop_arm (&p2); |
526 | GNUNET_free_non_null (p1.hello); | 526 | GNUNET_free (p1.hello); |
527 | GNUNET_free_non_null (p2.hello); | 527 | GNUNET_free (p2.hello); |
528 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1"); | 528 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1"); |
529 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2"); | 529 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2"); |
530 | 530 | ||
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index 3cbe50d72..007131134 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c | |||
@@ -118,8 +118,8 @@ setup_peer (struct PeerContext *p, | |||
118 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); | 118 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); |
119 | p->cfg = GNUNET_CONFIGURATION_create (); | 119 | p->cfg = GNUNET_CONFIGURATION_create (); |
120 | p->arm_proc = | 120 | p->arm_proc = |
121 | GNUNET_OS_start_process (GNUNET_YES, | 121 | GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR |
122 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 122 | | GNUNET_OS_USE_PIPE_CONTROL, |
123 | NULL, NULL, NULL, | 123 | NULL, NULL, NULL, |
124 | binary, | 124 | binary, |
125 | "gnunet-service-arm", | 125 | "gnunet-service-arm", |
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf index fa2d64474..766a2e73b 100644 --- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf +++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf | |||
@@ -32,20 +32,20 @@ PORT = 12489 | |||
32 | PORT = 12491 | 32 | PORT = 12491 |
33 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-ats.sock | 33 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-ats.sock |
34 | # UNSPECIFIED | 34 | # UNSPECIFIED |
35 | UNSPECIFIED_QUOTA_IN = 1 MB | 35 | UNSPECIFIED_QUOTA_IN = 100 MiB |
36 | UNSPECIFIED_QUOTA_OUT = 1 MB | 36 | UNSPECIFIED_QUOTA_OUT = 100 MiB |
37 | # LOOPBACK | 37 | # LOOPBACK |
38 | LOOPBACK_QUOTA_IN = 1 MB | 38 | LOOPBACK_QUOTA_IN = 100 MiB |
39 | LOOPBACK_QUOTA_OUT = 1 MB | 39 | LOOPBACK_QUOTA_OUT = 100 MiB |
40 | # LAN | 40 | # LAN |
41 | LAN_QUOTA_IN = 1 MB | 41 | LAN_QUOTA_IN = 100 MiB |
42 | LAN_QUOTA_OUT = 1 MB | 42 | LAN_QUOTA_OUT = 100 MiB |
43 | # WAN | 43 | # WAN |
44 | WAN_QUOTA_IN = 1 MB | 44 | WAN_QUOTA_IN = 100 MiB |
45 | WAN_QUOTA_OUT = 1 MB | 45 | WAN_QUOTA_OUT = 100 MiB |
46 | # WLAN | 46 | # WLAN |
47 | WLAN_QUOTA_IN = 1 MB | 47 | WLAN_QUOTA_IN = 100 MiB |
48 | WLAN_QUOTA_OUT = 1 MB | 48 | WLAN_QUOTA_OUT = 100 MiB |
49 | 49 | ||
50 | 50 | ||
51 | [core] | 51 | [core] |
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf index b2a84f706..30c0bb81f 100644 --- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf +++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf | |||
@@ -31,20 +31,20 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-core.sock | |||
31 | PORT = 22491 | 31 | PORT = 22491 |
32 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-ats.sock | 32 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-ats.sock |
33 | # UNSPECIFIED | 33 | # UNSPECIFIED |
34 | UNSPECIFIED_QUOTA_IN = 10240 | 34 | UNSPECIFIED_QUOTA_IN = 10 MiB |
35 | UNSPECIFIED_QUOTA_OUT = 10240 | 35 | UNSPECIFIED_QUOTA_OUT = 10 MiB |
36 | # LOOPBACK | 36 | # LOOPBACK |
37 | LOOPBACK_QUOTA_IN = 10240 | 37 | LOOPBACK_QUOTA_IN = 10 MiB |
38 | LOOPBACK_QUOTA_OUT = 10240 | 38 | LOOPBACK_QUOTA_OUT = 10 MiB |
39 | # LAN | 39 | # LAN |
40 | LAN_QUOTA_IN = 10240 | 40 | LAN_QUOTA_IN = 10 MiB |
41 | LAN_QUOTA_OUT = 10240 | 41 | LAN_QUOTA_OUT = 10 MiB |
42 | # WAN | 42 | # WAN |
43 | WAN_QUOTA_IN = 10240 | 43 | WAN_QUOTA_IN = 10 MiB |
44 | WAN_QUOTA_OUT = 10240 | 44 | WAN_QUOTA_OUT = 10 MiB |
45 | # WLAN | 45 | # WLAN |
46 | WLAN_QUOTA_IN = 10240 | 46 | WLAN_QUOTA_IN = 10 MiB |
47 | WLAN_QUOTA_OUT = 10240 | 47 | WLAN_QUOTA_OUT = 10 MiB |
48 | 48 | ||
49 | [transport-tcp] | 49 | [transport-tcp] |
50 | PORT = 22467 | 50 | PORT = 22467 |
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf index 6b416f580..4a9f483d6 100644 --- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf +++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf | |||
@@ -32,20 +32,20 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-transport.sock | |||
32 | PORT = 12491 | 32 | PORT = 12491 |
33 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-ats.sock | 33 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-ats.sock |
34 | # UNSPECIFIED | 34 | # UNSPECIFIED |
35 | UNSPECIFIED_QUOTA_IN = 10240 | 35 | UNSPECIFIED_QUOTA_IN = 10 MiB |
36 | UNSPECIFIED_QUOTA_OUT = 10240 | 36 | UNSPECIFIED_QUOTA_OUT = 10 MiB |
37 | # LOOPBACK | 37 | # LOOPBACK |
38 | LOOPBACK_QUOTA_IN = 10240 | 38 | LOOPBACK_QUOTA_IN = 10 MiB |
39 | LOOPBACK_QUOTA_OUT = 10240 | 39 | LOOPBACK_QUOTA_OUT = 10 MiB |
40 | # LAN | 40 | # LAN |
41 | LAN_QUOTA_IN = 10240 | 41 | LAN_QUOTA_IN = 10 MiB |
42 | LAN_QUOTA_OUT = 10240 | 42 | LAN_QUOTA_OUT = 10 MiB |
43 | # WAN | 43 | # WAN |
44 | WAN_QUOTA_IN = 10240 | 44 | WAN_QUOTA_IN = 10 MiB |
45 | WAN_QUOTA_OUT = 10240 | 45 | WAN_QUOTA_OUT = 10 MiB |
46 | # WLAN | 46 | # WLAN |
47 | WLAN_QUOTA_IN = 10240 | 47 | WLAN_QUOTA_IN = 10 MiB |
48 | WLAN_QUOTA_OUT = 10240 | 48 | WLAN_QUOTA_OUT = 10 MiB |
49 | 49 | ||
50 | [core] | 50 | [core] |
51 | PORT = 12490 | 51 | PORT = 12490 |
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf index 05ea062e6..36434461c 100644 --- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf +++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf | |||
@@ -29,27 +29,27 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-core.sock | |||
29 | [ats] | 29 | [ats] |
30 | PORT = 22491 | 30 | PORT = 22491 |
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-ats.sock | 31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-ats.sock |
32 | WAN_QUOTA_IN = 1 MB | 32 | WAN_QUOTA_IN = 100 MiB |
33 | WAN_QUOTA_OUT = 1 MB | 33 | WAN_QUOTA_OUT = 100 MiB |
34 | 34 | ||
35 | [ats] | 35 | [ats] |
36 | PORT = 12471 | 36 | PORT = 12471 |
37 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-ats.sock | 37 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-ats.sock |
38 | # UNSPECIFIED | 38 | # UNSPECIFIED |
39 | UNSPECIFIED_QUOTA_IN = 1 MB | 39 | UNSPECIFIED_QUOTA_IN = 100 MiB |
40 | UNSPECIFIED_QUOTA_OUT = 1 MB | 40 | UNSPECIFIED_QUOTA_OUT = 100 MiB |
41 | # LOOPBACK | 41 | # LOOPBACK |
42 | LOOPBACK_QUOTA_IN = 1 MB | 42 | LOOPBACK_QUOTA_IN = 100 MiB |
43 | LOOPBACK_QUOTA_OUT = 1 MB | 43 | LOOPBACK_QUOTA_OUT = 100 MiB |
44 | # LAN | 44 | # LAN |
45 | LAN_QUOTA_IN = 1 MB | 45 | LAN_QUOTA_IN = 100 MiB |
46 | LAN_QUOTA_OUT = 1 MB | 46 | LAN_QUOTA_OUT = 100 MiB |
47 | # WAN | 47 | # WAN |
48 | WAN_QUOTA_IN = 1 MB | 48 | WAN_QUOTA_IN = 100 MiB |
49 | WAN_QUOTA_OUT = 1 MB | 49 | WAN_QUOTA_OUT = 100 MiB |
50 | # WLAN | 50 | # WLAN |
51 | WLAN_QUOTA_IN = 1 MB | 51 | WLAN_QUOTA_IN = 100 MiB |
52 | WLAN_QUOTA_OUT = 1 MB | 52 | WLAN_QUOTA_OUT = 100 MiB |
53 | 53 | ||
54 | [transport-tcp] | 54 | [transport-tcp] |
55 | PORT = 22467 | 55 | PORT = 22467 |
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 67f8bb224..cf2da3d97 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -570,8 +570,8 @@ setup_peer (struct PeerContext *p, | |||
570 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); | 570 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); |
571 | p->cfg = GNUNET_CONFIGURATION_create (); | 571 | p->cfg = GNUNET_CONFIGURATION_create (); |
572 | p->arm_proc = | 572 | p->arm_proc = |
573 | GNUNET_OS_start_process (GNUNET_YES, | 573 | GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR |
574 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 574 | | GNUNET_OS_USE_PIPE_CONTROL, |
575 | NULL, NULL, NULL, | 575 | NULL, NULL, NULL, |
576 | binary, | 576 | binary, |
577 | "gnunet-service-arm", | 577 | "gnunet-service-arm", |
diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf index ea4fa273c..ec592f778 100644 --- a/src/core/test_core_quota_peer1.conf +++ b/src/core/test_core_quota_peer1.conf | |||
@@ -1,61 +1,58 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-core-quota-sym-peer-1/ | 3 | GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-core-peer-1/ |
4 | |||
5 | [transport-tcp] | ||
6 | PORT = 12468 | ||
7 | 4 | ||
8 | [arm] | 5 | [arm] |
9 | PORT = 12476 | 6 | PORT = 12460 |
10 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-arm.sock | 7 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock |
11 | 8 | ||
12 | [statistics] | 9 | [statistics] |
13 | PORT = 12477 | 10 | PORT = 12461 |
14 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-statistics.sock | ||
15 | 11 | ||
16 | [resolver] | 12 | [resolver] |
17 | PORT = 12474 | 13 | PORT = 12462 |
18 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-resolver.sock | 14 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock |
19 | 15 | ||
20 | [peerinfo] | 16 | [peerinfo] |
21 | PORT = 12479 | 17 | PORT = 12463 |
22 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-peerinfo.sock | 18 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock |
23 | 19 | ||
24 | [transport] | 20 | [transport] |
25 | PORT = 12475 | 21 | PORT = 12464 |
26 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-transport.sock | 22 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock |
27 | 23 | ||
28 | [nat] | 24 | [core] |
29 | port = 12481 | 25 | PORT = 12475 |
30 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-nat.sock | 26 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-core.sock |
31 | 27 | ||
32 | [ats] | 28 | [ats] |
33 | PORT = 12471 | 29 | PORT = 12476 |
34 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-ats.sock | 30 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock |
35 | # UNSPECIFIED | 31 | # UNSPECIFIED |
36 | UNSPECIFIED_QUOTA_IN = 10240 | 32 | UNSPECIFIED_QUOTA_IN = 10 MiB |
37 | UNSPECIFIED_QUOTA_OUT = 10240 | 33 | UNSPECIFIED_QUOTA_OUT = 10 MiB |
38 | # LOOPBACK | 34 | # LOOPBACK |
39 | LOOPBACK_QUOTA_IN = 10240 | 35 | LOOPBACK_QUOTA_IN = 10 MiB |
40 | LOOPBACK_QUOTA_OUT = 10240 | 36 | LOOPBACK_QUOTA_OUT = 10 MiB |
41 | # LAN | 37 | # LAN |
42 | LAN_QUOTA_IN = 10240 | 38 | LAN_QUOTA_IN = 10 MiB |
43 | LAN_QUOTA_OUT = 10240 | 39 | LAN_QUOTA_OUT = 10 MiB |
44 | # WAN | 40 | # WAN |
45 | WAN_QUOTA_IN = 10240 | 41 | WAN_QUOTA_IN = 10 MiB |
46 | WAN_QUOTA_OUT = 10240 | 42 | WAN_QUOTA_OUT = 10 MiB |
47 | # WLAN | 43 | # WLAN |
48 | WLAN_QUOTA_IN = 10240 | 44 | WLAN_QUOTA_IN = 10 MiB |
49 | WLAN_QUOTA_OUT = 10240 | 45 | WLAN_QUOTA_OUT = 10 MiB |
50 | 46 | ||
51 | [core] | ||
52 | PORT = 12480 | ||
53 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-core.sock | ||
54 | 47 | ||
55 | [ats] | 48 | [transport-tcp] |
56 | PORT = 12481 | 49 | PORT = 12467 |
57 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-ats.sock | ||
58 | 50 | ||
59 | [transport-udp] | 51 | [transport-udp] |
60 | PORT = 12482 | 52 | PORT = 12468 |
53 | |||
54 | [transport-unix] | ||
55 | PORT = 12469 | ||
61 | 56 | ||
57 | [transport-http] | ||
58 | PORT = 12470 | ||
diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf index 03c684cff..65d0710bb 100644 --- a/src/core/test_core_quota_peer2.conf +++ b/src/core/test_core_quota_peer2.conf | |||
@@ -1,53 +1,50 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-core-quota-sym-peer-2/ | 3 | GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-core-peer-2/ |
4 | 4 | ||
5 | [arm] | 5 | [arm] |
6 | PORT = 22476 | 6 | PORT = 22460 |
7 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-arm.sock | 7 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock |
8 | 8 | ||
9 | [statistics] | 9 | [statistics] |
10 | PORT = 22477 | 10 | PORT = 22461 |
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-statistics.sock | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock |
12 | 12 | ||
13 | [resolver] | 13 | [resolver] |
14 | PORT = 22474 | 14 | PORT = 22462 |
15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-resolver.sock | 15 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock |
16 | 16 | ||
17 | [peerinfo] | 17 | [peerinfo] |
18 | PORT = 22479 | 18 | PORT = 22463 |
19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-peerinfo.sock | 19 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock |
20 | 20 | ||
21 | [transport] | 21 | [transport] |
22 | PORT = 22475 | 22 | PORT = 22464 |
23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-transport.sock | 23 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock |
24 | 24 | ||
25 | [core] | 25 | [core] |
26 | PORT = 22480 | 26 | PORT = 22475 |
27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-core.sock | 27 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-core.sock |
28 | |||
29 | [nat] | ||
30 | PORT = 22481 | ||
31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2.service-nat.sock | ||
32 | 28 | ||
33 | [ats] | 29 | [ats] |
34 | PORT = 22482 | 30 | PORT = 22476 |
35 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-ats.sock | 31 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock |
36 | # UNSPECIFIED | 32 | # UNSPECIFIED |
37 | UNSPECIFIED_QUOTA_IN = 10240 | 33 | UNSPECIFIED_QUOTA_IN = 10 MiB |
38 | UNSPECIFIED_QUOTA_OUT = 10240 | 34 | UNSPECIFIED_QUOTA_OUT = 10 MiB |
39 | # LOOPBACK | 35 | # LOOPBACK |
40 | LOOPBACK_QUOTA_IN = 10240 | 36 | LOOPBACK_QUOTA_IN = 10 MiB |
41 | LOOPBACK_QUOTA_OUT = 10240 | 37 | LOOPBACK_QUOTA_OUT = 10 MiB |
42 | # LAN | 38 | # LAN |
43 | LAN_QUOTA_IN = 10240 | 39 | LAN_QUOTA_IN = 10 MiB |
44 | LAN_QUOTA_OUT = 10240 | 40 | LAN_QUOTA_OUT = 10 MiB |
45 | # WAN | 41 | # WAN |
46 | WAN_QUOTA_IN = 10240 | 42 | WAN_QUOTA_IN = 10 MiB |
47 | WAN_QUOTA_OUT = 10240 | 43 | WAN_QUOTA_OUT = 10 MiB |
48 | # WLAN | 44 | # WLAN |
49 | WLAN_QUOTA_IN = 10240 | 45 | WLAN_QUOTA_IN = 10 MiB |
50 | WLAN_QUOTA_OUT = 10240 | 46 | WLAN_QUOTA_OUT = 10 MiB |
47 | |||
51 | 48 | ||
52 | [transport-tcp] | 49 | [transport-tcp] |
53 | PORT = 22467 | 50 | PORT = 22467 |
@@ -55,5 +52,8 @@ PORT = 22467 | |||
55 | [transport-udp] | 52 | [transport-udp] |
56 | PORT = 22468 | 53 | PORT = 22468 |
57 | 54 | ||
58 | [transport-http] | 55 | [transport-unix] |
59 | PORT = 22469 | 56 | PORT = 22469 |
57 | |||
58 | [transport-http] | ||
59 | PORT = 22470 | ||