From 04c528e72b89123b129f343db8195213743d238e Mon Sep 17 00:00:00 2001 From: Ermal Date: Wed, 15 Sep 2010 19:47:39 +0000 Subject: Ticket #876. Actually the event to send is interface newip $ip rather interface configure! also use the fact that now we have a /tmp/$if_defaultgw rather than relying in route get default which might block. --- usr/local/sbin/ovpn-linkup | 2 +- usr/local/sbin/ppp-linkdown | 3 +++ usr/local/sbin/ppp-linkup | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'usr') diff --git a/usr/local/sbin/ovpn-linkup b/usr/local/sbin/ovpn-linkup index cc09003..2d5d006 100755 --- a/usr/local/sbin/ovpn-linkup +++ b/usr/local/sbin/ovpn-linkup @@ -3,7 +3,7 @@ # write nameservers to file needs dns fidnings?! # let the configuration system know that the ip has changed. -#/usr/local/sbin/pfSctl -c "interface reload $interface" +#/usr/local/sbin/pfSctl -c "interface newip $interface" /bin/echo $4 > /tmp/$1_router /usr/bin/touch /tmp/$1up # reload filter diff --git a/usr/local/sbin/ppp-linkdown b/usr/local/sbin/ppp-linkdown index 55be9d6..4d4db42 100755 --- a/usr/local/sbin/ppp-linkdown +++ b/usr/local/sbin/ppp-linkdown @@ -3,6 +3,9 @@ if [ -f /tmp/$1up ] && [ -f /conf/$1.log ]; then seconds=$((`date -j +%s` - `/usr/bin/stat -f %m /tmp/$1up`)) /usr/local/sbin/ppp-log-uptime.sh $seconds $1 & fi +if [ -f "/tmp/${interface}_defaultgw" ]; then + route delete default $4 +fi /sbin/pfctl -b $3 -b $4 # delete the node just in case mpd cannot do that /usr/sbin/ngctl shutdown $1: diff --git a/usr/local/sbin/ppp-linkup b/usr/local/sbin/ppp-linkup index e0b44af..dd156c4 100755 --- a/usr/local/sbin/ppp-linkup +++ b/usr/local/sbin/ppp-linkup @@ -18,5 +18,5 @@ fi /bin/echo $3 > /tmp/$1_ip /usr/bin/touch /tmp/$1up /usr/local/sbin/pfSctl -c 'service reload dns' -/usr/local/sbin/pfSctl -c "interface reload $1" +/usr/local/sbin/pfSctl -c "interface newip $1" exit 0 -- cgit v1.1