make new cadet implementation the default: all tests pass (on my system); however...

diff --git a/src/cadet/.gitignore b/src/cadet/.gitignore
index 096ee06eb99a2da379575e8afd0d7f8393b1f38f..154eabf3bb4393c8958f9280c622280f8e0282bc 100644 (file)
--- 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 48fd03329a63aa585ee8fbda4087a417741ffbde..a6d7627862ed9e453af98f750a10b972aa47c1be 100644 (file)
--- 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 685656ec31e3d5ffb66960cd733c58ccba941fcb..8a4d7bbf8601c1da59829cf117cfb50b60110c4f 100644 (file)
--- 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"