diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-11-21 19:44:04 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-11-21 19:44:04 +0000 |
| commit | f6d5a59873892e6551ae2bfc872850e68e4c5f2b (patch) | |
| tree | 335bdd10ffec793bd7cb6d1eb37985f232de04c2 /usr/local/www/diag_logs_filter.php | |
| parent | 4bae67f61619df8e6a7aac69c8e7cde5473e4a77 (diff) | |
| download | pfsense-f6d5a59873892e6551ae2bfc872850e68e4c5f2b.zip pfsense-f6d5a59873892e6551ae2bfc872850e68e4c5f2b.tar.gz | |
MFC 7936
Convert port into :$PORT * Allow ICMP entries to appear correctly
Ticket #695
Diffstat (limited to 'usr/local/www/diag_logs_filter.php')
| -rwxr-xr-x | usr/local/www/diag_logs_filter.php | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index db279a7..0952457 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -76,15 +76,21 @@ function conv_clog($logfile, $tail = 50) { $flent['proto'] = "TCP"; if(stristr($logent, "UDP") == true) $flent['proto'] = "UDP"; + if(stristr($logent, "ICMP") == true) + $flent['proto'] = "ICMP"; $flent['time'] = $log_split[1]; $flent['act'] = $log_split[3]; $flent['interface'] = strtoupper(convert_real_interface_to_friendly_interface_name(str_replace(":","",$log_split[4]))); - $flent['src'] = $log_split[5]; - $flent['dst'] = $log_split[7]; - - + if($flent['proto'] == "TCP" or $flent['proto'] == "UDP") { + $flent['src'] = convert_port_period_to_colon($log_split[5]); + $flent['dst'] = convert_port_period_to_colon($log_split[7]); + } else { + $flent['src'] = $log_split[5]; + $flent['dst'] = $log_split[7]; + } + if($flent['src'] == "" or $flent['dst'] == "") { /* do not display me! */ } else { @@ -103,6 +109,8 @@ function convert_port_period_to_colon($addr) { $newvar = $addr_split[0] . "." . $addr_split[1] . "." . $addr_split[2] . "." . $addr_split[3]; else $newvar = $addr_split[0] . "." . $addr_split[1] . "." . $addr_split[2] . "." . $addr_split[3] . ":" . $addr_split[4]; + if($newvar == "...") + return $addr; return $newvar; } |
