forked from extern/shorewall_code
Bring tc4shorewall code into the firewall script -- Take 2 (fix syntax error and verify tc config in 'check')
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2807 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
7870f16cb7
commit
3a775a1316
@ -3309,6 +3309,7 @@ setup_traffic_shaping()
|
|||||||
validate_tcdevices_file
|
validate_tcdevices_file
|
||||||
validate_tcclasses_file
|
validate_tcclasses_file
|
||||||
|
|
||||||
|
if [ $COMMAND != check ]; then
|
||||||
if [ -s $TMP_DIR/tcdevices ]; then
|
if [ -s $TMP_DIR/tcdevices ]; then
|
||||||
save_progress_message "Restoring Traffic Control..."
|
save_progress_message "Restoring Traffic Control..."
|
||||||
echo "Processing tcdevices..."
|
echo "Processing tcdevices..."
|
||||||
@ -3332,7 +3333,7 @@ setup_traffic_shaping()
|
|||||||
progress_message " TC Class \"$tcdev\" Added."
|
progress_message " TC Class \"$tcdev\" Added."
|
||||||
done < $TMP_DIR/tcclasses
|
done < $TMP_DIR/tcclasses
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -4033,6 +4034,8 @@ check_config() {
|
|||||||
masq=$(find_file masq)
|
masq=$(find_file masq)
|
||||||
[ -f $masq ] && setup_masq $masq
|
[ -f $masq ] && setup_masq $masq
|
||||||
|
|
||||||
|
setup_traffic_shaping
|
||||||
|
|
||||||
rm -rf $TMP_DIR
|
rm -rf $TMP_DIR
|
||||||
[ -n "$RESTOREBASE" ] && rm -f $RESTOREBASE
|
[ -n "$RESTOREBASE" ] && rm -f $RESTOREBASE
|
||||||
|
|
||||||
@ -4075,7 +4078,7 @@ refresh_tc() {
|
|||||||
setup_tc1
|
setup_tc1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$TC_ENABLED" ]; THEN
|
if [ -n "$TC_ENABLED" ]; then
|
||||||
f=$(find_file tcstart)
|
f=$(find_file tcstart)
|
||||||
|
|
||||||
if [ -x $f ]; then
|
if [ -x $f ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user