MFC 10666

No Need To check for aliases here we had just finish building the network address. Plus its futzing over string with a null return.

1 files changed, 0 insertions, 6 deletions

diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index 76fa02d..00184e7 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -457,9 +457,6 @@ function filter_generate_pf_altq_rules() {
 							$src = "$pppoesa/$pppoesn";
 							break;
 					}
-					$src = alias_expand($rule['source']['network']);
-					if(!$src)
-						$src = $rule['source']['network'];
 				}
 			} else if ($rule['source']['address']) {
 				$src = alias_expand($rule['source']['address']);
@@ -520,9 +517,6 @@ function filter_generate_pf_altq_rules() {
 							$dst = "$pppoesa/$pppoesn";
 							break;
 					}
-					$dst = alias_expand($rule['destination']['network']);
-					if(!$dst)
-						$dst = $rule['destination']['network'];
 				}
 			} else if ($rule['destination']['address']) {
 				$dst = alias_expand($rule['destination']['address']);