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

Add files via upload

Browse Source
This commit is contained in:
Robert Chacón 2021-07-01 14:26:58 -06:00 committed by GitHub
parent 2a01d6e590
commit b8a7e1a143
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
v0.9-alpha/LibreQoS.py
View File

@ -95,8 +95,7 @@ def refreshShapers():
"uploadMin": int(uploadMin), "uploadMin": int(uploadMin),
"downloadMax": int(downloadMax), "downloadMax": int(downloadMax),
"uploadMax": int(uploadMax), "uploadMax": int(uploadMax),
"qdiscSrc": '', "qdisc": '',
"qdiscDst": '',
} }
# If an AP is specified for a device in Shaper.csv, but AP is not listed in AccessPoints.csv, raise exception # If an AP is specified for a device in Shaper.csv, but AP is not listed in AccessPoints.csv, raise exception
if (AP != "none") and (AP not in accessPointDownloadMbps): if (AP != "none") and (AP not in accessPointDownloadMbps):
@ -162,11 +161,9 @@ def refreshShapers():
ipv6Filters = [] ipv6Filters = []
cpuMinorCounterDict = {} cpuMinorCounterDict = {}
#cpuMinorCounterDictInterfaceB = {}
for cpu in range(cpusAvailable): for cpu in range(cpusAvailable):
cpuMinorCounterDict[cpu] = 3 cpuMinorCounterDict[cpu] = 3
#cpuMinorCounterDictInterfaceB[cpu] = 3
for AP in devicesByAP: for AP in devicesByAP:
#Create HTBs by AP #Create HTBs by AP
@ -174,18 +171,14 @@ def refreshShapers():
thisAPdownload = accessPointDownloadMbps[currentAPname] thisAPdownload = accessPointDownloadMbps[currentAPname]
thisAPupload = accessPointUploadMbps[currentAPname] thisAPupload = accessPointUploadMbps[currentAPname]
#InterfaceA
major = currentCPUcounter major = currentCPUcounter
minor = cpuMinorCounterDict[currentCPUcounter] minor = cpuMinorCounterDict[currentCPUcounter]
srcOrDst = 'dst'
thisInterface = interfaceA
thisHTBrate = thisAPdownload
#HTBs for each AP #HTBs for each AP
thisHTBclassID = str(currentCPUcounter) + ':' + str(minor) thisHTBclassID = str(currentCPUcounter) + ':' + str(minor)
# Guarentee AP gets at least 1/2 of its radio capacity, allow up to its max radio capacity when network not at peak load # Guarentee AP gets at least 1/2 of its radio capacity, allow up to its max radio capacity when network not at peak load
shell('tc class add dev ' + interfaceA + ' parent ' + str(currentCPUcounter) + ':1 classid ' + str(minor) + ' htb rate '+ str(round(thisHTBrate/2)) + 'mbit ceil '+ str(round(thisHTBrate)) + 'mbit prio 3') shell('tc class add dev ' + interfaceA + ' parent ' + str(currentCPUcounter) + ':1 classid ' + str(minor) + ' htb rate '+ str(round(thisAPdownload/2)) + 'mbit ceil '+ str(round(thisAPdownload)) + 'mbit prio 3')
shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(currentCPUcounter) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(currentCPUcounter) + ':' + str(minor) + ' ' + fqOrCAKE)
shell('tc class add dev ' + interfaceB + ' parent ' + str(major) + ':1 classid ' + str(minor) + ' htb rate '+ str(round(thisHTBrate/2)) + 'mbit ceil '+ str(round(thisHTBrate)) + 'mbit prio 3') shell('tc class add dev ' + interfaceB + ' parent ' + str(major) + ':1 classid ' + str(minor) + ' htb rate '+ str(round(thisAPupload/2)) + 'mbit ceil '+ str(round(thisAPupload)) + 'mbit prio 3')
shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
minor += 1 minor += 1
for device in AP: for device in AP:
@ -198,7 +191,6 @@ def refreshShapers():
shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
shell('tc class add dev ' + interfaceB + ' parent ' + thisHTBclassID + ' classid ' + str(minor) + ' htb rate '+ str(uploadMin) + 'mbit ceil '+ str(uploadMax) + 'mbit prio 3') shell('tc class add dev ' + interfaceB + ' parent ' + thisHTBclassID + ' classid ' + str(minor) + ' htb rate '+ str(uploadMin) + 'mbit ceil '+ str(uploadMax) + 'mbit prio 3')
shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
if device['ipv4']: if device['ipv4']:
parentString = str(major) + ':' parentString = str(major) + ':'
flowIDstring = str(major) + ':' + str(minor) flowIDstring = str(major) + ':' + str(minor)
@ -208,7 +200,7 @@ def refreshShapers():
flowIDstring = str(major) + ':' + str(minor) flowIDstring = str(major) + ':' + str(minor)
ipv6Filters.append((device['ipv6'], parentString, flowIDstring, currentCPUcounter)) ipv6Filters.append((device['ipv6'], parentString, flowIDstring, currentCPUcounter))
deviceQDiscID = str(major) + ':' + str(minor) deviceQDiscID = str(major) + ':' + str(minor)
device['qdiscDst'] = str(major) + ':' + str(minor) device['qdisc'] = str(major) + ':' + str(minor)
minor += 1 minor += 1
cpuMinorCounterDict[currentCPUcounter] = minor cpuMinorCounterDict[currentCPUcounter] = minor