From ea40188f66d78c16956cdeb6d5c806bb7117c7f1 Mon Sep 17 00:00:00 2001 From: Bernhard Bitsch Date: Tue, 10 Mar 2015 18:48:34 +0100 Subject: [PATCH] BUG10502: Fix wrong interfaces in firewall.log Fix from BeBiMa --- html/cgi-bin/logs.cgi/firewalllog.dat | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index 8bb4900638..7525626668 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); -- 2.39.5