diff --git a/tunnels/client/preconnect/helpers.h b/tunnels/client/preconnect/helpers.h index e0525ce5..fa1f2f5b 100644 --- a/tunnels/client/preconnect/helpers.h +++ b/tunnels/client/preconnect/helpers.h @@ -6,7 +6,7 @@ enum { kPreconnectDelayShort = 10, - kPreconnectDelayHigh = 750 + kPreconnectDelayLong = 750 }; static void addConnection(thread_box_t *box, preconnect_client_con_state_t *con) @@ -100,7 +100,7 @@ static void initiateConnect(tunnel_t *self, bool delay) ev.userdata = cg; cg->t = self; cg->tid = tid; - cg->delay = delay ? kPreconnectDelayHigh : kPreconnectDelayShort; + cg->delay = delay ? kPreconnectDelayLong : kPreconnectDelayShort; hloop_post_event(worker_loop, &ev); } diff --git a/tunnels/client/reverse/helpers.h b/tunnels/client/reverse/helpers.h index bd466983..32094f31 100644 --- a/tunnels/client/reverse/helpers.h +++ b/tunnels/client/reverse/helpers.h @@ -13,9 +13,9 @@ enum { kPreconnectDelayShort = 10, - kPreconnectDelayHigh = 750, - kConnectionStarvationTimeOut = 3000, - kConnectionStarvationTimeOutAfterFirstConfirmation = 15000 + kPreconnectDelayLong = 750, + kConnectionStarvationTimeOut = 15000, + kConnectionStarvationTimeOutAfterFirstConfirmation = 5000 }; static void onLinePausedU(void *cstate) @@ -135,7 +135,7 @@ static void initiateConnect(tunnel_t *self, uint8_t tid, bool delay) ev.userdata = cg; cg->t = self; cg->tid = tid; - cg->delay = delay ? kPreconnectDelayHigh : kPreconnectDelayShort; + cg->delay = delay ? kPreconnectDelayLong : kPreconnectDelayShort; hloop_post_event(worker_loop, &ev); } diff --git a/ww/ww.c b/ww/ww.c index b45cd31f..8338058e 100644 --- a/ww/ww.c +++ b/ww/ww.c @@ -130,7 +130,7 @@ static HTHREAD_ROUTINE(worker_thread) // NOLINT return 0; } -void createWW(ww_construction_data_t init_data) +void createWW(const ww_construction_data_t init_data) { if (init_data.core_logger_data.log_file_path) {