Fixed outgoing fw log messages in mode 1 and found a bug logging only

active when using german language.
This commit is contained in:
Christian Schmidt
2011-01-20 21:01:42 +01:00
parent d846fee037
commit e4e42008ad
3 changed files with 12 additions and 2 deletions

View File

@@ -2,7 +2,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2005-2010 IPFire Team # # Copyright (C) 2007-2011 IPFire Team #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -25,6 +25,7 @@ use strict;
#use warnings; #use warnings;
require '/var/ipfire/general-functions.pl'; require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
my %outfwsettings = (); my %outfwsettings = ();
my %checked = (); my %checked = ();
@@ -218,7 +219,13 @@ foreach $configentry (sort @configs)
$CMD = "$CMD -o $netsettings{'RED_DEV'}"; $CMD = "$CMD -o $netsettings{'RED_DEV'}";
if ($configline[9] eq "aktiv") { if ( $configline[9] eq $Lang::tr{'aktiv'} && $outfwsettings{'POLICY'} eq 'MODE1' ) {
if ($DEBUG) {
print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '\n";
} else {
system("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '");
}
} elsif ( $configline[9] eq $Lang::tr{'aktiv'} && $outfwsettings{'POLICY'} eq 'MODE2' ) {
if ($DEBUG) { if ($DEBUG) {
print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '\n"; print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '\n";
} else { } else {

View File

@@ -6,3 +6,4 @@ srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/sbin/updxlrator usr/sbin/updxlrator
var/ipfire/outgoing/bin/outgoingfw.pl

View File

@@ -37,6 +37,8 @@ extract_files
#Start services #Start services
echo Starting Proxy echo Starting Proxy
/etc/init.d/squid start 2>/dev/null /etc/init.d/squid start 2>/dev/null
echo Rewriting Outgoing FW Rules
/var/ipfire/outgoing/bin/outgoingfw.pl
# #
#Update Language cache #Update Language cache