mptcp/openmptcprouter-vps-admin
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-vps-admin.git synced 2025-02-12 10:31:52 +00:00
Code Issues Releases Wiki Activity

Use subprocess for ss -M command

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-07-04 11:40:49 +02:00
parent 1e36d2aa4b
commit 21d071ebec
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
omr-vps-admin (0.11+20240704) unstable; urgency=medium
* Use subprocess for ss -M command
-- OpenMPTCProuter <contact@openmptcprouter.com> Wed, 04 Jul 2024 11:40:03 +0200
omr-vps-admin (0.11+20240629) unstable; urgency=medium
* Add a timeout on ss -M command

8
omr-admin.py
View file

@ -1336,8 +1336,12 @@ async def mptcpsupport(request: Request):
with open('/proc/net/mptcp_net/mptcp') as f:
if iptohex in f.read():
return {"mptcp": "working"}
elif not os.popen("timeout 2 ss -M | grep " + ip) == '':
return {"mptcp": "working"}
else:
mptcpcheck = subprocess.Popen("timeout 2 ss -M | grep -q " + ip, shell=True, stdout=subprocess.PIPE)
mptcpcheck.communicate()
if mptcpcheck.returncode == 0:
return {"mptcp": "working"}
mptcpcheck.kill()
return {"mptcp": "not working"}
# Get VPS status