From 0018f8ef91539c2a049b00a847fcd0e4e7112aa4 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Wed, 4 Jul 2007 20:14:26 +0000 Subject: [PATCH] MFC 18866 Update reg ex to accommodate extra data thrown into log Ticket #1371 --- usr/local/www/diag_logs_filter_dynamic.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index f4f140ecb3..aa9c7a1659 100755 --- a/usr/local/www/diag_logs_filter_dynamic.php +++ b/usr/local/www/diag_logs_filter_dynamic.php @@ -75,13 +75,11 @@ function conv_clog_filter($logfile, $tail = 50) { break; $log_split = ""; - - preg_match("/(\b(?:\d{1,3}\.){3}\d{1,3}(\.\w+)?)\s.*\s(\b(?:\d{1,3}\.){3}\d{1,3}(\.\w+)?)/", $logent, $log_split); - - $flent['src'] = convert_port_period_to_colon($log_split[1]); - $flent['dst'] = convert_port_period_to_colon($log_split[3]); - - preg_match("/(.*)\s.*\spf:\s.*\srule\s(.*)\(match\)\:\s(.*)\s\w+\son\s(\w+)\:\s(.*)\s>\s(.*)\:\s.*/", $logent, $log_split); + + //old reg ex + //preg_match("/(.*)\s.*\spf:\s.*\srule\s(.*)\(match\)\:\s(.*)\s\w+\son\s(\w+)\:\s(.*)\s>\s(.*)\:\s.*/", $logent, $log_split); + + preg_match("/(.*)\s.*\spf:\s.*\srule\s(.*)\(match\)\:\s(.*)\s\w+\son\s(\w+)\:\s.*\slength\:.*\s(.*)\s>\s(.*)\:\s.*/", $logent, $log_split); $logent = strtoupper($logent);