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

Add 'findgw' user exit

Browse Source
This commit is contained in:
Tom Eastep 2009-05-11 14:35:20 -07:00
parent 52ad3cbda3
commit f75f4158b3
4 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -98,7 +98,7 @@ sub generate_script_1() {
################################################################################ ################################################################################
EOF EOF
for my $exit qw/init isusable start tcclear started stop stopped clear refresh refreshed restored/ { for my $exit qw/init isusable start tcclear started stop stopped clear refresh refreshed restored findgw/ {
emit "\nrun_${exit}_exit() {"; emit "\nrun_${exit}_exit() {";
push_indent; push_indent;
append_file $exit or emit 'true'; append_file $exit or emit 'true';

18
Shorewall/Perl/prog.header
View File

@ -808,13 +808,13 @@ detect_dynamic_gateway() { # $1 = interface
local GATEWAYS local GATEWAYS
GATEWAYS= GATEWAYS=
local gateway local gateway
#
# First assume that this is some sort of point-to-point interface gateway=$(run_findgw_exit $1);
#
gateway=$( find_peer $($IP addr list $interface ) ) if [ -n "$gateway" ]; then
# gateway=$( find_peer $($IP addr list $interface ) )
# If that didn't work, then try DHCP fi
#
if [ -z "$gateway" -a -f /var/lib/dhcpcd/dhcpcd-${1}.info ]; then if [ -z "$gateway" -a -f /var/lib/dhcpcd/dhcpcd-${1}.info ]; then
eval $(grep ^GATEWAYS= /var/lib/dhcpcd/dhcpcd-${1}.info 2> /dev/null) eval $(grep ^GATEWAYS= /var/lib/dhcpcd/dhcpcd-${1}.info 2> /dev/null)
[ -n "$GATEWAYS" ] && GATEWAYS=${GATEWAYS%,*} && gateway=$GATEWAYS [ -n "$GATEWAYS" ] && GATEWAYS=${GATEWAYS%,*} && gateway=$GATEWAYS
@ -824,10 +824,6 @@ detect_dynamic_gateway() { # $1 = interface
gateway=$(grep 'option routers' /var/lib/dhcp/dhclient-${1}.lease | tail -n 1 | while read j1 j2 gateway; do echo $gateway; return 0; done) gateway=$(grep 'option routers' /var/lib/dhcp/dhclient-${1}.lease | tail -n 1 | while read j1 j2 gateway; do echo $gateway; return 0; done)
fi fi
if [ -z "$gateway" -a -f /var/lib/dhcp3/dhclient-${1}.leases ]; then
gateway=$(grep 'option routers' /var/lib/dhcp3/dhclient-${1}.leases | tail -n 1 | while read j1 j2 gateway; do echo $gateway; return 0; done)
fi
[ -n "$gateway" ] && echo $gateway [ -n "$gateway" ] && echo $gateway
} }

2
Shorewall/changelog.txt
View File

@ -4,6 +4,8 @@ Changes in Shorewall 4.3.11
2) Fix SCTP source port handling in tcfilters. 2) Fix SCTP source port handling in tcfilters.
3) Add 'findgw' user exit.
Changes in Shorewall 4.3.10 Changes in Shorewall 4.3.10
1) Fix handling of shared optional providers. 1) Fix handling of shared optional providers.

24
Shorewall/releasenotes.txt
View File

@ -125,7 +125,29 @@ None.
local net flow=dst local net flow=dst
These will cause a 'flow' to consists of the traffic to/from each These will cause a 'flow' to consists of the traffic to/from each
internal system. internal system.
2) In order to generalize support for learning the gateway for dynamic
interfaces, a new 'findgw' extension script (user exit) has been
added.
The exit will be invoked in a function that has a single argument:
$1 = <name of an interface>
If the function can determine the gateway for the passed interface,
it should write the gateway to standard out. Here is a sample
/etc/shorewall/findgw that works with dhclient (dhcp3) in Debian
Lenny:
if [ -f /var/lib/dhcp3/dhclient-${1}.leases ]; then
grep 'option routers' /var/lib/dhcp3/dhclient-${1}.leases |\
tail -n 1 |\
while read j1 j2 gateway; do echo $gateway; return 0; done
fi
The same code works on Ubuntu Jaunty if you replace '.leases' with
'.lease' (don't you just love the consistency between distributions?).
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
N E W F E A T U R E S IN 4 . 3 N E W F E A T U R E S IN 4 . 3