From 20314b11f21eb5878ba62c85d874528e0e394024 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 15 Jul 2022 07:34:57 +0200 Subject: [PATCH] Fix line ending for MPTCP settings --- debian/changelog | 6 ++++++ omr-admin.py | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 48ae5c3..223fb9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +omr-vps-admin (0.3+20220715) unstable; urgency=medium + + * Fix line ending for MPTCP settings + + -- OpenMPTCProuter Thu, 15 Jui 2022 04:32:00 +0200 + omr-vps-admin (0.3+20220714) unstable; urgency=medium * MPTCP version support diff --git a/omr-admin.py b/omr-admin.py index 815b436..a8e4b4e 100755 --- a/omr-admin.py +++ b/omr-admin.py @@ -1999,13 +1999,13 @@ def mptcp(*, params: MPTCPparams, current_user: User = Depends(get_current_user) for line in f: if not 'net.mptcp' in line and not 'net.ipv4.tcp_congestion_control' in line: n.write(line) - n.write('net.mptcp.mptcp_checksum=' + checksum) - n.write('net.mptcp.mptcp_path_manager=' + path_manager) - n.write('net.mptcp.mptcp_scheduler=' + scheduler) - n.write('net.mptcp.mptcp_syn_retries=' + str(syn_retries)) - n.write('net.mptcp.mptcp_version=' + str(version)) - n.write('net.mptcp.checksum_enabled=' + checksum) - n.write('net.ipv4.tcp_congestion_control=' + congestion_control) + n.write('net.mptcp.mptcp_checksum=' + checksum + "\n") + n.write('net.mptcp.mptcp_path_manager=' + path_manager + "\n") + n.write('net.mptcp.mptcp_scheduler=' + scheduler + "\n") + n.write('net.mptcp.mptcp_syn_retries=' + str(syn_retries) + "\n") + n.write('net.mptcp.mptcp_version=' + str(version) + "\n") + n.write('net.mptcp.checksum_enabled=' + checksum + "\n") + n.write('net.ipv4.tcp_congestion_control=' + congestion_control + "\n") os.close(fd) move(tmpfile, '/etc/sysctl.d/90-shadowsocks.conf') final_md5 = hashlib.md5(file_as_bytes(open('/etc/sysctl.d/90-shadowsocks.conf', 'rb'))).hexdigest()