First step toward support of wildcard ports

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3188 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2005-12-21 04:05:27 +00:00
parent f91f118c2a
commit 5b8a9c2dbf

View File

@ -942,7 +942,7 @@ known_interface() # $1 = interface name
match_source_dev() match_source_dev()
{ {
if [ -n "$BRIDGING" ]; then if [ -n "$BRIDGING" ]; then
list_search $1 $all_ports && physdev_echo "--physdev-in $1" || echo -i $1 list_search $1 $ALL_PORTS && physdev_echo "--physdev-in $1" || echo -i $1
else else
echo -i $1 echo -i $1
fi fi
@ -951,7 +951,7 @@ match_source_dev()
match_dest_dev() match_dest_dev()
{ {
if [ -n "$BRIDGING" ]; then if [ -n "$BRIDGING" ]; then
list_search $1 $all_ports && physdev_echo "--physdev-out $1" || echo -o $1 list_search $1 $ALL_PORTS && physdev_echo "--physdev-out $1" || echo -o $1
else else
echo -o $1 echo -o $1
fi fi
@ -959,7 +959,7 @@ match_dest_dev()
verify_interface() verify_interface()
{ {
known_interface $1 || { [ -n "$BRIDGING" ] && list_search $1 $all_ports ; } known_interface $1 || { [ -n "$BRIDGING" ] && list_search $1 $ALL_PORTS ; }
} }
# #
@ -1442,7 +1442,7 @@ validate_hosts_file() {
{ {
list_search $1 $ports || ports="$ports $1" list_search $1 $ports || ports="$ports $1"
list_search ${interface}:${1} $zports || zports="$zports ${interface}:${1}" list_search ${interface}:${1} $zports || zports="$zports ${interface}:${1}"
list_search $1 $all_ports || all_ports="$all_ports $1" list_search $1 $ALL_PORTS || ALL_PORTS="$ALL_PORTS $1"
} }
while read z hosts options; do while read z hosts options; do
@ -1521,7 +1521,7 @@ validate_hosts_file() {
done < $TMP_DIR/hosts done < $TMP_DIR/hosts
[ -n "$all_ports" ] && echo " Bridge ports are: $all_ports" [ -n "$ALL_PORTS" ] && echo " Bridge ports are: $ALL_PORTS"
} }
# #
@ -9312,12 +9312,12 @@ do_initialize() {
CRITICALHOSTS= CRITICALHOSTS=
IPSECFILE= IPSECFILE=
EXCLUSION_SEQ=1 EXCLUSION_SEQ=1
STOPPING= STOPPING=
HAVE_MUTEX= HAVE_MUTEX=
ALIASES_TO_ADD= ALIASES_TO_ADD=
SECTION=ESTABLISHED SECTION=ESTABLISHED
SECTIONS= SECTIONS=
ALL_PORTS=
FUNCTIONS=$SHARED_DIR/functions FUNCTIONS=$SHARED_DIR/functions