extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-22 23:53:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update version to 3.2.0 Beta 4

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3774 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-04-05 22:47:42 +00:00
parent e0cc8f0480
commit 8d0742a0bd
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Shorewall/compiler
View File

@ -1106,7 +1106,7 @@ verify_mark() # $1 = value to test
verify_mark1() verify_mark1()
{ {
[ $1 -lt 256 ] && return 0 [ $1 -lt 256 ] && return 0
[ -n "$XCONNMARK" ] || return 1 [ -n "$HIGH_ROUTE_MARKS" ] || return 1
[ $1 -gt 65535 ] && return 1 [ $1 -gt 65535 ] && return 1
return $(($1 & 0XFF)) return $(($1 & 0XFF))
} }
@ -3370,6 +3370,8 @@ process_tc_rule()
fatal_error "Invalid mark value ($mark) in rule \"$rule\"" fatal_error "Invalid mark value ($mark) in rule \"$rule\""
;; ;;
esac esac
elif [ -n "$HIGH_ROUTE_MARKS" -a $chain = tcpre ]; then
fatal_error "Marks < 256 may not be set in the PREROUTING chain when HIGH_ROUTE_MARKS=Yes"
fi fi
fi fi
;; ;;
@ -3488,10 +3490,9 @@ setup_tc1() {
# #
# Route marks are restored in PREROUTING/OUTPUT prior to these rules. We only send # Route marks are restored in PREROUTING/OUTPUT prior to these rules. We only send
# packets that are not part of a marked connection to the 'tcpre/tcout' chains unless # packets that are not part of a marked connection to the 'tcpre/tcout' chains.
# HIGH_
# #
if [ -z "$HIGH_ROUTE_MARKS" -a -n "$ROUTEMARK_INTERFACES" ]; then if [ -n "$ROUTEMARK_INTERFACES" ]; then
mark_part="-m mark --mark 0" mark_part="-m mark --mark 0"
fi fi

2
Shorewall/fallback.sh
View File

@ -28,7 +28,7 @@
# shown below. Simply run this script to revert to your prior version of # shown below. Simply run this script to revert to your prior version of
# Shoreline Firewall. # Shoreline Firewall.
VERSION=3.2.0-Beta3 VERSION=3.2.0-Beta4
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall/install.sh
View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
# #
VERSION=3.2.0-Beta3 VERSION=3.2.0-Beta4
usage() # $1 = exit status usage() # $1 = exit status
{ {

4
Shorewall/releasenotes.txt
View File

@ -113,9 +113,7 @@ Other changes in 3.2.0 Beta 4
b) You may only set those mark values in the FORWARD chain. b) You may only set those mark values in the FORWARD chain.
c) Marks used for traffic shaping must still be in the range of 1-255 c) Marks used for traffic shaping must still be in the range of 1-255
but these may now be set in any chain. If they are set in the and may still not be set in the forward chain.
FORWARD chain, they must be set before any routing marks (those
with values greater than 255).
d) When you SAVE or RESTORE in tcrules, only the TC mark value is d) When you SAVE or RESTORE in tcrules, only the TC mark value is
saved or restored. Shorewall handles saving and restoring the saved or restored. Shorewall handles saving and restoring the

2
Shorewall/shorecap
View File

@ -44,7 +44,7 @@
# used during firewall compilation, then the generated firewall program will likewise not # used during firewall compilation, then the generated firewall program will likewise not
# require Shorewall to be installed. # require Shorewall to be installed.
VERSION=3.2.0-Beta3 VERSION=3.2.0-Beta4
# #
# Suppress all output for a command # Suppress all output for a command

2
Shorewall/uninstall.sh
View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version # You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=3.2.0-Beta3 VERSION=3.2.0-Beta4
usage() # $1 = exit status usage() # $1 = exit status
{ {