diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-12 21:56:42 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-12 21:56:42 -0700 |
| commit | eced01b171d8b1c0c3183b3b54c6e229f94a5d4e (patch) | |
| tree | 353bcbbd0597cb429d0d316d64c783459f9a0bd1 | |
| parent | 4c8dee81eb094ca54ca249de76ce3777fa40ed7d (diff) | |
| parent | 160d4b0509e4566930ef9af4f2b9d63b33aebee5 (diff) | |
| download | system_core-eced01b171d8b1c0c3183b3b54c6e229f94a5d4e.tar.gz system_core-eced01b171d8b1c0c3183b3b54c6e229f94a5d4e.tar.bz2 system_core-eced01b171d8b1c0c3183b3b54c6e229f94a5d4e.zip | |
am 160d4b05: Merge change 6738 into donut
Merge commit '160d4b0509e4566930ef9af4f2b9d63b33aebee5'
* commit '160d4b0509e4566930ef9af4f2b9d63b33aebee5':
rootdir: Remove ip-up-vpn script, which is replaced by an executable.
| -rw-r--r-- | rootdir/Android.mk | 1 | ||||
| -rwxr-xr-x | rootdir/etc/ppp/ip-up-vpn | 18 |
2 files changed, 0 insertions, 19 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index e66b1c35..db98fab0 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -6,7 +6,6 @@ include $(CLEAR_VARS) copy_from := \ etc/dbus.conf \ etc/init.goldfish.sh \ - etc/ppp/ip-up-vpn \ etc/hosts copy_to := $(addprefix $(TARGET_OUT)/,$(copy_from)) diff --git a/rootdir/etc/ppp/ip-up-vpn b/rootdir/etc/ppp/ip-up-vpn deleted file mode 100755 index 5d6b6114..00000000 --- a/rootdir/etc/ppp/ip-up-vpn +++ /dev/null @@ -1,18 +0,0 @@ -#!/system/bin/sh - -/system/bin/setprop "vpn.dns1" "$DNS1" -/system/bin/setprop "vpn.dns2" "$DNS2" - -GATEWAY=${6#*@} -VPNSERVER=${6%@*} - -# Protect the route to vpn server -/system/bin/route add -net "$VPNSERVER" netmask 255.255.255.255 gw "$GATEWAY" - -if (exp $?) ; then exit $?; fi - -# 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 - -/system/bin/setprop "vpn.up" "1" |