This breaks the firewall log. Unknown intent, Ermal if you want to improve it, please make sure it works.

Revert "Remove completely bogus code with propper one."

This reverts commit be620dfd9283ee644c57b3c558c7dd603d0f4897.

1 files changed, 18 insertions, 2 deletions

diff --git a/etc/inc/filter_log.inc b/etc/inc/filter_log.inc
index 2488ced..3dc00c8 100644
--- a/etc/inc/filter_log.inc
+++ b/etc/inc/filter_log.inc
@@ -120,7 +120,7 @@ function parse_filter_line($line) {
 	if ($flent['dstport'])
 		$flent['dst'] .= ':' . $flent['dstport'];
 
-	$flent['interface'] = convert_log_interface_to_friendly_interface_name($flent['realint']);
+	$flent['interface']  = convert_log_interface_to_friendly_interface_name($flent['realint']);
 
 	$tmp = split("/", $rule);
 	$flent['rulenum'] = $tmp[0];
@@ -159,6 +159,22 @@ function parse_filter_line($line) {
 	}
 }
 
+function convert_log_interface_to_friendly_interface_name($int) {
+	global $config;
+
+	$iflist = get_configured_interface_with_descr();
+	foreach ($iflist as $if => $ifdesc)
+		$iftable[get_real_interface($if)] = $ifdesc;
+
+	/* Check for WAN first, pppoe (ng0) doesn't return properly otherwise */
+	if ($int == get_real_wan_interface($int))
+		$int = 'wan';
+	else
+		$int = empty($iftable[$int]) ? $int : $iftable[$int];
+
+	return $int;
+}
+
 function parse_ipport($addr) {
 	$addr = rtrim($addr, ":");
 	$port = '';
@@ -276,4 +292,4 @@ function handle_ajax($nentries, $tail = 50) {
 	}
 }
 
-?>
+?>
\ No newline at end of file