diff options
| author | Ermal Luçi <eri@pfsense.org> | 2009-02-01 20:16:18 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2009-02-01 20:16:18 +0000 |
| commit | 250d0ff4ec68305dc942b135888858c9413ae75f (patch) | |
| tree | 3c71f20b6c66bd63df282ae063ab9e22756fc2e4 | |
| parent | 22f81828b1712766258fb9d0636b32f3a675f853 (diff) | |
| download | pfsense-250d0ff4ec68305dc942b135888858c9413ae75f.zip pfsense-250d0ff4ec68305dc942b135888858c9413ae75f.tar.gz | |
Remove the 'L2TP clients' option on firewall src/dst address cause it does not make sense without a subnet.
| -rw-r--r-- | etc/inc/filter.inc | 15 | ||||
| -rwxr-xr-x | usr/local/www/firewall_rules_edit.php | 6 |
2 files changed, 0 insertions, 21 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index a16d340..f865263 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -682,13 +682,6 @@ function filter_nat_rules_generate() $tonathosts .= "{$config['pptpd']['remoteip']}/{$pptp_subnet} "; } } - /* L2TP subnet */ - if ($config['l2tp']['mode'] == "server") { - if (is_private_ip($config['l2tp']['remoteip'])) { - $numberofnathosts++; - $tonathosts .= "{$config['l2tp']['remoteip']}/32 "; - } - } /* PPPoE subnet */ if ($config['pppoe']['mode'] == "server") { $pppoe_subnet = $g['pppoe_subnet']; @@ -1423,10 +1416,6 @@ function generate_user_filter_rule($rule) $pptpsn = $FilterIflist['pptp']['sn']; $src = "{$pptpsa}/{$pptpsn}"; break; - case 'l2tp': - $l2tpsa = $FilterIflist['l2tp']['ip']; - $src = "{$l2tpsa}/32"; - break; case 'pppoe': $pppoesa = gen_subnet($FilterIflist['pppoe']['ip'], $FilterIflist['pppoe']['sn']); $pppoesn = $FilterIflist['pppoe']['sn']; @@ -1553,10 +1542,6 @@ function generate_user_filter_rule($rule) $pptpsn = $FilterIflist['pptp']['sn']; $dst = "{$pptpsa}/{$pptpsn}"; break; - case 'l2tp': - $l2tpsa = $FilterIflist['l2tp']['ip']; - $dst = "{$l2tpsa}/32"; - break; case 'pppoe': $pppoesa = gen_subnet($FilterIflist['pppoe']['ip'], $FilterIflist['pppoe']['sn']); $pppoesn = $FilterIflist['pppoe']['sn']; diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index 6c618fb..cae0389 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -724,9 +724,6 @@ include("head.inc"); <?php if(have_ruleint_access("lan")): ?> <option value="lan" <?php if ($pconfig['src'] == "lan") { echo "selected"; } ?>>LAN subnet</option> <?php endif; ?> - <?php if(have_ruleint_access("l2tp")): ?> - <option value="l2tp" <?php if ($pconfig['src'] == "l2tp") { echo "selected"; } ?>>L2TP clients</option> - <?php endif; ?> <?php if(have_ruleint_access("pptp")): ?> <option value="pptp" <?php if ($pconfig['src'] == "pptp") { echo "selected"; } ?>>PPTP clients</option> <?php endif; ?> @@ -875,9 +872,6 @@ include("head.inc"); <?php if(have_ruleint_access("lan")): ?> <option value="lan" <?php if ($pconfig['dst'] == "lan") { echo "selected"; } ?>>LAN subnet</option> <?php endif; ?> - <?php if(have_ruleint_access("l2tp")): ?> - <option value="l2tp" <?php if ($pconfig['dst'] == "l2tp") { echo "selected"; } ?>>L2TP clients</option> - <?php endif; ?> <?php if(have_ruleint_access("pptp")): ?> <option value="pptp" <?php if ($pconfig['dst'] == "pptp") { echo "selected"; } ?>>PPTP clients</option> <?php endif; ?> |
