diff options
author | xrs <xrs@mail36.net> | 2018-11-16 18:22:09 +0100 |
---|---|---|
committer | xrs <xrs@mail36.net> | 2018-11-16 18:22:09 +0100 |
commit | ec3b834e1a8a8ce93f10221952b595d05e2c72a3 (patch) | |
tree | 63135c331bd7a49bb8b2a387e9027a7a41dd0336 /src/cadet | |
parent | d25f1b4026d5c2c195592daf092377eccfd2d71a (diff) | |
parent | 35e5be0b0b4c7aea5a56d6a62333ab3a964a2972 (diff) | |
download | gnunet-ec3b834e1a8a8ce93f10221952b595d05e2c72a3.tar.gz gnunet-ec3b834e1a8a8ce93f10221952b595d05e2c72a3.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src/cadet')
-rw-r--r-- | src/cadet/gnunet-service-cadet_paths.c | 6 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_tunnels.c | 2 | ||||
-rw-r--r-- | src/cadet/test_cadet.conf | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/cadet/gnunet-service-cadet_paths.c b/src/cadet/gnunet-service-cadet_paths.c index 40f464e9b..7769a6043 100644 --- a/src/cadet/gnunet-service-cadet_paths.c +++ b/src/cadet/gnunet-service-cadet_paths.c | |||
@@ -354,7 +354,7 @@ check_match (void *cls, | |||
354 | (off + 1 != cm_ctx->cpath_length) ) | 354 | (off + 1 != cm_ctx->cpath_length) ) |
355 | { | 355 | { |
356 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 356 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
357 | "check_match missmatch because path %s is too long (%u vs. %u vs. %u)\n", | 357 | "check_match mismatch because path %s is too long (%u vs. %u vs. %u)\n", |
358 | GCPP_2s (path), | 358 | GCPP_2s (path), |
359 | path->entries_length, | 359 | path->entries_length, |
360 | off + 1, | 360 | off + 1, |
@@ -367,10 +367,10 @@ check_match (void *cls, | |||
367 | i)) | 367 | i)) |
368 | { | 368 | { |
369 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 369 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
370 | "check_match path %s missmatches at offset %u\n", | 370 | "check_match path %s mismatches at offset %u\n", |
371 | GCPP_2s (path), | 371 | GCPP_2s (path), |
372 | i); | 372 | i); |
373 | return GNUNET_YES; /* missmatch, ignore */ | 373 | return GNUNET_YES; /* mismatch, ignore */ |
374 | } | 374 | } |
375 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 375 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
376 | "check_match found match with path %s\n", | 376 | "check_match found match with path %s\n", |
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index 1e7a8e086..874c7e706 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c | |||
@@ -1983,7 +1983,7 @@ GCT_handle_kx_auth (struct CadetTConnection *ct, | |||
1983 | 1, | 1983 | 1, |
1984 | GNUNET_NO); | 1984 | GNUNET_NO); |
1985 | LOG (GNUNET_ERROR_TYPE_WARNING, | 1985 | LOG (GNUNET_ERROR_TYPE_WARNING, |
1986 | "KX AUTH missmatch!\n"); | 1986 | "KX AUTH mismatch!\n"); |
1987 | #if DEBUG_KX | 1987 | #if DEBUG_KX |
1988 | { | 1988 | { |
1989 | struct GNUNET_CRYPTO_EcdhePublicKey ephemeral_key; | 1989 | struct GNUNET_CRYPTO_EcdhePublicKey ephemeral_key; |
diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf index 5ad67fec2..30e496aff 100644 --- a/src/cadet/test_cadet.conf +++ b/src/cadet/test_cadet.conf | |||
@@ -98,3 +98,7 @@ START_ON_DEMAND = NO | |||
98 | [topology] | 98 | [topology] |
99 | IMMEDIATE_START = NO | 99 | IMMEDIATE_START = NO |
100 | START_ON_DEMAND = NO | 100 | START_ON_DEMAND = NO |
101 | |||
102 | [rps] | ||
103 | IMMEDIATE_START = NO | ||
104 | START_ON_DEMAND = NO | ||