holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Fix for IPV6 addresses and the 'ip' utility

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@735 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2003-08-28 18:02:59 +00:00
parent 05c0c27012
commit bb20363bb2
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/firewall
View File

@ -850,7 +850,7 @@ find_interface_address() # $1 = interface
#
# get the line of output containing the first IP address
#
addr=`ip addr show $1 2> /dev/null | grep inet | head -n1`
addr=`ip -f inet addr show $1 2> /dev/null | grep inet | head -n1`
#
# If there wasn't one, bail out now
#
@ -868,7 +868,7 @@ find_interface_address() # $1 = interface
#
find_interface_addresses() # $1 = interface
{
ip addr show $1 | grep inet | sed 's/inet //;s/\/.*//;s/ peer.*//'
ip -f inet addr show $1 | grep inet | sed 's/inet //;s/\/.*//;s/ peer.*//'
}
#
@ -1452,7 +1452,7 @@ setup_mac_lists() {
#
for interface in $maclist_interfaces; do
chain=`mac_chain $interface`
blob=`ip addr show $interface 2> /dev/null | grep inet | sed 's/inet //; s/brd //; s/scope.*//;'`
blob=`ip -f inet addr show $interface 2> /dev/null | grep inet | sed 's/inet //; s/brd //; s/scope.*//;'`
[ -z "$blob" ] && \
fatal_error "Interface $interface must be up before Shorewall can start"

7
Shorewall/functions
View File

@ -269,6 +269,13 @@ encodeaddr() {
# Enumerate the members of an IP range -- When using a shell supporting only
# 32-bit signed arithmetic, the range cannot span 128.0.0.0.
#
# Comes in two flavors:
#
# ip_range() - produces a mimimal list of network/host addresses that spans
# the range.
#
# ip_range_explicit() - explicitly enumerates the range.
#
ip_range() {
local first last l x y z vlsm

10
Shorewall/releasenotes.txt
View File

@ -34,6 +34,16 @@ Problems Corrected since version 1.4.6:
IP address in the dynamic chain so that multiple 'allow' commands
were required to re-enable traffic to/from the address.
8) When ADD_SNAT_ALIASES=Yes in shorewall.conf, the following entry in
/etc/shorewall/masq resulted in a startup error:
eth0 eth1 206.124.146.20-206.124.146.24
9) Shorewall previously choked over IPV6 addresses configured on
interfaces in contexts where Shorewall needed to detect something
about the interface (such as when "detect" appears in the BROADCAST
column of the /etc/shorewall/interfaces file).
Migration Issues:
1) IP Traffic Accounting is changed from Snapshot 20030813.