This function appears to not be needed on 2.0 (It is needed on 1.2.3 where I originally coded this part). Use convert_real_interface_to_friendly_interface_name() instead, since it seems to have special case handling for PPPoE and such now. Tested and working on a static IP setup, still needs tested by a PPPoE user on 2.0. (Logs should show "WAN" in the interface column, not "pppoe0".)

1 files changed, 1 insertions, 17 deletions

diff --git a/etc/inc/filter_log.inc b/etc/inc/filter_log.inc
index 56f1271..00cb691 100644
--- a/etc/inc/filter_log.inc
+++ b/etc/inc/filter_log.inc
@@ -122,7 +122,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_real_interface_to_friendly_interface_name($flent['realint']);
 
 	$tmp = split("/", $rule);
 	$flent['rulenum'] = $tmp[0];
@@ -161,22 +161,6 @@ 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 = '';