diff --git a/measurement_main.py b/measurement_main.py index 96d3bbc..cd6aa16 100755 --- a/measurement_main.py +++ b/measurement_main.py @@ -810,12 +810,12 @@ class Client: try: try: iperf_return = subprocess.call(iperf_command, timeout=float(time) + TIMEOUT_OFFSET) - is_measurement_done = True except: - print_message("iPerf timed out. Retry...") + print_message("iPerf timed out...") reconnect_modem() except KeyboardInterrupt: exit() + is_measurement_done = True sleep(4) processHandler.kill_all() congestion_control_index = (congestion_control_index + 1) % len( @@ -878,12 +878,12 @@ class Client: try: try: iperf_return = subprocess.call(iperf_command, timeout=float(time) + TIMEOUT_OFFSET) - is_measurement_done = True except: - print_message("iPerf timed out. Retry...") + print_message("iPerf timed out...") reconnect_modem() except KeyboardInterrupt: exit() + is_measurement_done = True processHandler.kill_all() congestion_control_index = (congestion_control_index + 1) % len( tcp_algo