X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Flogs.cgi%2Ffirewalllog.dat;h=5a584d60debb6bdcd9709ea0525ca273e4db4bdc;hb=1292598207d74304227a3c77346c1d046eb51975;hp=8bb4900638b7b1ce431c99c18d568c65f159aa84;hpb=bbb3a931fa3b11a0d2374595cbe0d1c981e9b5e4;p=ipfire-2.x.git

diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat
index 8bb4900638..5a584d60de 100644
--- a/html/cgi-bin/logs.cgi/firewalllog.dat
+++ b/html/cgi-bin/logs.cgi/firewalllog.dat
@@ -21,6 +21,7 @@ use Getopt::Std;
 #use CGI::Carp 'fatalsToBrowser';
 
 require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/geoip-functions.pl";
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -334,13 +335,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);
@@ -371,10 +373,15 @@ foreach $_ (@log)
         <td align='center' $col>$srcport<br/>$dstport</td>
 END
 ;
-        if ( $fcode ne "" ){
-        print "<td align='center' $col><a href='../country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></a></td>";}
-        else {
-        print "<td align='center' $col></td>";}
+	# Get flag icon for of the country.
+	my $flag_icon = &GeoIP::get_flag_icon($fcode);
+
+        if ( $flag_icon) {
+		print "<td align='center' $col><a href='../country.cgi#$fcode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode'></a></td>";
+	} else {
+		print "<td align='center' $col></td>";
+	}
+
         print <<END
         <td align='center' $col>$macaddr</td>
 </tr>