This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, core40 has been updated via 7e5a976c9de73e5af2a29ec6bfae5d084f511fcd (commit) via aa8245cbd54e3ba68903580381de4d60816606c5 (commit) from bdc84c9f9221a31d11e364bdf28013ffc30d31a6 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 7e5a976c9de73e5af2a29ec6bfae5d084f511fcd Author: Christian Schmidt christian.schmidt@ipfire.org Date: Mon Sep 6 08:46:59 2010 +0200
Remove SIP und SMAC if SNET is set to all, this avoids some false rules.
commit aa8245cbd54e3ba68903580381de4d60816606c5 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Sun Sep 5 17:18:43 2010 +0200
Be a little more robust.
-----------------------------------------------------------------------
Summary of changes: config/outgoingfw/outgoingfw.pl | 8 ++++---- html/cgi-bin/outgoingfw.cgi | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-)
Difference in files: diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index e2f9093..8d4d27d 100644 --- a/config/outgoingfw/outgoingfw.pl +++ b/config/outgoingfw/outgoingfw.pl @@ -153,12 +153,12 @@ foreach $configentry (sort @configs) } elsif ($configline[2] eq 'ip') { @SOURCE = ("$configline[5]"); $DEV = ""; - } elsif ($configline[2] eq 'all') { - @SOURCE = ("0/0"); - $DEV = ""; } elsif ($configline[2] eq 'mac') { @SOURCE = ("$configline[6]"); $DEV = ""; + } elsif ($configline[2] eq 'all') { + @SOURCE = ("0/0"); + $DEV = ""; } else { if ( -e "/var/ipfire/outgoing/groups/ipgroups/$configline[2]" ) { @SOURCE = `cat /var/ipfire/outgoing/groups/ipgroups/$configline[2]`; @@ -189,7 +189,7 @@ foreach $configentry (sort @configs)
if ( $SOURCE eq "" ){next;}
- if ( $configline[6] ne "" || $configline[2] eq 'mac' ){ + if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[2] ne 'all'){ $SOURCE =~ s/[^a-zA-Z0-9]/:/gi; $CMD = "/sbin/iptables -A OUTGOINGFWMAC -m mac --mac-source $SOURCE -d $DESTINATION -p $PROTO"; } else { diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index 07fcb39..27a8927 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -310,6 +310,11 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'}) if ($outfwsettings{'ACTION'} eq $Lang::tr{'add'}) { if ( $outfwsettings{'VALID'} eq 'yes' ) { + + if ( $outfwsettings{'SNET'} eq "all" ) { + $outfwsettings{'SIP'} =""; + $outfwsettings{'SMAC'}=""; + } open( FILE, ">> $configfile" ) or die "Unable to write $configfile"; print FILE <<END $outfwsettings{'STATE'};$outfwsettings{'ENABLED'};$outfwsettings{'SNET'};$outfwsettings{'PROT'};$outfwsettings{'NAME'};$outfwsettings{'SIP'};$outfwsettings{'SMAC'};$outfwsettings{'DIP'};$outfwsettings{'DPORT'};$outfwsettings{'LOG'};$outfwsettings{'TIME_MON'};$outfwsettings{'TIME_TUE'};$outfwsettings{'TIME_WED'};$outfwsettings{'TIME_THU'};$outfwsettings{'TIME_FRI'};$outfwsettings{'TIME_SAT'};$outfwsettings{'TIME_SUN'};$outfwsettings{'TIME_FROM'};$outfwsettings{'TIME_TO'};
hooks/post-receive -- IPFire 2.x development tree