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

Correctly setup pptp rules, do not attempt to label rdr rule.

Browse Source
This commit is contained in:
Scott Ullrich 2005-02-13 01:06:22 +00:00
parent a605aac029
commit b6f56d02df
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etc/inc/filter.inc
View File

@ -342,6 +342,8 @@ function filter_generate_aliases() {
$aliases .= "# System Aliases \n";
$aliases .= "lan = \"{ " . $config['interfaces']['lan']['if'] . " }\"\n";
$aliases .= "wan = \"{ " . get_real_wan_interface() . " }\"\n";
$aliases .= "pptp = \"{ }\"\n";
$ifdescrs = array();
for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) {
$ifdescrs['opt' . $j] = "opt" . $j;
@ -822,7 +824,7 @@ function filter_nat_rules_generate() {
# PPTP
#rdr on $wanif proto gre from any to any port 0 -> $pptpdtarget
rdr on $wanif proto tcp from any to any port 1723 -> $pptpdtarget label "pptp port 1723"
rdr on $wanif proto tcp from any to any port 1723 -> $pptpdtarget
EOD;
}
@ -1247,14 +1249,14 @@ EOD;
if ($ispptp) {
$line .= "on ng" . ($iif+1) . " ";
} else {
// translate wan, man, lan, opt to real interface.
$interface = $rule['interface'];
$temp = filter_get_opt_interface_descr($interface);
if($temp <> "") $interface = $temp;
$line .= "on \$" . $interface . " ";
}
// translate wan, man, lan, opt to real interface.
$interface = $rule['interface'];
$temp = filter_get_opt_interface_descr($interface);
if($temp <> "") $interface = $temp;
$line .= "on \$" . $interface . " ";
if (isset($rule['protocol'])) {
if($rule['protocol'] == "tcp/udp")
$line .= "proto { tcp udp } ";