Attachment #11759 for bug #20748

View | Details | Raw Unified | Return to bug 20748
Collapse All | Expand All

Lines 102-115 Link Here

(-)wondershaper-1.1a/wshaper (-2 / +12 lines)
102	# some traffic however suffers a worse fate	102	# some traffic however suffers a worse fate
103	for a in $NOPRIOPORTDST	103	for a in $NOPRIOPORTDST
104	do	104	do
		105	PORT=${a%/*}
		106	MASK=${a#*/}
		107	if [ "${PORT}" = "${a}" ]; then
		108	MASK='0xffff'
		109	fi
105	tc filter add dev $DEV parent 1: protocol ip prio 14 u32 \	110	tc filter add dev $DEV parent 1: protocol ip prio 14 u32 \
106	match ip dport $a 0xffff flowid 1:30	111	match ip dport ${PORT} ${MASK} flowid 1:30
107	done	112	done
108		113
109	for a in $NOPRIOPORTSRC	114	for a in $NOPRIOPORTSRC
110	do	115	do
		116	PORT=${a%/*}
		117	MASK=${a#*/}
		118	if [ "${PORT}" = "${a}" ]; then
		119	MASK='0xffff'
		120	fi
111	tc filter add dev $DEV parent 1: protocol ip prio 15 u32 \	121	tc filter add dev $DEV parent 1: protocol ip prio 15 u32 \
112	match ip sport $a 0xffff flowid 1:30	122	match ip sport ${PORT} ${MASK} flowid 1:30
113	done	123	done
114		124
115	for a in $NOPRIOHOSTSRC	125	for a in $NOPRIOHOSTSRC

Lines 66-75 Link Here

(-)wondershaper-1.1a/wshaper.htb (-4 / +14 lines)
66	# and a lower priority:	66	# and a lower priority:
67		67
68	tc class add dev $DEV parent 1:1 classid 1:20 htb rate $[9*$UPLINK/10]kbit \	68	tc class add dev $DEV parent 1:1 classid 1:20 htb rate $[9*$UPLINK/10]kbit \
69	burst 6k prio 2	69	ceil ${UPLINK}kbit burst 6k prio 2
70		70
71	tc class add dev $DEV parent 1:1 classid 1:30 htb rate $[8*$UPLINK/10]kbit \	71	tc class add dev $DEV parent 1:1 classid 1:30 htb rate $[8*$UPLINK/10]kbit \
72	burst 6k prio 2	72	ceil ${UPLINK}kbit burst 6k prio 2
73		73
74	# all get Stochastic Fairness:	74	# all get Stochastic Fairness:
75	tc qdisc add dev $DEV parent 1:10 handle 10: sfq perturb 10	75	tc qdisc add dev $DEV parent 1:10 handle 10: sfq perturb 10
Lines 101-114 Link Here
101	# some traffic however suffers a worse fate	101	# some traffic however suffers a worse fate
102	for a in $NOPRIOPORTDST	102	for a in $NOPRIOPORTDST
103	do	103	do
		104	PORT=${a%/*}
		105	MASK=${a#*/}
		106	if [ "${PORT}" = "${a}" ]; then
		107	MASK='0xffff'
		108	fi
104	tc filter add dev $DEV parent 1: protocol ip prio 14 u32 \	109	tc filter add dev $DEV parent 1: protocol ip prio 14 u32 \
105	match ip dport $a 0xffff flowid 1:30	110	match ip dport ${PORT} ${MASK} flowid 1:30
106	done	111	done
107		112
108	for a in $NOPRIOPORTSRC	113	for a in $NOPRIOPORTSRC
109	do	114	do
		115	PORT=${a%/*}
		116	MASK=${a#*/}
		117	if [ "${PORT}" = "${a}" ]; then
		118	MASK='0xffff'
		119	fi
110	tc filter add dev $DEV parent 1: protocol ip prio 15 u32 \	120	tc filter add dev $DEV parent 1: protocol ip prio 15 u32 \
111	match ip sport $a 0xffff flowid 1:30	121	match ip sport ${PORT} ${MASK} flowid 1:30
112	done	122	done
113		123
114	for a in $NOPRIOHOSTSRC	124	for a in $NOPRIOHOSTSRC

Return to bug 20748