From d095c2d9aef71cecea7741bda04b4a295b849cad Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 6 Apr 2011 02:15:26 -0700 Subject: [PATCH] Still need linkname to get scripts to execute --- init.cfg/init.froyo.rc | 2 +- init.cfg/init.gingerbread.rc | 2 +- init.etc/ppp/ip-down | 18 ------------------ init.etc/ppp/ip-down-gprs | 18 ++++++++++++++++++ init.etc/ppp/ip-up | 34 ---------------------------------- init.etc/ppp/ip-up-gprs | 34 ++++++++++++++++++++++++++++++++++ 6 files changed, 54 insertions(+), 54 deletions(-) delete mode 100755 init.etc/ppp/ip-down create mode 100755 init.etc/ppp/ip-down-gprs delete mode 100755 init.etc/ppp/ip-up create mode 100755 init.etc/ppp/ip-up-gprs diff --git a/init.cfg/init.froyo.rc b/init.cfg/init.froyo.rc index 9302381..c1234ee 100644 --- a/init.cfg/init.froyo.rc +++ b/init.cfg/init.froyo.rc @@ -471,6 +471,6 @@ service dhcpcd /system/bin/dhcpcd -ABKL oneshot service pppd_gprs /system/bin/pppd /dev/smd1 defaultroute local usepeerdns \ - noipdefault unit 0 nodetach novj novjccomp + noipdefault unit 0 nodetach linkname gprs novj novjccomp disabled oneshot diff --git a/init.cfg/init.gingerbread.rc b/init.cfg/init.gingerbread.rc index fd31944..382849d 100644 --- a/init.cfg/init.gingerbread.rc +++ b/init.cfg/init.gingerbread.rc @@ -472,6 +472,6 @@ service dhcpcd /system/bin/dhcpcd -ABKL oneshot service pppd_gprs /system/bin/pppd /dev/smd1 defaultroute local usepeerdns \ - noipdefault unit 0 nodetach novj novjccomp + noipdefault unit 0 nodetach linkname gprs novj novjccomp disabled oneshot diff --git a/init.etc/ppp/ip-down b/init.etc/ppp/ip-down deleted file mode 100755 index 8e438b4..0000000 --- a/init.etc/ppp/ip-down +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -case $1 in -ppp0) - /bin/echo -e "PPP connection went down" >> /smodem/ppp.log - /bin/echo -e "Done!" >> /smodem/ppp.log - ;; -ppp1) - echo 0 > /proc/sys/net/ipv4/ip_forward; - ;; -esac - -# Use interface name if linkname is not available -NAME=${LINKNAME:-"$1"} - -/system/bin/setprop "net.$NAME.dns1" "$DNS1" -/system/bin/setprop "net.$NAME.dns2" "$DNS2" -/system/bin/setprop "net.$NAME.local-ip" "$IPLOCAL" -/system/bin/setprop "net.$NAME.remote-ip" "$IPREMOTE" diff --git a/init.etc/ppp/ip-down-gprs b/init.etc/ppp/ip-down-gprs new file mode 100755 index 0000000..8e438b4 --- /dev/null +++ b/init.etc/ppp/ip-down-gprs @@ -0,0 +1,18 @@ +#!/bin/sh +case $1 in +ppp0) + /bin/echo -e "PPP connection went down" >> /smodem/ppp.log + /bin/echo -e "Done!" >> /smodem/ppp.log + ;; +ppp1) + echo 0 > /proc/sys/net/ipv4/ip_forward; + ;; +esac + +# Use interface name if linkname is not available +NAME=${LINKNAME:-"$1"} + +/system/bin/setprop "net.$NAME.dns1" "$DNS1" +/system/bin/setprop "net.$NAME.dns2" "$DNS2" +/system/bin/setprop "net.$NAME.local-ip" "$IPLOCAL" +/system/bin/setprop "net.$NAME.remote-ip" "$IPREMOTE" diff --git a/init.etc/ppp/ip-up b/init.etc/ppp/ip-up deleted file mode 100755 index 401c7d5..0000000 --- a/init.etc/ppp/ip-up +++ /dev/null @@ -1,34 +0,0 @@ -#!/system/bin/sh -case $1 in - ppp1) - /android/bin/iptables --flush; - /android/bin/iptables --table nat --flush; - /android/bin/iptables --delete-chain; - /android/bin/iptables --table nat --append POSTROUTING --out-interface ppp0 -j MASQUERADE; - /android/bin/iptables --append FORWARD --in-interface ppp1 -j ACCEPT; - echo 0 > /proc/sys/net/ipv4/ip_forward; - echo 1 > /proc/sys/net/ipv4/ip_forward; - ;; - ppp0) - /system/bin/setprop "net.interfaces.defaultroute" "gprs" - ;; -esac - -# Use interface name if linkname is not available -NAME=${LINKNAME:-"$1"} - -/system/bin/setprop "net.$NAME.dns1" "$DNS1" -/system/bin/setprop "net.$NAME.dns2" "$DNS2" -/system/bin/setprop "net.$NAME.local-ip" "$IPLOCAL" -/system/bin/setprop "net.$NAME.remote-ip" "$IPREMOTE" -/system/bin/setprop "net.dns1" "$DNS1" -/system/bin/setprop "net.dns2" "$DNS2" -modem_log() -{ - /bin/echo -e "${@}" >> /smodem/ppp.log -} -modem_log "Connection attempt SUCCESSFUL!" -modem_log "Phone IP: `/bin/ifconfig ppp0 | /bin/grep 'inet addr:' | /bin/cut -d':' -f2 | /bin/cut -d' ' -f1`" -modem_log "Subnet : `/bin/ifconfig ppp0 | /bin/grep 'inet addr:' | /bin/cut -d':' -f4 | /bin/cut -d' ' -f1`" -modem_log "P-t-P : `/bin/ifconfig ppp0 | /bin/grep 'inet addr:' | /bin/cut -d':' -f3 | /bin/cut -d' ' -f1`" -modem_log "Done!" diff --git a/init.etc/ppp/ip-up-gprs b/init.etc/ppp/ip-up-gprs new file mode 100755 index 0000000..401c7d5 --- /dev/null +++ b/init.etc/ppp/ip-up-gprs @@ -0,0 +1,34 @@ +#!/system/bin/sh +case $1 in + ppp1) + /android/bin/iptables --flush; + /android/bin/iptables --table nat --flush; + /android/bin/iptables --delete-chain; + /android/bin/iptables --table nat --append POSTROUTING --out-interface ppp0 -j MASQUERADE; + /android/bin/iptables --append FORWARD --in-interface ppp1 -j ACCEPT; + echo 0 > /proc/sys/net/ipv4/ip_forward; + echo 1 > /proc/sys/net/ipv4/ip_forward; + ;; + ppp0) + /system/bin/setprop "net.interfaces.defaultroute" "gprs" + ;; +esac + +# Use interface name if linkname is not available +NAME=${LINKNAME:-"$1"} + +/system/bin/setprop "net.$NAME.dns1" "$DNS1" +/system/bin/setprop "net.$NAME.dns2" "$DNS2" +/system/bin/setprop "net.$NAME.local-ip" "$IPLOCAL" +/system/bin/setprop "net.$NAME.remote-ip" "$IPREMOTE" +/system/bin/setprop "net.dns1" "$DNS1" +/system/bin/setprop "net.dns2" "$DNS2" +modem_log() +{ + /bin/echo -e "${@}" >> /smodem/ppp.log +} +modem_log "Connection attempt SUCCESSFUL!" +modem_log "Phone IP: `/bin/ifconfig ppp0 | /bin/grep 'inet addr:' | /bin/cut -d':' -f2 | /bin/cut -d' ' -f1`" +modem_log "Subnet : `/bin/ifconfig ppp0 | /bin/grep 'inet addr:' | /bin/cut -d':' -f4 | /bin/cut -d' ' -f1`" +modem_log "P-t-P : `/bin/ifconfig ppp0 | /bin/grep 'inet addr:' | /bin/cut -d':' -f3 | /bin/cut -d' ' -f1`" +modem_log "Done!" -- 2.1.4