when pppoe aliases on pppoe server are made they make aliases for ng0 to whatever. but ng1 should be the start for pppoe-server ng0 should be reserved for pppoe client this problem could effect pptp server as well. Ticket #1308

1 files changed, 5 insertions, 2 deletions

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 401ddb6..9f00375 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -352,7 +352,7 @@ function filter_generate_aliases() {
     if($config['pptpd']['mode'] == "server") {
 		/* build pptp alias */
 		$tmp = "pptp = \"{ ";
-		$starting_pptp = 0;
+		$starting_pptp = 1;
 		if($config['interfaces']['wan']['ipaddr'] == "pppoe")
 			$starting_pptp = 1;
 		for($x=$starting_pptp; $x<$g["n_pptp_units"]+$starting_pptp; $x++)
@@ -365,7 +365,10 @@ function filter_generate_aliases() {
     if($config['pppoe']['mode'] == "server") {
 		/* build pppoe alias */
 		$tmp = "pppoe = \"{ ";
-		for($x=0; $x<$g["n_pppoe_units"]; $x++) {
+		$starting_pppoe = 1;
+		if($config['interfaces']['wan']['ipaddr'] == "pppoe")
+			$starting_pppoe = 1;
+		for($x=0; $x<$g["n_pppoe_units"]+$starting_pppoe; $x++) {
 			$tmp .= "ng{$counter} ";
 			$counter++;
 		}