extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-24 03:31:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up TC Refresh

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3886 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-05-06 22:13:57 +00:00
parent e2b1562d93
commit abb6b4cfe7
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Shorewall/firewall
View File

@ -1743,18 +1743,8 @@ check_disabled_startup() {
} }
# #
# Dummy functions to make refresh_tc happy # tc4shorewall uses this function to report progress
# #
save_progress_message()
{
return 0
}
save_command()
{
return 0
}
progress_message_and_save() progress_message_and_save()
{ {
progress_message $@ progress_message $@

12
Shorewall/functions
View File

@ -1646,8 +1646,12 @@ setup_traffic_shaping()
add_root_tc() { add_root_tc() {
local defmark local defmark
defmark=$(get_defmark_for_dev $device) defmark=$(get_defmark_for_dev $device)
save_command qt tc qdisc del dev $device root
save_command qt tc qdisc del dev $device ingress if [ $COMMAND = compile ]; then
save_command qt tc qdisc del dev $device root
save_command qt tc qdisc del dev $device ingress
fi
run_tc qdisc add dev $device root handle $devnum: htb default 1$defmark run_tc qdisc add dev $device root handle $devnum: htb default 1$defmark
run_tc class add dev $device parent $devnum: classid $devnum:1 htb rate $outband run_tc class add dev $device parent $devnum: classid $devnum:1 htb rate $outband
run_tc qdisc add dev $device handle ffff: ingress run_tc qdisc add dev $device handle ffff: ingress
@ -1725,7 +1729,7 @@ setup_traffic_shaping()
validate_tcclasses_file validate_tcclasses_file
if [ -s $TMP_DIR/tcdevices ]; then if [ -s $TMP_DIR/tcdevices ]; then
save_progress_message "Setting up Traffic Control..." [ $COMMAND = compile ] && save_progress_message "Setting up Traffic Control..."
progress_message2 "$DOING $devfile..." progress_message2 "$DOING $devfile..."
while read device inband outband defmark ackmark; do while read device inband outband defmark ackmark; do
@ -2087,7 +2091,7 @@ process_tc_rule()
done done
progress_message " TC Rule \"$rule\" $DONE" progress_message " TC Rule \"$rule\" $DONE"
save_progress_message " TC Rule \"$rule\" Added" [ $COMMAND = compile ] && save_progress_message " TC Rule \"$rule\" Added"
} }
delete_tc1() delete_tc1()