X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=html%2Fcgi-bin%2Flogs.cgi%2Ffirewalllog.dat;h=78cfdda897ab3640e055d44437f537c20a0f687c;hb=dace10b5e4dd1df686e9d01e4cd4b39441c967e4;hp=1ace47f8db1923ad817680bb5b25327d93cceb61;hpb=33a31f1a1106d1e7f949e6a6f5ea6efbc5325618;p=ipfire-2.x.git diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index 1ace47f8db..78cfdda897 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -13,6 +13,9 @@ # use strict; +use Geo::IP::PurePerl; +use Getopt::Std; + # enable only the following on debugging purpose #use warnings; #use CGI::Carp 'fatalsToBrowser'; @@ -307,6 +310,7 @@ print <$Lang::tr{'iface'} $Lang::tr{'proto'} $Lang::tr{'source'} + Flag $Lang::tr{'src port'} $Lang::tr{'mac address'} $Lang::tr{'destination'} @@ -326,7 +330,6 @@ foreach $_ (@log) my $comment = $3; my $packet = $4; - $packet =~ /IN=(\w+)/; my $iface=$1; $packet =~ /SRC=([\d\.]+)/; my $srcaddr=$1; $packet =~ /DST=([\d\.]+)/; my $dstaddr=$1; @@ -334,6 +337,11 @@ foreach $_ (@log) $packet =~ /PROTO=(\w+)/; my $proto=$1; $packet =~ /SPT=(\d+)/; my $srcport=$1; $packet =~ /DPT=(\d+)/; my $dstport=$1; + + my $gi = Geo::IP::PurePerl->new(); + my $ccode = $gi->country_code_by_name($srcaddr); + my $fcode = lc($ccode); + my $servi = uc(getservbyport($srcport, lc($proto))); if ($servi ne '' && $srcport < 1024) { $srcport = "$srcport($servi)"; } @@ -352,11 +360,8 @@ foreach $_ (@log) $comment $iface $proto - - -
$srcaddr
- + $ccode $srcport $macaddr