holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Bring tc4shorewall code into the firewall script -- Take 2 (fix syntax error and verify tc config in 'check')

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2807 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2005-10-05 22:59:38 +00:00
parent 7870f16cb7
commit 3a775a1316
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Shorewall/firewall
View File

@ -3309,30 +3309,31 @@ setup_traffic_shaping()
validate_tcdevices_file validate_tcdevices_file
validate_tcclasses_file validate_tcclasses_file
if [ -s $TMP_DIR/tcdevices ]; then if [ $COMMAND != check ]; then
save_progress_message "Restoring Traffic Control..." if [ -s $TMP_DIR/tcdevices ]; then
echo "Processing tcdevices..." save_progress_message "Restoring Traffic Control..."
echo "Processing tcdevices..."
while read device inband outband defmark ackmark; do while read device inband outband defmark ackmark; do
expandv device inband outband defmark ackmark expandv device inband outband defmark ackmark
tcdev="$device $inband $outband" tcdev="$device $inband $outband"
add_root_tc add_root_tc
progress_message " TC Device $tcdev Added." progress_message " TC Device $tcdev Added."
done < $TMP_DIR/tcdevices done < $TMP_DIR/tcdevices
fi
if [ -s $TMP_DIR/tcclasses ]; then
echo "Processing tcclasses..."
while read device mark rate ceil prio options; do
expandv device mark rate ceil prio options
tcdev="$device $mark $rate $ceil $prio $options"
options=$(separate_list $options | tr '[A-Z]' '[a-z]')
add_tc_class
progress_message " TC Class \"$tcdev\" Added."
done < $TMP_DIR/tcclasses
fi
fi fi
if [ -s $TMP_DIR/tcclasses ]; then
echo "Processing tcclasses..."
while read device mark rate ceil prio options; do
expandv device mark rate ceil prio options
tcdev="$device $mark $rate $ceil $prio $options"
options=$(separate_list $options | tr '[A-Z]' '[a-z]')
add_tc_class
progress_message " TC Class \"$tcdev\" Added."
done < $TMP_DIR/tcclasses
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