extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-03-07 11:01:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

AND/OR capability in the tcrules file

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4613 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-10-02 16:48:08 +00:00
parent 43627eee14
commit 12f1aa6d77
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shorewall/lib.nat
View File

@ -393,6 +393,7 @@ networks="\$(get_routed_networks $detectinterface)"
for network in \$networks; do for network in \$networks; do
__EOF__ __EOF__
for destnet in $(separate_list $destnets); do for destnet in $(separate_list $destnets); do
indent >&3 << __EOF__ indent >&3 << __EOF__
run_iptables -t nat -A $chain -s \$network $(dest_ip_range $destnet) $proto $ports $policy -j $target $addrlist run_iptables -t nat -A $chain -s \$network $(dest_ip_range $destnet) $proto $ports $policy -j $target $addrlist
__EOF__ __EOF__
@ -422,7 +423,7 @@ __EOF__
fi fi
fi fi
} } #setup_one()
if [ -s $TMP_DIR/masq ]; then if [ -s $TMP_DIR/masq ]; then
progress_message2 "$DOING Masquerading/SNAT" progress_message2 "$DOING Masquerading/SNAT"

10
Shorewall/lib.tcrules
View File

@ -264,6 +264,16 @@ process_tc_rule()
target=RETURN target=RETURN
mark= mark=
;; ;;
OR)
[ -n "$did_connmark" ] && fatal_error "OR not valid with :C[FP]"
target="MARK --or-mark"
validate_mark $mark
;;
AND)
[ -n "$did_connmark" ] && fatal_error "AND not valid with :C[FP]"
target="MARK --and-mark"
validate_mark $mark
;;
*) *)
if [ "$chain" != tcpost ]; then if [ "$chain" != tcpost ]; then
validate_mark $mark validate_mark $mark

16
Shorewall/tcrules
View File

@ -92,6 +92,20 @@
# #
# As in a) above, may be followed by ":P" or ":F". # As in a) above, may be followed by ":P" or ":F".
# #
# d) OR <mark>[/<mask>].
#
# Logically or the <mark> value with the current
# packet mark.
#
# As in a) above, may be followed by ":P" or ":F".
#
# d) AND <mark>[/<mask>].
#
# Logically and the <mark> value with the current
# packet mark.
#
# As in a) above, may be followed by ":P" or ":F".
#
# SOURCE Source of the packet. A comma-separated list of # SOURCE Source of the packet. A comma-separated list of
# interface names, IP addresses, MAC addresses and/or # interface names, IP addresses, MAC addresses and/or
# subnets for packets being routed through a common path. # subnets for packets being routed through a common path.
@ -115,7 +129,7 @@
# "-" as a separator. # "-" as a separator.
# #
# Example: ~00-A0-C9-15-39-78 # Example: ~00-A0-C9-15-39-78
#
# DEST Destination of the packet. Comma separated list of # DEST Destination of the packet. Comma separated list of
# IP addresses and/or subnets. If your kernel and # IP addresses and/or subnets. If your kernel and
# iptables include iprange match support, IP address # iptables include iprange match support, IP address