Add return debugging so we can trace down the PPTP server issue.

1 files changed, 12 insertions, 3 deletions

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 2494aef..d70910b 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -690,7 +690,6 @@ function filter_generate_altq_rules() {
         }
 
 	$rulei++;
-	//$shaperrules .= $line;
 
 	return $shaperrules;
 }
@@ -980,7 +979,8 @@ function generate_user_filter_rule($rule, $optcfg) {
 		if ($rule['interface'] == "pptp") {
 
 			if ($pptpdcfg['mode'] != "server") {
-				return;
+				//return "# mode != server " . $rule['descr'] . "\n";
+				//return;
 			}
 
 			$nif = $g['n_pptp_units'];
@@ -990,6 +990,7 @@ function generate_user_filter_rule($rule, $optcfg) {
 			/* Check to see if the interface is opt and in our opt list */
 			if (strstr($rule['interface'], "opt")) {
  				if (!array_key_exists($rule['interface'], $optcfg)) {
+					return "# array key does not exist for " . $rule['descr'] . "\n";
 					return;
 				}
 			}
@@ -1002,26 +1003,31 @@ function generate_user_filter_rule($rule, $optcfg) {
 		if ($pptpdcfg['mode'] != "server") {
 			if (($rule['source']['network'] == "pptp") ||
 				($rule['destination']['network'] == "pptp")) {
+					return "# source network or destination network == pptp on " . $rule['descr'] . "\n";
 					return;
 				}
 		}
 
 		if ($rule['source']['network'] && strstr($rule['source']['network'], "opt")) {
 			if (!array_key_exists($rule['source']['network'], $optcfg)) {
+				return "# !array_key_exists source network " . $rule['descr'] . "\n";
 				return;
 			}
 		}
 		if ($rule['destination']['network'] && strstr($rule['destination']['network'], "opt")) {
 			if (!array_key_exists($rule['destination']['network'], $optcfg)) {
+				return "# !array_key_exists dest network " . $rule['descr'] . "\n";
 				return;
 			}
 		}
 
 		/* check for unresolvable aliases */
 		if ($rule['source']['address'] && !alias_expand($rule['source']['address'])) {
+			return "# unresolvable source aliases " . $rule['descr'] . "\n";
 			return;
 		}
 		if ($rule['destination']['address'] && !alias_expand($rule['destination']['address'])) {
+			return "# unresolvable dest aliases " . $rule['descr'] . "\n";
 			return;
 		}
 
@@ -1589,8 +1595,11 @@ EOD;
 			$line = generate_user_filter_rule($rule, $optcfg);
 
 			// label
-                        if($rule['descr'] <> "" and $line <> "")
+                        if($rule['descr'] <> "" and $line <> "") {
 				$line .= "label \"USER_RULE: " . $rule['descr'] . "\" ";
+			} else {
+				$line .= "# could not process \"USER_RULE: " . $rule['descr'] . "\" ";
+			}
 
 			$line .= "\n";