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

active when using german language.

diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 6709ee603fb997c96e695d685aedc56eae240f65..53462db483d99c747e1325e24d4472f02c7eadb2 100644 (file)
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -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        #
 # it under the terms of the GNU General Public License as published by        #
 #                                                                             #
 # 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        #


@@ -25,6 +25,7 @@ use strict;
 #use warnings;
 
 require '/var/ipfire/general-functions.pl';
 #use warnings;
 
 require '/var/ipfire/general-functions.pl';

+require "${General::swroot}/lang.pl";

 
 my %outfwsettings = ();
 my %checked = ();
 
 my %outfwsettings = ();
 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) {
                                                print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '\n";
                                        } else {
                                        if ($DEBUG) {
                                                print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '\n";
                                        } else {

diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files
index f6d15ca787a8518bfb95c0cc1181f32b299d80c4..814baf3e4ac3564cb0135afe221cdee90045265f 100644 (file)
--- a/config/rootfiles/core/45/filelists/files
+++ b/config/rootfiles/core/45/filelists/files
@@ -6,3 +6,4 @@ srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/sbin/updxlrator
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/sbin/updxlrator

+var/ipfire/outgoing/bin/outgoingfw.pl

diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh
index 1197905cd362845ff3b318e7d883e0a3999e754b..03c6cfbba91c0931f5dc6851d5876f627f7d9738 100644 (file)
--- a/config/rootfiles/core/45/update.sh
+++ b/config/rootfiles/core/45/update.sh
@@ -37,6 +37,8 @@ extract_files
 #Start services
 echo Starting Proxy
 /etc/init.d/squid start 2>/dev/null
 #Start services
 echo Starting Proxy
 /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