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, next has been updated via ea40188f66d78c16956cdeb6d5c806bb7117c7f1 (commit) from b8a97bd9436f3494745b95868dc5b0774d0c40e8 (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 ea40188f66d78c16956cdeb6d5c806bb7117c7f1 Author: Bernhard Bitsch bbitsch@ipfire.org Date: Tue Mar 10 18:48:34 2015 +0100

BUG10502: Fix wrong interfaces in firewall.log

Fix from BeBiMa

-----------------------------------------------------------------------

Summary of changes: html/cgi-bin/logs.cgi/firewalllog.dat | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)

Difference in files: diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index 8bb4900..7525626 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -334,13 +334,14 @@ foreach $_ (@log) my $comment = $3; my $packet = $4;

- $packet =~ /IN=(\w+)/; my $iface=$1; if ( $1 =~ /2./ ){ $iface="";} - $packet =~ /SRC=([\d.]+)/; my $srcaddr=$1; - $packet =~ /DST=([\d.]+)/; my $dstaddr=$1; - $packet =~ /MAC=([\w+:]+)/; my $macaddr=$1; - $packet =~ /PROTO=(\w+)/; my $proto=$1; - $packet =~ /SPT=(\d+)/; my $srcport=$1; - $packet =~ /DPT=(\d+)/; my $dstport=$1; + my ($iface, $srcaddr, $dstaddr, $macaddr, $proto, $srcport, $dstport); + $iface=$1 if $packet =~ /IN=(\w+)/; + $srcaddr=$1 if $packet =~ /SRC=([\d.]+)/; + $dstaddr=$1 if $packet =~ /DST=([\d.]+)/; + $macaddr=$1 if $packet =~ /MAC=([\w+:]+)/; + $proto=$1 if $packet =~ /PROTO=(\w+)/; + $srcport=$1 if $packet =~ /SPT=(\d+)/; + $dstport=$1 if $packet =~ /DPT=(\d+)/;

my $gi = Geo::IP::PurePerl->new(); my $ccode = $gi->country_code_by_name($srcaddr);

hooks/post-receive -- IPFire 2.x development tree