From 67056cf2faf76c6fa486e6cd39984055bb31ec68 Mon Sep 17 00:00:00 2001 From: Astro Date: Sat, 26 Nov 2016 02:42:39 +0100 Subject: [PATCH] shaping: fix dangerous divisor! --- salt-pillar/upstream/anon1.sls | 1 - salt-pillar/upstream/upstream1.sls | 1 - salt-pillar/upstream/upstream2.sls | 1 - salt/upstream/shaping | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/salt-pillar/upstream/anon1.sls b/salt-pillar/upstream/anon1.sls index 10fc281..cd9f077 100644 --- a/salt-pillar/upstream/anon1.sls +++ b/salt-pillar/upstream/anon1.sls @@ -2,4 +2,3 @@ upstream: interface: ipredator up-bandwidth: 2000 flow-keys: nfct-src,nfct-dst - flows: 2048 diff --git a/salt-pillar/upstream/upstream1.sls b/salt-pillar/upstream/upstream1.sls index a4e8985..9498d56 100644 --- a/salt-pillar/upstream/upstream1.sls +++ b/salt-pillar/upstream/upstream1.sls @@ -2,4 +2,3 @@ upstream: interface: up1 up-bandwidth: 6000 flow-keys: nfct-src,nfct-dst - flows: 2048 diff --git a/salt-pillar/upstream/upstream2.sls b/salt-pillar/upstream/upstream2.sls index 8df5efa..0b1530c 100644 --- a/salt-pillar/upstream/upstream2.sls +++ b/salt-pillar/upstream/upstream2.sls @@ -2,4 +2,3 @@ upstream: interface: up2 up-bandwidth: 6000 flow-keys: nfct-src,nfct-dst - flows: 1024 diff --git a/salt/upstream/shaping b/salt/upstream/shaping index dd4b4c9..de046af 100644 --- a/salt/upstream/shaping +++ b/salt/upstream/shaping @@ -5,5 +5,5 @@ if [ "$IFACE" = "{{ pillar['upstream']['interface'] }}" ]; then tc qdisc add dev $IFACE root handle 1 hfsc default 1 tc class add dev $IFACE parent 1: classid 1:1 hfsc sc rate {{ pillar['upstream']['up-bandwidth'] }}kbit ul rate {{ pillar['upstream']['up-bandwidth'] }}kbit tc qdisc add dev $IFACE parent 1:1 handle 11: fq_codel - tc filter add dev $IFACE parent 11: handle 11 protocol all flow hash keys {{ pillar['upstream']['flow-keys'] }} divisor {{ pillar['upstream']['flows'] }} + tc filter add dev $IFACE parent 11: handle 11 protocol all flow hash keys {{ pillar['upstream']['flow-keys'] }} divisor 1024 fi