diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2005-10-22 21:58:50 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2005-10-22 21:58:50 +0000 |
| commit | dabba7227c75ff360e35fae58b22fe0514cc6aa9 (patch) | |
| tree | d157753f79d6ef3890d7242b6e2efd2393162578 | |
| parent | ac7f54e9ebfc7d71202f9f2b88a0d482f2ded7f6 (diff) | |
| download | master-187ad058-dabba7227c75ff360e35fae58b22fe0514cc6aa9.tar.gz master-187ad058-dabba7227c75ff360e35fae58b22fe0514cc6aa9.tar.bz2 master-187ad058-dabba7227c75ff360e35fae58b22fe0514cc6aa9.zip | |
sync pptp ifup script with whiterussian
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2265 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/pptp/files/ifup.pptp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp index 8335440777..15178fe302 100644 --- a/package/pptp/files/ifup.pptp +++ b/package/pptp/files/ifup.pptp @@ -1,7 +1,5 @@ #!/bin/sh . /etc/functions.sh -. /etc/nvram.overrides -[ -e /etc/config/network ] && . /etc/config/network type=$1 [ "$(nvram get ${type}_proto)" = "pptp" ] || exit @@ -12,12 +10,10 @@ for module in slhc ppp_generic ppp_async ip_gre; do /sbin/insmod $module 2>&- >&- done -if=$(nvram get pptp_ifname) -ip=$(nvram get ${type}_ipaddr) -netmask=$(nvram get ${type}_netmask) -[ -z "$ip" -o -z "$if" ] || ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up - while :; do + PPTP_PROTO="$(nvram get pptp_proto)" + [ "$PPTP_PROTO" = "static" ] || PPTP_PROTO="" + PPTP_PROTO="${PPTP_PROTO:-dhcp}" IP=$(nvram get pptp_server_ip) USERNAME=$(nvram get ppp_username) PASSWORD=$(nvram get ppp_passwd) @@ -28,18 +24,25 @@ while :; do MTU=$(nvram get ppp_mtu) MTU=${MTU:+ mtu $MTU mru $MTU} + do_ifup $PPTP_PROTO $type + + # hack for some buggy ISPs + NETMASK=$(nvram get ${type}_netmask) + IFNAME=$(nvram get pptp_ifname) + [ -z "$NETMASK" -o -z "$IFNAME" ] || ifconfig $IFNAME netmask $NETMASK + /usr/sbin/pppd nodetach \ pty "/usr/sbin/pptp $IP --loglevel 0 --nolaunchpppd" \ file /etc/ppp/options.pptp \ connect /bin/true \ usepeerdns \ defaultroute \ + replacedefaultroute \ linkname $type \ user "$USERNAME" \ password "$PASSWORD" \ $MTU \ $IDLETIME \ - $REDIAL \ - $IFNAME + $REDIAL done & |