Fixed detection of firewall chain when bridge is used for ipv6

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / logs.cgi / showrequestfromport.dat

diff --git a/html/cgi-bin/logs.cgi/showrequestfromport.dat b/html/cgi-bin/logs.cgi/showrequestfromport.dat
index d735c7be9c4c49f4b9f63c13458892edf576237f..6f5f63bfbf232c470aff51ee658c3a8367eef95c 100644 (file)
--- a/html/cgi-bin/logs.cgi/showrequestfromport.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromport.dat
@@ -308,15 +308,15 @@ foreach $_ (@slice)
        my $srcport = ''; my $dstport = '';
 
         # If ipv6 uses bridge, the use PHYSIN, otherwise use IN
-       if ($_ =~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=.*)(PHYSIN=.*)$/) {}
+       if    ($_ =~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=.*)(PHYSIN=.*)$/) {}
         elsif ($_ =~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/) {}
        my $timestamp = $1; my $chain = $2; my $packet = $3;
        $timestamp =~ /(...) (..) (..:..:..)/;
        my $month = $1; my $day = $2; my $time = $3; my $iface;
 
         # If ipv6 uses bridge, the use PHYSIN and PHYSOUT, otherwise use IN and OUT
-       if ($a =~ /PHYSIN\=(\w+)/) { $iface = $1; } elsif ($a =~ /IN\=(\w+)/) { $iface = $1; }
-        if ($a =~ /PHYSOUT\=(\w+)/) { $out = $1; } elsif ($a =~ /OUT\=(\w+)/) { $out = $1; }
+       if ($a =~ /PHYSIN\=(\w+)/)  { $iface = $1; } elsif ($a =~ /IN\=(\w+)/)  { $iface = $1; }
+        if ($a =~ /PHYSOUT\=(\w+)/) { $out = $1; }   elsif ($a =~ /OUT\=(\w+)/) { $out = $1; }
        # Detect ipv4 and ipv6 addresses
        if (($a =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($a =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) { $srcaddr = $1; }
        if (($a =~ /DST\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($a =~ /DST\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) { $dstaddr = $1; }