From abd54c1b78983ce425250dba137e203b7020637e Mon Sep 17 00:00:00 2001 From: Chia-chi Yeh Date: Thu, 18 Jun 2009 17:18:51 +0800 Subject: [PATCH] rootdir: Remove gprs/pppd related scripts. vpn related scripts will be updated in the next change. --- rootdir/Android.mk | 6 ------ rootdir/etc/init.gprs-pppd | 23 ----------------------- rootdir/etc/ppp/chap-secrets | 2 -- rootdir/etc/ppp/ip-down | 1 - rootdir/etc/ppp/ip-up | 33 --------------------------------- 5 files changed, 65 deletions(-) delete mode 100755 rootdir/etc/init.gprs-pppd delete mode 100644 rootdir/etc/ppp/chap-secrets delete mode 100755 rootdir/etc/ppp/ip-down delete mode 100755 rootdir/etc/ppp/ip-up diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 44e343c22..d4c75a61e 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -6,16 +6,10 @@ include $(CLEAR_VARS) copy_from := \ etc/dbus.conf \ etc/init.goldfish.sh \ - etc/ppp/ip-up \ - etc/ppp/ip-down \ etc/ppp/peers/common \ etc/racoon/racoon.conf \ etc/hosts -dont_copy := \ - etc/init.gprs-pppd \ - etc/ppp/chap-secrets - copy_to := $(addprefix $(TARGET_OUT)/,$(copy_from)) copy_from := $(addprefix $(LOCAL_PATH)/,$(copy_from)) diff --git a/rootdir/etc/init.gprs-pppd b/rootdir/etc/init.gprs-pppd deleted file mode 100755 index 521eec988..000000000 --- a/rootdir/etc/init.gprs-pppd +++ /dev/null @@ -1,23 +0,0 @@ -#!/system/bin/sh -# An unforunate wrapper script -# so that the exit code of pppd may be retrieved - - -# this is a workaround for issue #651747 -#trap "/system/bin/sleep 1;exit 0" TERM - - -PPPD_PID= - -/system/bin/setprop "net.gprs.ppp-exit" "" - -/system/bin/log -t pppd "Starting pppd" - -/system/bin/pppd $* - -PPPD_EXIT=$? -PPPD_PID=$! - -/system/bin/log -t pppd "pppd exited with $PPPD_EXIT" - -/system/bin/setprop "net.gprs.ppp-exit" "$PPPD_EXIT" diff --git a/rootdir/etc/ppp/chap-secrets b/rootdir/etc/ppp/chap-secrets deleted file mode 100644 index 6546b0f1c..000000000 --- a/rootdir/etc/ppp/chap-secrets +++ /dev/null @@ -1,2 +0,0 @@ -* * bogus - diff --git a/rootdir/etc/ppp/ip-down b/rootdir/etc/ppp/ip-down deleted file mode 100755 index 58d21e5fe..000000000 --- a/rootdir/etc/ppp/ip-down +++ /dev/null @@ -1 +0,0 @@ -#!/system/bin/sh diff --git a/rootdir/etc/ppp/ip-up b/rootdir/etc/ppp/ip-up deleted file mode 100755 index 8c8f12c89..000000000 --- a/rootdir/etc/ppp/ip-up +++ /dev/null @@ -1,33 +0,0 @@ -#!/system/bin/sh - -# Use interface name if linkname is not available - -/system/bin/setprop "net.dns1" "$DNS1" -/system/bin/setprop "net.dns2" "$DNS2" - -# Retrieve the default gateway from /proc/net/route -RTAB=`cat /proc/net/route` -flag=-1; i=0; -for l in $RTAB; do - if (exp flag==1) then DGW=$l; flag=0; fi; - if (exp i%11 == 1) then - if (exp $l=="00000000") then flag=1; fi; - fi; - i=`exp i+1`; -done -FH=${DGW%????} -LH=${DGW#????} -A=`exp 0x${LH#??}` -B=`exp 0x${LH%??}` -C=`exp 0x${FH#??}` -D=`exp 0x${FH%??}` -GATEWAY="$A.$B.$C.$D" -VPNSERVER=`getprop "net.vpn.server_ip"` - -# Protect the route to vpn server -/system/bin/route add -net $VPNSERVER netmask 255.255.255.255 gw $GATEWAY - -# Route all traffic to vpn connection -/system/bin/route add -net 0.0.0.0 netmask 128.0.0.0 gw $IPREMOTE -/system/bin/route add -net 128.0.0.0 netmask 128.0.0.0 gw $IPREMOTE -