mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup pptp / pppoe code. Do not allow all traffic when pptp and pppoe are enabled.

Browse Source
This commit is contained in:
Scott Ullrich 2006-05-19 21:23:23 +00:00
parent b2d183ad47
commit 4e4c1ea219
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etc/inc/filter.inc
View File

@ -280,9 +280,9 @@ function filter_generate_aliases() {
if($config['interfaces']['wan']['ipaddr'] == "pppoe" or $config['interfaces']['wan']['ipaddr'] == "pptp") {
$aliases .= "ng0 = \"{ " . $config['interfaces']['wan']['if'] . " " . get_real_wan_interface() . " }\" \n";
$aliases .= "wan = \"{ " . get_real_wan_interface() . "{$wan_aliases} }\"\n";
$aliases .= "wan = \"{ " . $config['interfaces']['wan']['if'] . "{$wan_aliases} }\"\n";
} else {
$aliases .= "wan = \"{ " . get_real_wan_interface() . "{$wan_aliases} ng0 }\"\n";
$aliases .= "wan = \"{ " . get_real_wan_interface() . "{$wan_aliases} }\"\n";
}
/* used to count netgraph interfaces */
@ -292,7 +292,10 @@ function filter_generate_aliases() {
if($config['pptpd']['mode'] == "server") {
/* build pptp alias */
$tmp = "pptp = \"{ ";
for($x=0; $x<$g["n_pptp_units"]; $x++)
$starting_pptp = 0;
if($config['interfaces']['wan']['ipaddr'] == "pppoe")
$starting_pptp = 1;
for($x=$starting_pptp; $x<$g["n_pptp_units"]+$starting_pptp; $x++)
$tmp .= "ng{$x} ";
$counter = $x;
$tmp .= "}\" \n";