lab/mininet-sample
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "policing BEFORE shaping"

Browse Source 
This reverts commit 9d9bbea98e.
This commit is contained in:
Quentin De Coninck 2019-11-27 19:52:44 +01:00
parent 9f10436f9a
commit 4082d7eed1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mpLinkCharacteristics.py
View File

@ -53,11 +53,11 @@ class MpLinkCharacteristics:
for n in self.netemAt: for n in self.netemAt:
cmd = cmd + "sleep " + str(n.delta) cmd = cmd + "sleep " + str(n.delta)
cmd = cmd + " && tc qdisc del dev " + ifname + " root " cmd = cmd + " && tc qdisc del dev " + ifname + " root "
cmd = cmd + " && tc filter add dev {} root handle 5:0 u32 match u32 0 0 police rate {}mbit burst {} drop".format(ifname, self.bandwidth, int(self.queueSize) * 1500) cmd = cmd + " && tc qdisc add dev {} root handle 5:0 tbf rate {}mbit burst {} latency {}ms".format(ifname, self.bandwidth, 1500 * int(self.queueSize), self.queuingDelay)
cmd = cmd + " && tc qdisc add dev {} parent 5:0 handle 5:1 tbf rate {}mbit burst 15000 latency {}ms".format(ifname, self.bandwidth, self.queuingDelay) cmd = cmd + " && tc qdisc add dev {} handle ffff: ingress".format(ifname)
# cmd = cmd + " && tc qdisc add dev {} handle ffff: ingress".format(ifname) cmd = cmd + " && tc filter add dev {} parent ffff: u32 match u32 0 0 police rate {}mbit burst {} drop".format(ifname, self.bandwidth, int(self.queueSize) * 1500)
cmd = cmd + " && tc qdisc add dev {} parent 5:1 handle 10: netem {} delay {}ms limit 1000000 &&".format(ifname, n.cmd, self.delay) cmd = cmd + " && tc qdisc add dev {} parent 5:0 handle 10: netem {} delay {}ms limit 1000000 &&".format(ifname, n.cmd, self.delay)
cmd = cmd + " true &" cmd = cmd + " true &"
return cmd return cmd