summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
678b8b5)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r43562
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@43566
3c298f89-4303-0410-b956-
a3cf2f4a3e73
;;
*:connbytes)
value="$(echo "$value" | sed -e 's,-,:,g')"
;;
*:connbytes)
value="$(echo "$value" | sed -e 's,-,:,g')"
- add_insmod ipt_connbytes
+ add_insmod xt_connbytes
append "$var" "-m connbytes --connbytes $value --connbytes-dir both --connbytes-mode bytes"
;;
*:comment)
append "$var" "-m connbytes --connbytes $value --connbytes-dir both --connbytes-mode bytes"
;;
*:comment)
append "$var" "-m comment --comment '$value'"
;;
*:tos)
append "$var" "-m comment --comment '$value'"
;;
*:tos)
case "$value" in
!*) append "$var" "-m tos ! --tos $value";;
*) append "$var" "-m tos --tos $value"
esac
;;
*:dscp)
case "$value" in
!*) append "$var" "-m tos ! --tos $value";;
*) append "$var" "-m tos --tos $value"
esac
;;
*:dscp)
dscp_option="--dscp"
[ -z "${value%%[EBCA]*}" ] && dscp_option="--dscp-class"
case "$value" in
dscp_option="--dscp"
[ -z "${value%%[EBCA]*}" ] && dscp_option="--dscp-class"
case "$value" in
;;
1:pktsize)
value="$(echo "$value" | sed -e 's,-,:,g')"
;;
1:pktsize)
value="$(echo "$value" | sed -e 's,-,:,g')"
append "$var" "-m length --length $value"
;;
1:limit)
append "$var" "-m length --length $value"
;;
1:limit)
append "$var" "-m limit --limit $value"
;;
1:tcpflags)
append "$var" "-m limit --limit $value"
;;
1:tcpflags)
config_get TOS "$rule" 'TOS'
suffix="-j TOS --set-tos "${TOS:-"Normal-Service"}
;;
1:DSCP)
config_get TOS "$rule" 'TOS'
suffix="-j TOS --set-tos "${TOS:-"Normal-Service"}
;;
1:DSCP)
config_get DSCP "$rule" 'DSCP'
[ -z "${DSCP%%[EBCA]*}" ] && set_value="--set-dscp-class $DSCP" \
|| set_value="--set-dscp $DSCP"
config_get DSCP "$rule" 'DSCP'
[ -z "${DSCP%%[EBCA]*}" ] && set_value="--set-dscp-class $DSCP" \
|| set_value="--set-dscp $DSCP"
## If we want to override the TOS field, let's clear the DSCP field first.
[ ! -z "$(echo $options | grep 'TOS')" ] && {
s_options=${options%%TOS}
## If we want to override the TOS field, let's clear the DSCP field first.
[ ! -z "$(echo $options | grep 'TOS')" ] && {
s_options=${options%%TOS}
parse_matching_rule iptrule "$rule" "$s_options" "$prefix" "-j DSCP --set-dscp 0"
append "$var" "$iptrule" "$N"
unset iptrule
parse_matching_rule iptrule "$rule" "$s_options" "$prefix" "-j DSCP --set-dscp 0"
append "$var" "$iptrule" "$N"
unset iptrule
config_get mark "$class" classnr
config_get maxsize "$class" maxsize
[ -z "$maxsize" -o -z "$mark" ] || {
config_get mark "$class" classnr
config_get maxsize "$class" maxsize
[ -z "$maxsize" -o -z "$mark" ] || {
append pktrules "iptables -t mangle -A qos_${cg} -m mark --mark $mark/0x0f -m length --length $maxsize: -j MARK --set-mark 0/0xff" "$N"
}
done
append pktrules "iptables -t mangle -A qos_${cg} -m mark --mark $mark/0x0f -m length --length $maxsize: -j MARK --set-mark 0/0xff" "$N"
}
done
- add_insmod ipt_multiport
- add_insmod ipt_CONNMARK
+ add_insmod xt_multiport
+ add_insmod xt_CONNMARK
stop_firewall
for group in $CG; do
start_cg $group
stop_firewall
for group in $CG; do
start_cg $group