From 1f43970e233937bbb3594241b90972c53bb6721f Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 2 Feb 2020 00:01:17 +0100 Subject: [PATCH] Update makefile --- scripts/Makefile | 132 +-------------------------------------------- src/donar_client.c | 2 +- 2 files changed, 3 insertions(+), 131 deletions(-) diff --git a/scripts/Makefile b/scripts/Makefile index 8e3157d..7f4ac7a 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -690,11 +690,7 @@ jan_tor_analysis: jan_battle_normal: ./run-3 \ - 8,jan_battle_normal. \ - orig-client 135000 40 172, \ - orig-client 135000 40 172, \ - orig-client 135000 40 172, \ - orig-client 135000 40 172, \ + 32,jan_battle_normal. \ orig-client 135000 40 172, \ orig-client 135000 40 172, \ orig-client 135000 40 172, \ @@ -703,22 +699,10 @@ jan_battle_normal: dup2-client 135000 40 172 2, \ dup2-client 135000 40 172 2, \ dup2-client 135000 40 172 2, \ - dup2-client 135000 40 172 2, \ - dup2-client 135000 40 172 2, \ - dup2-client 135000 40 172 2, \ - dup2-client 135000 40 172 2, \ lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ @@ -727,14 +711,6 @@ jan_battle_normal: orig-server 135000 40 172, \ orig-server 135000 40 172, \ orig-server 135000 40 172, \ - orig-server 135000 40 172, \ - orig-server 135000 40 172, \ - orig-server 135000 40 172, \ - orig-server 135000 40 172, \ - dup2-server 135000 40 172 2, \ - dup2-server 135000 40 172 2, \ - dup2-server 135000 40 172 2, \ - dup2-server 135000 40 172 2, \ dup2-server 135000 40 172 2, \ dup2-server 135000 40 172 2, \ dup2-server 135000 40 172 2, \ @@ -743,14 +719,6 @@ jan_battle_normal: lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ @@ -770,22 +738,6 @@ jan_battle_normal: tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16. \ tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ @@ -802,22 +754,6 @@ jan_battle_normal: tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16. jan_battle_hardened: @@ -890,11 +826,7 @@ jan_battle_hardened: jan_battle_light: ./run-3 \ - 8,jan_battle_light. \ - orig-client 135000 40 172, \ - orig-client 135000 40 172, \ - orig-client 135000 40 172, \ - orig-client 135000 40 172, \ + 32,jan_battle_light. \ orig-client 135000 40 172, \ orig-client 135000 40 172, \ orig-client 135000 40 172, \ @@ -903,22 +835,10 @@ jan_battle_light: dup2-client 135000 40 172 2, \ dup2-client 135000 40 172 2, \ dup2-client 135000 40 172 2, \ - dup2-client 135000 40 172 2, \ - dup2-client 135000 40 172 2, \ - dup2-client 135000 40 172 2, \ - dup2-client 135000 40 172 2, \ lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ @@ -927,14 +847,6 @@ jan_battle_light: orig-server-single 135000 40 172, \ orig-server-single 135000 40 172, \ orig-server-single 135000 40 172, \ - orig-server-single 135000 40 172, \ - orig-server-single 135000 40 172, \ - orig-server-single 135000 40 172, \ - orig-server-single 135000 40 172, \ - dup2-server-single 135000 40 172 2, \ - dup2-server-single 135000 40 172 2, \ - dup2-server-single 135000 40 172 2, \ - dup2-server-single 135000 40 172 2, \ dup2-server-single 135000 40 172 2, \ dup2-server-single 135000 40 172 2, \ dup2-server-single 135000 40 172 2, \ @@ -943,14 +855,6 @@ jan_battle_light: lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ @@ -970,22 +874,6 @@ jan_battle_light: tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ - tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16. \ tor2 -f /etc/torrc_single_hop_16, \ tor2 -f /etc/torrc_single_hop_16, \ @@ -1002,22 +890,6 @@ jan_battle_light: tor2 -f /etc/torrc_single_hop_16, \ tor2 -f /etc/torrc_single_hop_16, \ tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ - tor2 -f /etc/torrc_single_hop_16, \ tor2 -f /etc/torrc_single_hop_16. diff --git a/src/donar_client.c b/src/donar_client.c index 781f673..aa77b0d 100644 --- a/src/donar_client.c +++ b/src/donar_client.c @@ -154,7 +154,7 @@ void donar_client(struct donar_client_ctx* ctx, struct donar_params* dp) { printf("--- Inited Timer\n"); for (int64_t i = 0; i < dp->links; i++) { - int64_t to_wait_sec = 10 + i * 3; + int64_t to_wait_sec = i * 3; fprintf(stdout, "[%s][donar-client] Triggering socks5 in %ld seconds for port %d\n", current_human_datetime (), to_wait_sec, i+7500); set_timeout(&ctx->evts, 1000 * to_wait_sec, (void*) i, reinit_socks5); }