diff options
| author | Ermal Luçi <eri@pfsense.org> | 2010-01-22 18:31:23 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2010-01-22 18:32:09 +0000 |
| commit | 67cd847c53f6bd7edfc0e582c7f8c4738a086365 (patch) | |
| tree | 6b76787668a3bcf9e50a2673208835ee4e0b8259 | |
| parent | c9359d0529ee023f70f2960c45568ee4e0331c8e (diff) | |
| download | pfsense-67cd847c53f6bd7edfc0e582c7f8c4738a086365.zip pfsense-67cd847c53f6bd7edfc0e582c7f8c4738a086365.tar.gz | |
Really write ppp.conf during reload. Include neccessary include.
| -rw-r--r-- | etc/inc/filter.inc | 6 | ||||
| -rw-r--r-- | etc/inc/interfaces.inc | 2 | ||||
| -rwxr-xr-x | etc/rc.reload_interfaces | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 1a739f1..62d42b0 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -1681,6 +1681,12 @@ function filter_rules_generate() { $cpiplist[] = $cpipm; } } + if (count($cpiplist) > 0 && count($cpiflist) > 0) { + $cpinterface = implode(" ", $cpiflist); + $cpaddresses = implode(" ", $cpiplist); + $ipfrules .= "pass in quick on {$cpinterface} proto tcp from any to {$cpaddresses} port { 8000 8001 } no state\n"; + $ipfrules .= "pass out quick on {$cpinterface} proto tcp from {$cpaddresses} port { 8000 8001 } to any no state\n"; + } } /* relayd */ $ipfrules .= "anchor \"relayd/*\"\n"; diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 8930d52..9ebdc73 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -649,7 +649,7 @@ function interfaces_configure() { interfaces_qinq_configure(); /* Set up PPP interfaces */ - interfaces_ppp_configure(false); + interfaces_ppp_configure(); $iflist = get_configured_interface_with_descr(); $delayed_list = array(); diff --git a/etc/rc.reload_interfaces b/etc/rc.reload_interfaces index f93a199..9139e6d 100755 --- a/etc/rc.reload_interfaces +++ b/etc/rc.reload_interfaces @@ -34,6 +34,7 @@ require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); require_once("openvpn.inc"); +require_once("vpn.inc"); reload_interfaces_sync(); filter_configure_sync(); |
