diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-08-01 15:08:58 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-08-01 15:08:58 +0000 |
| commit | 9a60d2bc99ca469eddb898b4f6937ae8f03a25e8 (patch) | |
| tree | 96a9297728fc8f9420ca129dd901a3a1f3d5dc3f /etc | |
| parent | bc090ffc2fae819924d59194c7e5d7596e7fa0c6 (diff) | |
| download | pfsense-9a60d2bc99ca469eddb898b4f6937ae8f03a25e8.zip pfsense-9a60d2bc99ca469eddb898b4f6937ae8f03a25e8.tar.gz | |
Revert to working filter.inc
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index ba70ff3..6a064b1 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -38,6 +38,12 @@ require_once("functions.inc"); require_once("pkg-utils.inc"); require_once("notices.inc"); +function filter_resync() { + global $config, $g; + + mwexec("/sbin/pfctl -y"); /* XXX */ +} + function filter_pflog_start() { global $config, $g; @@ -1985,14 +1991,8 @@ EOD; if (($defq != "") and ($ackq != "")) $line .= " queue ({$defq}, {$ackq}) "; } - $ipfrules .= $line; + $ipfrules .= $line . "\n"; } - // label - if($rule['descr'] <> "" and $line <> "") - $ipfrules .= " label \"USER_RULE_PPTP: " . $rule['descr'] . "\" \n"; - else - $ipfrules .= " label \"USER_RULE_PPTP\" \n"; - } } } else if($rule['interface'] == "pppoe") { $n_pppoe_units = $g['n_pppoe_units']; @@ -2012,16 +2012,11 @@ EOD; if (($defq != "") and ($ackq != "")) $line .= " queue ({$defq}, {$ackq}) "; } - $ipfrules .= $line; + $ipfrules .= $line . "\n"; } else { $ipfrules .= "# Error creating {$rule['descr']} \n"; } - // label - if($rule['descr'] <> "" and $line <> "") - $ipfrules .= " label \"USER_RULE_PPPoE: " . $rule['descr'] . "\" \n"; - else - $ipfrules .= " label \"USER_RULE_PPPoE\" \n"; - } + } } else { $line = generate_user_filter_rule($rule, 0); if($line <> "") @@ -2280,6 +2275,7 @@ function return_vpn_subnet($adr) { return $padr . "/" . $pmask; } + /* XXX: do not return wan, lan, etc */ if(strstr($adr['network'], "wan") or strstr($adr['network'], "lan") or strstr($adr['network'], "opt")) return convert_ip_to_network_format($config['interfaces'][$adr['network']]['ipaddr'], $config['interfaces'][$adr['network']]['subnet']); @@ -2289,4 +2285,4 @@ function return_vpn_subnet($adr) { } -?> +?>
\ No newline at end of file |
