From e4bda595c73eee3e998d64d8b38bdcb036c93db9 Mon Sep 17 00:00:00 2001
From: NOYB <Al_Stu@Frontier.com>
Date: Sat, 27 Feb 2016 00:02:07 -0800
Subject: [PATCH] ICMPv6 Firewall Log Display - Fixes 5933

ICMPv6 logging was not being displayed in firewall log.
---
 src/etc/inc/filter_log.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/etc/inc/filter_log.inc b/src/etc/inc/filter_log.inc
index dfc5a751f9..ef24f4bb2e 100644
--- a/src/etc/inc/filter_log.inc
+++ b/src/etc/inc/filter_log.inc
@@ -395,7 +395,7 @@ function parse_firewall_log_line($line) {
 				$flent['urg'] = $rule_data[$field++];
 				$flent['options'] = explode(";", $rule_data[$field++]);
 			}
-		} else if ($flent['protoid'] == '1') { // ICMP
+		} else if ($flent['protoid'] == '1' || $flent['protoid'] == '58') {	// ICMP (IPv4 & IPv6)
 			$flent['src'] = $flent['srcip'];
 			$flent['dst'] = $flent['dstip'];