diff options
| author | Ermal <eri@pfsense.org> | 2011-01-03 21:29:28 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-01-03 21:29:28 +0000 |
| commit | 55c51af7293cf6ac65d6c1fee15071aef0558482 (patch) | |
| tree | 7d9146d31630e5d2d1bfc9ab35a5c026ac018ce8 | |
| parent | 3dfc2d1a82e68f81856427316973f3fe480d603b (diff) | |
| download | pfsense-55c51af7293cf6ac65d6c1fee15071aef0558482.zip pfsense-55c51af7293cf6ac65d6c1fee15071aef0558482.tar.gz | |
Ticket #1152. Call rc.newwanip even on openvpn linkup event to do the correct reloading of gateways and services. Add a safe belt to avoid a recursion in openvpn itself from rc.newwanip.
| -rwxr-xr-x | etc/rc.newwanip | 3 | ||||
| -rwxr-xr-x | usr/local/sbin/ovpn-linkup | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/etc/rc.newwanip b/etc/rc.newwanip index a31cddc..b63996c 100755 --- a/etc/rc.newwanip +++ b/etc/rc.newwanip @@ -117,7 +117,8 @@ services_dyndns_configure($interface); vpn_ipsec_force_reload(); /* start OpenVPN server & clients */ -openvpn_resync_all($interface); +if (substr($interface_real, 0, 4) != "ovpn") + openvpn_resync_all($interface); /* reload graphing functions */ enable_rrd_graphing(); diff --git a/usr/local/sbin/ovpn-linkup b/usr/local/sbin/ovpn-linkup index 2d5d006..f962ac2 100755 --- a/usr/local/sbin/ovpn-linkup +++ b/usr/local/sbin/ovpn-linkup @@ -7,5 +7,5 @@ /bin/echo $4 > /tmp/$1_router /usr/bin/touch /tmp/$1up # reload filter -/usr/local/sbin/pfSctl -c 'filter reload' +/usr/local/sbin/pfSctl -c "interface newip $1" exit 0 |
