From 689747177a2255ee0b23bac38c7734c38501ffd4 Mon Sep 17 00:00:00 2001 From: Victor Grishchenko Date: Wed, 23 Jun 2010 11:24:28 +0200 Subject: [PATCH] svn merge; SConstruct changes --- SConstruct | 10 ++++++++-- TODO | 9 +++++---- send_control.cpp | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/SConstruct b/SConstruct index 6e996de..ef52d27 100644 --- a/SConstruct +++ b/SConstruct @@ -89,14 +89,20 @@ if DEBUG: env.Append(CXXFLAGS="-DDEBUG") env.StaticLibrary ( - target= target, + target='libswift', source = source, LIBS=libs, LIBPATH=libpath ) +env.Program( + target='swift', + source=['swift.cpp','httpgw.cpp'], + CPPPATH=cpppath, + LIBS=[libs,'libswift'], + LIBPATH=libpath+':.' ) + Export("env") Export("libs") Export("libpath") Export("DEBUG") SConscript('tests/SConscript') -SConscript('exec/SConscript') diff --git a/TODO b/TODO index 9e9a414..e4a9343 100644 --- a/TODO +++ b/TODO @@ -48,11 +48,8 @@ MANIFOLD * add NATs to the setup * recover mfold.libswift.org * integrate Windowses -* add WiFi nodes API -* notification if data is retrieved by an external code -* events on data retrieval * pluggable storage NAT @@ -71,4 +68,8 @@ OTHER * Gertjan: separate peer from channel? cng ctrl per peer ? * packing hashes into a single datagram (tracking 1000s) * partial channels / lightweight channels -* socket array is misplaced + +THOUGHTS +* 6 degrees of sep = 3-hop TorrentSmell +* 60% immediately not connectable +* support traffic diff --git a/send_control.cpp b/send_control.cpp index 005b70c..599f844 100644 --- a/send_control.cpp +++ b/send_control.cpp @@ -40,7 +40,7 @@ tint Channel::SwitchSendControl (int control_mode) { SEND_CONTROL_MODES[send_control_],SEND_CONTROL_MODES[control_mode]); switch (control_mode) { case KEEP_ALIVE_CONTROL: - send_interval_ = max(TINT_SEC/10,rtt_avg_); + send_interval_ = rtt_avg_; //max(TINT_SEC/10,rtt_avg_); dev_avg_ = max(TINT_SEC,rtt_avg_); data_out_cap_ = bin64_t::ALL; cwnd_ = 1; -- 2.20.1