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

clean up tc4shorewall progress message

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2810 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2005-10-06 00:41:24 +00:00
parent 21a6f90554
commit 51d44fcb40
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Shorewall/firewall
View File

@ -3126,7 +3126,7 @@ build_exclusion_chain() # $1 = variable to store chain name into $2 = table, $3
setup_traffic_shaping() setup_traffic_shaping()
{ {
local mtu r2q tc_all_devices device mark rate ceil prio options local mtu r2q tc_all_devices device mark rate ceil prio options devfile=$(find_file tcdevices) classfile=$(find_file tcclasses)
mtu=1500 mtu=1500
r2q=10 r2q=10
@ -3217,7 +3217,7 @@ setup_traffic_shaping()
} }
validate_tcdevices_file() { validate_tcdevices_file() {
echo "Validating tcdevices file..." echo "Validating $devfile..."
local device local device inband outband local device local device inband outband
while read device inband outband; do while read device inband outband; do
expandv device inband outband expandv device inband outband
@ -3234,7 +3234,7 @@ setup_traffic_shaping()
} }
validate_tcclasses_file() { validate_tcclasses_file() {
echo "Validating tcclasses file..." echo "Validating $classfile..."
local classlist device mark rate ceil prio bandw wrongopt allopts opt local classlist device mark rate ceil prio bandw wrongopt allopts opt
allopts="" allopts=""
while read device mark rate ceil prio options; do while read device mark rate ceil prio options; do
@ -3306,8 +3306,8 @@ setup_traffic_shaping()
# tcp # tcp
} }
strip_file tcdevices strip_file tcdevices $devfile
strip_file tcclasses strip_file tcclasses $classfile
validate_tcdevices_file validate_tcdevices_file
validate_tcclasses_file validate_tcclasses_file
@ -3315,7 +3315,7 @@ setup_traffic_shaping()
if [ $COMMAND != check ]; then 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 $devfile..."
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
@ -3326,7 +3326,7 @@ setup_traffic_shaping()
fi fi
if [ -s $TMP_DIR/tcclasses ]; then if [ -s $TMP_DIR/tcclasses ]; then
echo "Processing tcclasses..." echo "Processing $classfile..."
while read device mark rate ceil prio options; do while read device mark rate ceil prio options; do
expandv device mark rate ceil prio options expandv device mark rate ceil prio options