extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-25 04:01:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change COMBINE_JUMPS to OPTIMIZE and make its value numeric

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4731 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-10-25 15:13:49 +00:00
parent f6e37722c9
commit 30b1cf7153
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/changelog.txt
View File

@ -8,6 +8,8 @@ Changes in 3.3.4
4) Add an output chain for each interface. 4) Add an output chain for each interface.
5) Rename COMBINE_JUMPS to OPTIMIZE and make its value numeric.
Changes in 3.3.3 Changes in 3.3.3
1) Fix excluding in SUBNET column. 1) Fix excluding in SUBNET column.

2
Shorewall/compiler
View File

@ -4279,7 +4279,7 @@ activate_rules()
temp_zones= temp_zones=
last_chain= last_chain=
if [ -n "$COMBINE_JUMPS" ]; then if [ $OPTIMIZE -gt 0 ]; then
dest_zones= dest_zones=
# #

10
Shorewall/lib.config
View File

@ -1794,7 +1794,7 @@ do_initialize() {
REJECT_DEFAULT= REJECT_DEFAULT=
ACCEPT_DEFAULT= ACCEPT_DEFAULT=
QUEUE_DEFAULT= QUEUE_DEFAULT=
COMBINE_JUMPS= OPTIMIZE=
LOGLIMIT= LOGLIMIT=
LOGPARMS= LOGPARMS=
@ -2008,7 +2008,6 @@ do_initialize() {
HIGH_ROUTE_MARKS=$(added_param_value_no HIGH_ROUTE_MARKS $HIGH_ROUTE_MARKS) HIGH_ROUTE_MARKS=$(added_param_value_no HIGH_ROUTE_MARKS $HIGH_ROUTE_MARKS)
TC_EXPERT=$(added_param_value_no TC_EXPERT $TC_EXPERT) TC_EXPERT=$(added_param_value_no TC_EXPERT $TC_EXPERT)
USE_ACTIONS=$(added_param_value_yes USE_ACTIONS $USE_ACTIONS) USE_ACTIONS=$(added_param_value_yes USE_ACTIONS $USE_ACTIONS)
COMBINE_JUMPS=$(added_param_value_no COMBINE_JUMPS $COMBINE_JUMPS)
[ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes" [ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes"
[ -n "$XCONNMARK_MATCH" ] || XCONNMARK= [ -n "$XCONNMARK_MATCH" ] || XCONNMARK=
@ -2085,6 +2084,13 @@ do_initialize() {
;; ;;
esac esac
case "${OPTIMIZE:=0}" in
0|1)
;;
*)
fatal_error "Invalid OPTIMIZE value ($OPTIMIZE)"
;;
esac
# #
# Strip the files that we use often # Strip the files that we use often
# #

2
Shorewall/releasenotes.txt
View File

@ -343,7 +343,7 @@ New Features:
0 0 wifi2all all -- * tun+ 0.0.0.0/0 0.0.0.0/0 policy match dir out pol none 0 0 wifi2all all -- * tun+ 0.0.0.0/0 0.0.0.0/0 policy match dir out pol none
gateway:~ # gateway:~ #
This redundancy may be eliminated by setting COMBINE_JUMPS=Yes in shorewall.conf. This redundancy may be eliminated by setting OPTIMIZE=1 in shorewall.conf.
gateway:~ # shorewall-lite show eth2_fwd gateway:~ # shorewall-lite show eth2_fwd
Shorewall Lite 3.3.3 Chains eth2_fwd at gateway - Thu Oct 19 09:15:24 PDT 2006 Shorewall Lite 3.3.3 Chains eth2_fwd at gateway - Thu Oct 19 09:15:24 PDT 2006

6
Shorewall/shorewall.conf
View File

@ -951,7 +951,7 @@ HIGH_ROUTE_MARKS=No
USE_ACTIONS=Yes USE_ACTIONS=Yes
# #
# Combine Jumps # Optimize Ruleset
# #
# Traditionally, Shorewall has created rules for the complete matrix of # Traditionally, Shorewall has created rules for the complete matrix of
# Networks defined by the zones, interfaces and hosts files. Any traffic that # Networks defined by the zones, interfaces and hosts files. Any traffic that
@ -959,10 +959,10 @@ USE_ACTIONS=Yes
# built-in changes. When the matrix is sparse, this results in lots of # built-in changes. When the matrix is sparse, this results in lots of
# largely useless rules. # largely useless rules.
# #
# These extra rules can be eliminated by setting COMBINE_JUMPS=Yes # These extra rules can be eliminated by setting OPTIMIZE=1
# #
COMBINE_JUMPS=No OPTIMIZE=0
############################################################################### ###############################################################################
# P A C K E T D I S P O S I T I O N # P A C K E T D I S P O S I T I O N