From 0604be0edd7a964edab2d20bea203da1320d422b Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Wed, 23 Aug 2006 20:19:18 +0000
Subject: Correct friendly interface names since other developers cannot be
 bothered to help out.

---
 etc/inc/filter.inc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'etc/inc/filter.inc')

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 1fb8938..14b74b1 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -1982,11 +1982,12 @@ EOD;
 	if (isset($config['filter']['bypassstaticroutes']) && is_array($config['staticroutes']['route']) && count($config['staticroutes']['route'])) {
 		foreach ($config['staticroutes']['route'] as $route) {
 			unset($sa);
-
+			$friendly_int = convert_friendly_interface_to_friendly_descr($route['interface']);
 			if ($route['interface'] == "lan") {
 				$sa = $lansa;
 				$sn = $lansn;
 				$if = $lanif;
+				$friendly_int = "lan";
 			} else if (strstr($route['interface'], "opt")) {
 				$oc = $optcfg[$route['interface']];
 				if ($oc['ip']) {
@@ -1999,10 +2000,10 @@ EOD;
 			if ($sa) {
 				$ipfrules .= <<<EOD
 anchor "staticrouted"
-pass in quick on \${$route['interface']} from {$sa}/{$sn} to {$route['network']} label "pass traffic between statically routed subnets"
-pass in quick on \${$route['interface']} from {$route['network']} to {$sa}/{$sn} label "pass traffic between statically routed subnets"
-pass out quick on \${$route['interface']} from {$sa}/{$sn} to {$route['network']} label "pass traffic between statically routed subnets"
-pass out quick on \${$route['interface']} from {$route['network']} to {$sa}/{$sn} label "pass traffic between statically routed subnets"
+pass in quick on \${$friendly_int} from {$sa}/{$sn} to {$route['network']} label "pass traffic between statically routed subnets"
+pass in quick on \${$friendly_int} from {$route['network']} to {$sa}/{$sn} label "pass traffic between statically routed subnets"
+pass out quick on \${$friendly_int} from {$sa}/{$sn} to {$route['network']} label "pass traffic between statically routed subnets"
+pass out quick on \${$friendly_int} from {$route['network']} to {$sa}/{$sn} label "pass traffic between statically routed subnets"
 
 EOD;
 			}
-- 
cgit v1.1