summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2010-02-13 23:43:24 -0500
committerChris Buechler <cmb@pfsense.org>2010-02-13 23:43:24 -0500
commit8daddfd1bfffae7ff14f7b50cdaa3929b5110557 (patch)
tree12bfa1c337b4b3304f607a1f239529fc4f398251 /etc
parent525d565bff55e939a70733540bc545476547f588 (diff)
downloadpfsense-8daddfd1bfffae7ff14f7b50cdaa3929b5110557.zip
pfsense-8daddfd1bfffae7ff14f7b50cdaa3929b5110557.tar.gz
fix call to undefined function.
remove old PPP bits that are no longer used
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/filter.inc31
1 files changed, 2 insertions, 29 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index e02ff83..6bf0674 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -529,6 +529,7 @@ function filter_get_vpns_list() {
if(is_array($config['ipsec']['phase2'])) {
foreach ($config['ipsec']['phase2'] as $ph2ent) {
if((!$ph2ent['mobile']) && ($ph2ent['mode'] != 'transport')) {
+ require_once("ipsec.inc");
$vpns_arr[] = ipsec_idinfo_to_cidr($ph2ent['remoteid']);
}
}
@@ -681,34 +682,6 @@ function filter_generate_optcfg_array() {
$FilterIflist[$ifgen['ifname']] = $oc;
}
}
- /* this just duplicates the PPP interface, as it's handled above
- if($config['ppps']) {
- $ppp=0;
- foreach($config['ppps']['ppp'] as $ifgen) {
- // get the device name for this PPP connection minus /dev/ (e.g. cuaU0)
- $dev = substr($ifgen['port'], 5);
- // $ps is the PID of the ppp process matching this device
- $ps = trim(`ps awux | grep -v grep | grep "$dev" | awk '{ print \$2 }'`);
- if($ps) {
- // $interface is the device in use by the PID of the ppp process found above (e.g. tun0)
- $interface = trim(`ifconfig | grep -B2 "$ps" | head -n1 | cut -d: -f1`);
- if($interface) {
- foreach ($config['interfaces'] as $ifdescr => $ifname) {
- if($ifname['serialport'] == $dev) {
- $oc = array();
- $oc['if'] = $interface;
- $oc['descr'] = $ifname['descr'];
- $oc['virtual'] = true;
- unset($FilterIflist[$ifname['descr']]);
- $FilterIflist[$ifname['descr']] = $oc;
- $ppp++;
- }
- }
- }
- }
- }
- }
- */
}
function filter_flush_nat_table() {
@@ -2461,4 +2434,4 @@ function discover_pkg_rules($ruletype) {
}
}
-?>
+?> \ No newline at end of file
OpenPOWER on IntegriCloud