diff options
| author | Scott Dale <sdale@pfsense.org> | 2007-07-04 01:05:35 +0000 |
|---|---|---|
| committer | Scott Dale <sdale@pfsense.org> | 2007-07-04 01:05:35 +0000 |
| commit | 22ff4a6e61cdf9eb283f96312a9eb61b9dc92d8a (patch) | |
| tree | 75b95bee253726232618f7c1dc6a75d0501f11b2 /usr/local/www | |
| parent | 7584153eb4e83a86031e514a6be5ff138775ae7e (diff) | |
| download | pfsense-22ff4a6e61cdf9eb283f96312a9eb61b9dc92d8a.zip pfsense-22ff4a6e61cdf9eb283f96312a9eb61b9dc92d8a.tar.gz | |
Update reg ex to accommodate extra data thrown into log
MFC: asap
Diffstat (limited to 'usr/local/www')
| -rwxr-xr-x | usr/local/www/diag_logs_filter_dynamic.php | 12 | ||||
| -rw-r--r-- | usr/local/www/widgets/include/log.inc | 13 |
2 files changed, 11 insertions, 14 deletions
diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index f4f140e..aa9c7a1 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); diff --git a/usr/local/www/widgets/include/log.inc b/usr/local/www/widgets/include/log.inc index aa99daf..f7bbdf7 100644 --- a/usr/local/www/widgets/include/log.inc +++ b/usr/local/www/widgets/include/log.inc @@ -37,14 +37,13 @@ function conv_clog_filter($logfile, $tail = 8) { break; $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("/(\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); - + 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); $do_not_display = false; |
