From 9398f8eebf700876ba7f7b7f5eb00d0cfe7ac0f6 Mon Sep 17 00:00:00 2001 From: firewave Date: Sun, 28 Apr 2024 15:25:45 +0200 Subject: [PATCH 1/4] donate-cpu-server.py: bumped version --- tools/donate-cpu-server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/donate-cpu-server.py b/tools/donate-cpu-server.py index 01323f6d8bd..ecdefa80736 100755 --- a/tools/donate-cpu-server.py +++ b/tools/donate-cpu-server.py @@ -26,7 +26,7 @@ # Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/ # Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic # changes) -SERVER_VERSION = "1.3.50" +SERVER_VERSION = "1.3.51" OLD_VERSION = '2.14.0' From db0ebc2c20fec5ba735712ec26f61973527d0bb8 Mon Sep 17 00:00:00 2001 From: firewave Date: Sun, 28 Apr 2024 15:26:14 +0200 Subject: [PATCH 2/4] donate-cpu-server.py: decode data as ascii in `read_data` as that is what we are sending --- tools/donate-cpu-server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/donate-cpu-server.py b/tools/donate-cpu-server.py index ecdefa80736..93f0cab8d41 100755 --- a/tools/donate-cpu-server.py +++ b/tools/donate-cpu-server.py @@ -1221,7 +1221,7 @@ def read_data(connection, cmd, pos_nl, max_data_size, check_done, cmd_name, time bytes_received = connection.recv(1024) if bytes_received: try: - text_received = bytes_received.decode('utf-8', 'ignore') + text_received = bytes_received.decode('ascii', 'ignore') except UnicodeDecodeError as e: print_ts('Error: Decoding failed ({}): {}'.format(cmd_name, e)) data = None From 0d6c14a12782071aec454237faaa3008855e8a18 Mon Sep 17 00:00:00 2001 From: firewave Date: Sun, 28 Apr 2024 15:27:47 +0200 Subject: [PATCH 3/4] fixed #12672 - donate-cpu-server.py: corrected the condition for the maximum allowed data exceeded message I had this originally but added an potential additional read on top in case a previous read returned less than 1024 bytes. --- tools/donate-cpu-server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/donate-cpu-server.py b/tools/donate-cpu-server.py index 93f0cab8d41..3244d912bb2 100755 --- a/tools/donate-cpu-server.py +++ b/tools/donate-cpu-server.py @@ -1243,7 +1243,7 @@ def read_data(connection, cmd, pos_nl, max_data_size, check_done, cmd_name, time print_ts('Timeout occurred ({}).'.format(cmd_name)) data = None - if data and (len(data) >= (max_data_size + 1024)): + if data and (len(data) >= max_data_size): print_ts('Maximum allowed data ({} bytes) exceeded ({}).'.format(max_data_size, cmd_name)) data = None From d35160c5023066347f85a2cb7e5dddcbee4962c2 Mon Sep 17 00:00:00 2001 From: firewave Date: Sat, 27 Apr 2024 01:53:30 +0200 Subject: [PATCH 4/4] refs #12671 - donate-cpu-server.py: increased the maximum allowed data to read --- tools/donate-cpu-server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/donate-cpu-server.py b/tools/donate-cpu-server.py index 3244d912bb2..84901b36d56 100755 --- a/tools/donate-cpu-server.py +++ b/tools/donate-cpu-server.py @@ -1321,7 +1321,7 @@ def server(server_address_port: int, packages: list, packageIndex: int, resultPa connection.close() continue elif cmd.startswith('write\nftp://') or cmd.startswith('write\nhttp://'): - data = read_data(connection, cmd, pos_nl, max_data_size=2 * 1024 * 1024, check_done=True, cmd_name='write') + data = read_data(connection, cmd, pos_nl, max_data_size=2.5 * 1024 * 1024, check_done=True, cmd_name='write') if data is None: continue @@ -1376,7 +1376,7 @@ def server(server_address_port: int, packages: list, packageIndex: int, resultPa generate_package_diff_statistics(filename) continue elif cmd.startswith('write_info\nftp://') or cmd.startswith('write_info\nhttp://'): - data = read_data(connection, cmd, pos_nl, max_data_size=1024 * 1024, check_done=True, cmd_name='write_info') + data = read_data(connection, cmd, pos_nl, max_data_size=7 * 1024 * 1024, check_done=True, cmd_name='write_info') if data is None: continue