IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2024-11-29 11:23:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add device id and comment to comment on linux tc commands https://github.com/rchac/LibreQoS/issues/94

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

10
v1.2/LibreQoS.py
View File

@ -314,6 +314,7 @@ def refreshShapers():
"mac": mac,
"ipv4s": ipv4_hosts,
"ipv6s": ipv6_subnets_and_hosts,
"comment": comment
}
devicesListForCircuit.append(thisDevice)
circuit['devices'] = devicesListForCircuit
@ -330,6 +331,7 @@ def refreshShapers():
"mac": mac,
"ipv4s": ipv4_hosts,
"ipv6s": ipv6_subnets_and_hosts,
"comment": comment
}
deviceListForCircuit.append(thisDevice)
thisCircuit = {
@ -342,6 +344,7 @@ def refreshShapers():
"downloadMax": round(int(downloadMax)*tcpOverheadFactor),
"uploadMax": round(int(uploadMax)*tcpOverheadFactor),
"qdisc": '',
"comment": comment
}
subscriberCircuits.append(thisCircuit)
# If there is nothing in the circuit ID field
@ -371,6 +374,7 @@ def refreshShapers():
"downloadMax": round(int(downloadMax)*tcpOverheadFactor),
"uploadMax": round(int(uploadMax)*tcpOverheadFactor),
"qdisc": '',
"comment": comment
}
subscriberCircuits.append(thisCircuit)
@ -470,7 +474,11 @@ def refreshShapers():
maxUpload = min(circuit['uploadMax'],elemUploadMax)
minDownload = min(circuit['downloadMin'],maxDownload)
minUpload = min(circuit['uploadMin'],maxUpload)
command = 'class add dev ' + interfaceA + ' parent ' + elemClassID + ' classid ' + hex(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3' + " # CircuitID: " + circuit['circuitID']
comment = " # CircuitID: " + circuit['circuitID'] + " DeviceIDs: "
for device in circuit['devices']:
comment = comment + device['deviceID'] + ', '
comment = comment + '| Comment: ' + device['comment']
command = 'class add dev ' + interfaceA + ' parent ' + elemClassID + ' classid ' + hex(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3' + comment
linuxTCcommands.append(command)
command = 'qdisc add dev ' + interfaceA + ' parent ' + hex(major) + ':' + hex(minor) + ' ' + fqOrCAKE
linuxTCcommands.append(command)