Reorder the columns of /etc/shorewall/rtrules (again)

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3770 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-04-03 22:35:13 +00:00
parent d1a7db2078
commit dffa18f053
3 changed files with 38 additions and 40 deletions

View File

@ -1394,9 +1394,9 @@ __EOF__
save_command save_command
while read provider priority source dest; do while read source dest provider priority; do
expandv priority provider source dest expandv source dest provider priority
rule="$priority $provider $source $dest" rule="$source $dest $priority $provider"
add_an_rtrule add_an_rtrule
done < $TMP_DIR/rtrules done < $TMP_DIR/rtrules
fi fi

View File

@ -45,6 +45,21 @@ Other changes in 3.2.0 Beta 4
The file has the following columns: The file has the following columns:
SOURCE(optonal) An ip address (network or host) that
matches the source IP address in a packet.
May also be specified as an interface
name optionally followed by ":" and an
address. If the define 'lo' is specified,
the packet must originate from the firewall
itself.
DEST(optional) An ip address (network or host) that
matches the destination IP address in a packet.
If you choose to omit either SOURCE or DEST,
place "-" in the column. Note that you
may not omit both SOURCE and DEST.
PROVIDER The provider to route the traffic through. PROVIDER The provider to route the traffic through.
May be expressed either as the provider name May be expressed either as the provider name
or the provider number. or the provider number.
@ -58,30 +73,14 @@ Other changes in 3.2.0 Beta 4
11000- 11999 After 'MARK' rules but before 11000- 11999 After 'MARK' rules but before
Shorewall-generated rules for Shorewall-generated rules for
ISP interfaces. provider interfaces.
26000-26999 After ISP interface rules but 26000-26999 After provider interface rules but
before 'default' rule. before 'default' rule.
Rules with equal priority are applied in Rules with equal priority are applied in
the order in which they appear in the file. the order in which they appear in the file.
SOURCE(optonal) An ip address (network or host) that
matches the source IP address in a packet.
May also be specified as an interface
name optionally followed by ":" and an
address. If the define 'lo' is specified,
the packet must originate from the firewall
itself.
DEST(optional) An ip address (network or host) that
matches the destination IP address in a packet.
If you choose to omit either SOURCE or DEST,
place "-" in that column (or you can simply
leave the DEST column empty). Note that you
may not omit both SOURCE and DEST.
Example: You want all traffic coming in on eth1 to be routed to the ISP1 Example: You want all traffic coming in on eth1 to be routed to the ISP1
provider: provider:

View File

@ -8,6 +8,21 @@
# #
# Columns are: # Columns are:
# #
# SOURCE(optonal) An ip address (network or host) that
# matches the source IP address in a packet.
# May also be specified as an interface
# name optionally followed by ":" and an
# address. If the device 'lo' is specified,
# the packet must originate from the firewall
# itself.
#
# DEST(optional) An ip address (network or host) that
# matches the destination IP address in a packet.
#
# If you choose to omit either SOURCE or DEST,
# place "-" in that column. Note that you
# may not omit both SOURCE and DEST.
#
# PROVIDER The provider to route the traffic through. # PROVIDER The provider to route the traffic through.
# May be expressed either as the provider name # May be expressed either as the provider name
# or the provider number. # or the provider number.
@ -29,29 +44,13 @@
# Rules with equal priority are applied in # Rules with equal priority are applied in
# the order in which they appear in the file. # the order in which they appear in the file.
# #
# SOURCE(optonal) An ip address (network or host) that
# matches the source IP address in a packet.
# May also be specified as an interface
# name optionally followed by ":" and an
# address. If the device 'lo' is specified,
# the packet must originate from the firewall
# itself.
#
# DEST(optional) An ip address (network or host) that
# matches the destination IP address in a packet.
#
# If you choose to omit either SOURCE or DEST,
# place "-" in that column (or you can simply
# leave the DEST column empty). Note that you
# may not omit both SOURCE and DEST.
#
# Example: You want all traffic coming in on eth1 to be routed to the ISP1 # Example: You want all traffic coming in on eth1 to be routed to the ISP1
# provider: # provider:
# #
# #PROVIDER PRIORITY SOURCE DEST # #SOURCE DEST PROVIDER PRIORITY
# ISP1 1000 eth1 # eth1 - ISP1 1000
# #
# For additional information, see http://www.shorewall.net/MultiISP.html # For additional information, see http://www.shorewall.net/MultiISP.html
############################################################################## ##############################################################################
#PROVIDER PRIORITY SOURCE DEST #SOURCE DEST PROVIDER PRIORITY
#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE