summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Winstein <keithw@mit.edu>2013-06-04 17:38:54 +0200
committerKeith Winstein <keithw@mit.edu>2013-06-04 17:38:54 +0200
commit979c2a1cb7e61998f2b6ffec0b019167bd2be616 (patch)
treede09948aec565b201f62c659139d1cb46ad0ff8f
parentf960a8bcf56294ca7aafe3c14fc8c8c4c3941535 (diff)
Parameter set to save bandwidth on ultra-constrained linkslowbandwidth
-rw-r--r--src/frontend/stmclient.cc2
-rw-r--r--src/frontend/terminaloverlay.h2
-rw-r--r--src/network/transportsender.cc4
-rw-r--r--src/network/transportsender.h8
4 files changed, 9 insertions, 7 deletions
diff --git a/src/frontend/stmclient.cc b/src/frontend/stmclient.cc
index c2ff2a5..0be39aa 100644
--- a/src/frontend/stmclient.cc
+++ b/src/frontend/stmclient.cc
@@ -249,7 +249,7 @@ void STMClient::main_init( void )
network = new Network::Transport< Network::UserStream, Terminal::Complete >( blank, local_terminal,
key.c_str(), ip.c_str(), port );
- network->set_send_delay( 1 ); /* minimal delay on outgoing keystrokes */
+ network->set_send_delay( 400 ); /* minimal delay on outgoing keystrokes */
/* tell server the size of the terminal */
network->get_current_state().push_back( Parser::Resize( window_size.ws_col, window_size.ws_row ) );
diff --git a/src/frontend/terminaloverlay.h b/src/frontend/terminaloverlay.h
index e196019..2e189cd 100644
--- a/src/frontend/terminaloverlay.h
+++ b/src/frontend/terminaloverlay.h
@@ -294,7 +294,7 @@ namespace Overlay {
last_quick_confirmation( 0 ),
send_interval( 250 ),
last_height( 0 ), last_width( 0 ),
- display_preference( Adaptive )
+ display_preference( Experimental )
{
}
};
diff --git a/src/network/transportsender.cc b/src/network/transportsender.cc
index e641655..13b7418 100644
--- a/src/network/transportsender.cc
+++ b/src/network/transportsender.cc
@@ -59,7 +59,7 @@ TransportSender<MyState>::TransportSender( Connection *s_connection, MyState &in
shutdown_start( -1 ),
ack_num( 0 ),
pending_data_ack( false ),
- SEND_MINDELAY( 8 ),
+ SEND_MINDELAY( 500 ),
last_heard( 0 ),
prng(),
mindelay_clock( -1 )
@@ -298,6 +298,8 @@ const string TransportSender<MyState>::make_chaff( void )
const size_t CHAFF_MAX = 16;
const size_t chaff_len = prng.uint8() % (CHAFF_MAX + 1);
+ return string(); /* disable chaff */
+
char chaff[ CHAFF_MAX ];
prng.fill( chaff, chaff_len );
return string( chaff, chaff_len );
diff --git a/src/network/transportsender.h b/src/network/transportsender.h
index 572c47f..a363c8f 100644
--- a/src/network/transportsender.h
+++ b/src/network/transportsender.h
@@ -49,10 +49,10 @@ using namespace TransportBuffers;
namespace Network {
/* timing parameters */
- const int SEND_INTERVAL_MIN = 20; /* ms between frames */
- const int SEND_INTERVAL_MAX = 250; /* ms between frames */
- const int ACK_INTERVAL = 3000; /* ms between empty acks */
- const int ACK_DELAY = 100; /* ms before delayed ack */
+ const int SEND_INTERVAL_MIN = 1000; /* ms between frames */
+ const int SEND_INTERVAL_MAX = 1001; /* ms between frames */
+ const int ACK_INTERVAL = 60000; /* ms between empty acks */
+ const int ACK_DELAY = 1000; /* ms before delayed ack */
const int SHUTDOWN_RETRIES = 16; /* number of shutdown packets to send before giving up */
const int ACTIVE_RETRY_TIMEOUT = 10000; /* attempt to resend at frame rate */