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

Apply 3.4.3 fix to 4.0

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6552 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-15 15:42:33 +00:00
parent f97b8c6c24
commit 9d4bfd2d6e
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-shell/lib.maclist
View File

@ -235,7 +235,7 @@ setup_mac_lists() # $1 = Phase Number
if [ -n "$MACLIST_LOG_LEVEL" -o $MACLIST_DISPOSITION != ACCEPT ]; then if [ -n "$MACLIST_LOG_LEVEL" -o $MACLIST_DISPOSITION != ACCEPT ]; then
indent >&3 << __EOF__ indent >&3 << __EOF__
if interface_is_up $interface; then if interface_is_usable $interface; then
ip -f inet addr show $interface 2> /dev/null | grep 'inet.*brd' | sed 's/inet //; s/brd //; s/scope.*//;' | while read address broadcast; do ip -f inet addr show $interface 2> /dev/null | grep 'inet.*brd' | sed 's/inet //; s/brd //; s/scope.*//;' | while read address broadcast; do
address=\${address%/*} address=\${address%/*}
if [ -n "\$broadcast" ]; then if [ -n "\$broadcast" ]; then

30
Shorewall-shell/lib.tcrules
View File

@ -422,35 +422,17 @@ process_tc_rule()
dests=${dests%!*} dests=${dests%!*}
;; ;;
esac esac
#
# This isn't as fancy as the code in the rules file processor. It only uses multiport match multiport=--dport
# if the extended variety is available and then only on the destination port(s). for source in $(separate_list $sources); do
# for dest in $(separate_list $dests); do
if [ -n "$XMULTIPORT" ]; then for port in $(separate_list ${ports:=-}); do
#
# Extended Multiport match can handle port ranges
#
multiport="-m multiport --dports"
for source in $(separate_list $sources); do
for dest in $(separate_list $dests); do
port=${ports:=-}
for sport in $(separate_list ${sports:=-}); do for sport in $(separate_list ${sports:=-}); do
add_a_tc_rule add_a_tc_rule
done done
done done
done done
else done
multiport=--dport
for source in $(separate_list $sources); do
for dest in $(separate_list $dests); do
for port in $(separate_list ${ports:=-}); do
for sport in $(separate_list ${sports:=-}); do
add_a_tc_rule
done
done
done
done
fi
progress_message " TC Rule \"$rule\" $DONE" progress_message " TC Rule \"$rule\" $DONE"
save_progress_message_short " TC Rule \\\"$rule\\\" Added" save_progress_message_short " TC Rule \\\"$rule\\\" Added"