extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-15 10:51:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

More Cleanup

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@371 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2002-12-18 23:56:34 +00:00
parent efb857df9d
commit c9a1bff975
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Shorewall/firewall
View File

@ -1724,14 +1724,14 @@ delete_nat() {
} }
# #
# Process a TC Rule - $chain is assumed to contain the name of the # Process a TC Rule - $marking_chain is assumed to contain the name of the
# marking chain # marking chain
# #
process_tc_rule() process_tc_rule()
{ {
add_a_tc_rule() { add_a_tc_rule() {
r= r=
chain1=$chain chain=$marking_chain
if [ "x$source" != "x-" ]; then if [ "x$source" != "x-" ]; then
case $source in case $source in
@ -1742,7 +1742,7 @@ process_tc_rule()
r=`mac_match $source` r=`mac_match $source`
;; ;;
$FW) $FW)
chain1=tcout chain=tcout
;; ;;
*) *)
if ! list_search $source $all_interfaces; then if ! list_search $source $all_interfaces; then
@ -1758,7 +1758,7 @@ process_tc_rule()
[ "x$port" = "x-" ] || r="${r}--dport $port " [ "x$port" = "x-" ] || r="${r}--dport $port "
[ "x$sport" = "x-" ] || r="${r}--sport $sport " [ "x$sport" = "x-" ] || r="${r}--sport $sport "
run_iptables2 -t mangle -A $chain1 $r -j MARK --set-mark $mark run_iptables2 -t mangle -A $chain $r -j MARK --set-mark $mark
} }
@ -1782,10 +1782,8 @@ setup_tc1() {
# #
# Create the TC mangle chains # Create the TC mangle chains
# #
[ -n "$MARK_IN_FORWARD_CHAIN" ] && chain=tcfor || chain=tcpre
run_iptables -t mangle -N $chain run_iptables -t mangle -N $marking_chain
run_iptables -t mangle -N tcout run_iptables -t mangle -N tcout
# #
# Process the TC Rules File # Process the TC Rules File
@ -1801,7 +1799,7 @@ setup_tc1() {
# Link to the TC mangle chains from the main chains # Link to the TC mangle chains from the main chains
# #
if [ $chain = tcfor ]; then if [ $marking_chain = tcfor ]; then
run_iptables -t mangle -A FORWARD -j tcfor run_iptables -t mangle -A FORWARD -j tcfor
else else
run_iptables -t mangle -A PREROUTING -j tcpre run_iptables -t mangle -A PREROUTING -j tcpre
@ -4544,6 +4542,7 @@ do_initialize() {
[ -z "$RFC1918_LOG_LEVEL" ] && RFC1918_LOG_LEVEL=info [ -z "$RFC1918_LOG_LEVEL" ] && RFC1918_LOG_LEVEL=info
MARK_IN_FORWARD_CHAIN=`added_param_value_no MARK_IN_FORWARD_CHAIN $MARK_IN_FORWARD_CHAIN` MARK_IN_FORWARD_CHAIN=`added_param_value_no MARK_IN_FORWARD_CHAIN $MARK_IN_FORWARD_CHAIN`
[ -n "$MARK_IN_FORWARD_CHAIN" ] && marking_chain=tcfor || marking_chain=tcpre
} }