From a3e5e258714ea71f204be398d1384a3cdfd11e56 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 25 Jan 2017 21:05:52 +0100 Subject: [PATCH] make new cadet implementation the default: all tests pass (on my system); however, implementation is NOT complete --- src/cadet/.gitignore | 1 + src/cadet/cadet.conf.in | 2 +- src/cadet/gnunet-service-cadet-new_paths.c | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/cadet/.gitignore b/src/cadet/.gitignore index 096ee06eb..154eabf3b 100644 --- a/src/cadet/.gitignore +++ b/src/cadet/.gitignore @@ -19,3 +19,4 @@ test_cadet_5_speed_reliable test_cadet_5_speed_reliable_backwards test_cadet_local test_cadet_single +gnunet-service-cadet-new diff --git a/src/cadet/cadet.conf.in b/src/cadet/cadet.conf.in index 48fd03329..a6d762786 100644 --- a/src/cadet/cadet.conf.in +++ b/src/cadet/cadet.conf.in @@ -3,7 +3,7 @@ FORCESTART = YES AUTOSTART = @AUTOSTART@ @JAVAPORT@PORT = 2096 HOSTNAME = localhost -BINARY = gnunet-service-cadet +BINARY = gnunet-service-cadet-new # PREFIX = valgrind --leak-check=yes ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; diff --git a/src/cadet/gnunet-service-cadet-new_paths.c b/src/cadet/gnunet-service-cadet-new_paths.c index 685656ec3..8a4d7bbf8 100644 --- a/src/cadet/gnunet-service-cadet-new_paths.c +++ b/src/cadet/gnunet-service-cadet-new_paths.c @@ -24,6 +24,11 @@ * @author Christian Grothoff * * TODO: + * - currently only allowing one unique connection per path, + * but need to allow 2 in case WE are establishing one from A to B + * while at the same time B establishes one to A. + * Also, must not ASSERT if B establishes a 2nd one to us. + * Need to have some reasonable tie-breaking to only keep ONE. * - path desirability score calculations are not done */ #include "platform.h" -- 2.25.1