From 779e4029ef699c6654139b0fe480d832fc03a397 Mon Sep 17 00:00:00 2001 From: Rob Brewer Date: Sat, 5 Mar 2022 21:18:42 +0000 Subject: [PATCH] showrequestfromblocklist.dat: Modify regex for added space in log-prefix. Signed-off-by: Rob Brewer Signed-off-by: Stefan Schantl --- html/cgi-bin/logs.cgi/showrequestfromblocklist.dat | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/html/cgi-bin/logs.cgi/showrequestfromblocklist.dat b/html/cgi-bin/logs.cgi/showrequestfromblocklist.dat index d189a78d46..4f8264acec 100755 --- a/html/cgi-bin/logs.cgi/showrequestfromblocklist.dat +++ b/html/cgi-bin/logs.cgi/showrequestfromblocklist.dat @@ -161,8 +161,8 @@ my $blaoklist = $cgiparams{blocklist}; if (!$skip) { while () { - if (/^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*BLKLST_(\w+)IN=.*/) { - if($1 eq $blocklist){ + if (/^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*BLKLST_(\w+)\s?IN=.*/) { + if($1 eq $blacklist){ $log[$lines] = $_; $lines++; } @@ -186,8 +186,8 @@ if ($multifile) { } if (!$skip) { while () { - if (/^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*BLKLST_(\w+)IN=.*/) { - if($1 eq $blocklist){ + if (/^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*BLKLST_(\w+)\s?IN=.*/) { + if($1 eq $blacklist){ $log[$lines] = $_; $lines++; } @@ -308,9 +308,8 @@ $lines = 0; foreach $_ (@slice) { $a = $_; # Check whether valid ipv4 or ipv6 address - if (($_ =~ /BLKLST_(\w+)IN=/)) { - if($1 eq $blocklist) { - + if (($_ =~ /BLKLST_(\w+)\s?IN=/)) { + if($1 eq $blacklist) { my $in = '-'; my $out = '-'; my $srcaddr = ''; my $dstaddr = ''; my $protostr = ''; -- 2.39.5