IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert bf09a38d35 & Require >= 3Mbps

Browse Source
This commit is contained in:
Robert Chacón 2022-09-08 04:42:45 -06:00 committed by GitHub
parent bf09a38d35
commit b9fdfba00d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
v1.2/LibreQoS.py
View File

@ -93,18 +93,26 @@ def refreshShapers():
raise Exception("Provided IPv6 '" + ipv6_input + "' in ShapedDevices.csv at row " + str(rowNum) + " is not valid.") from e raise Exception("Provided IPv6 '" + ipv6_input + "' in ShapedDevices.csv at row " + str(rowNum) + " is not valid.") from e
try: try:
a = int(downloadMin) a = int(downloadMin)
if a <=2:
raise Exception("Provided downloadMin '" + downloadMin + "' in ShapedDevices.csv at row " + str(rowNum) + " is <=2.")
except ValueError as e: except ValueError as e:
raise Exception("Provided downloadMin '" + downloadMin + "' in ShapedDevices.csv at row " + str(rowNum) + " is not a valid integer.") from e raise Exception("Provided downloadMin '" + downloadMin + "' in ShapedDevices.csv at row " + str(rowNum) + " is not a valid integer.") from e
try: try:
a = int(uploadMin) a = int(uploadMin)
if a <=2:
raise Exception("Provided uploadMin '" + uploadMin + "' in ShapedDevices.csv at row " + str(rowNum) + " is <=2.")
except ValueError as e: except ValueError as e:
raise Exception("Provided uploadMin '" + uploadMin + "' in ShapedDevices.csv at row " + str(rowNum) + " is not a valid integer.") from e raise Exception("Provided uploadMin '" + uploadMin + "' in ShapedDevices.csv at row " + str(rowNum) + " is not a valid integer.") from e
try: try:
a = int(downloadMax) a = int(downloadMax)
if a <=2:
raise Exception("Provided downloadMax '" + downloadMax + "' in ShapedDevices.csv at row " + str(rowNum) + " is <=2.")
except ValueError as e: except ValueError as e:
raise Exception("Provided downloadMax '" + downloadMax + "' in ShapedDevices.csv at row " + str(rowNum) + " is not a valid integer.") from e raise Exception("Provided downloadMax '" + downloadMax + "' in ShapedDevices.csv at row " + str(rowNum) + " is not a valid integer.") from e
try: try:
a = int(uploadMax) a = int(uploadMax)
if a <=2:
raise Exception("Provided uploadMax '" + uploadMax + "' in ShapedDevices.csv at row " + str(rowNum) + " is <=2.")
except ValueError as e: except ValueError as e:
raise Exception("Provided uploadMax '" + uploadMax + "' in ShapedDevices.csv at row " + str(rowNum) + " is not a valid integer.") from e raise Exception("Provided uploadMax '" + uploadMax + "' in ShapedDevices.csv at row " + str(rowNum) + " is not a valid integer.") from e
rowNum += 1 rowNum += 1
@ -403,13 +411,8 @@ def refreshShapers():
f.write(f"{line}\n") f.write(f"{line}\n")
shell("/sbin/tc -f -b linux_tc.txt") shell("/sbin/tc -f -b linux_tc.txt")
xdpCommandString = ""
for command in xdpCPUmapCommands: for command in xdpCPUmapCommands:
xdpCommandString = xdpCommandString + command + "\n" shell(command)
if enableActualShellCommands:
process = subprocess.Popen('/bin/bash', stdin=subprocess.PIPE, stdout=subprocess.PIPE)
out, err = process.communicate(xdpCommandString.encode('utf-8'))
#Recap #Recap
for circuit in subscriberCircuits: for circuit in subscriberCircuits: