コミット: a6f58edc9e641b1dadf6df8a1f6827cc7e78bb30 - device-common (git)

device/common

コミットメタ情報

• リビジョン: a6f58edc9e641b1dadf6df8a1f6827cc7e78bb30 (tree)
• 日時: 2012-04-30 02:56:12
• 作者: Chih-Wei Huang <cwhuang@linu...>
• コミッター: Chih-Wei Huang

ログメッセージ

generic_x86: add ppp scripts

変更サマリ

• modified: generic_x86/device.mk
• modified: generic_x86/init.rc
• modified: generic_x86/packages.mk
• add: generic_x86/ppp/ip-down
• add: generic_x86/ppp/ip-up
• add: generic_x86/ppp/peers/gprs

差分

--- a/generic_x86/device.mk
+++ b/generic_x86/device.mk
@@ -33,6 +33,9 @@ PRODUCT_COPY_FILES := \
     $(if $(wildcard $(PRODUCT_DIR)excluded-input-devices.xml),$(PRODUCT_DIR),$(LOCAL_PATH)/)excluded-input-devices.xml:system/etc/excluded-input-devices.xml \
 
 PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/ppp/ip-up:system/etc/ppp/ip-up \
+    $(LOCAL_PATH)/ppp/ip-down:system/etc/ppp/ip-down \
+    $(LOCAL_PATH)/ppp/peers/gprs:system/etc/ppp/peers/gprs \
     $(LOCAL_PATH)/GenericTouch.idc:system/usr/idc/GenericTouch.idc \
     frameworks/base/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml \
     frameworks/base/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \

--- a/generic_x86/init.rc
+++ b/generic_x86/init.rc
@@ -530,13 +530,6 @@ service faketsd /system/bin/faketsd
     disabled
     oneshot
 
-service ppp /system/bin/pppd call gprs
-    class main
-    user root
-    group system radio
-    disabled
-    oneshot
-
 service userinit /system/bin/sh /system/etc/init.sh
     oneshot
     disabled
@@ -556,12 +549,6 @@ on property:system_init.startsurfaceflinger=0
 on property:dev.bootcomplete=1
     start userinit
 
-on property:gsm.sim.state=READY
-    start ppp
-
-on property:gsm.sim.state=UNKNOWN
-    stop ppp
-
 on property:debug.logcat=1
     start logcat
 

--- a/generic_x86/packages.mk
+++ b/generic_x86/packages.mk
@@ -46,10 +46,12 @@ PRODUCT_PACKAGES := \
     chat \
     com.android.future.usb.accessory \
     drmserver \
+    eject \
     gps.default \
     hwcomposer.default \
     icu.dat \
     libdrmframework_jni \
+    libhuaweigeneric-ril \
     lights.default \
     make_ext4fs \
     powerbtnd \

--- /dev/null
+++ b/generic_x86/ppp/ip-down
@@ -0,0 +1,16 @@
+#!/system/bin/sh
+export PATH=/system/bin
+
+case $1 in
+    ppp1)
+	echo 0 > /proc/sys/net/ipv4/ip_forward
+	;;
+esac
+
+# Use interface name if linkname is not available
+NAME=${LINKNAME:-"$1"}
+
+setprop "net.dns1" ""
+setprop "net.dns2" ""
+setprop "net.$NAME.local-ip" ""
+setprop "net.$NAME.remote-ip" ""

--- /dev/null
+++ b/generic_x86/ppp/ip-up
@@ -0,0 +1,24 @@
+#!/system/bin/sh
+export PATH=/system/bin
+
+case $1 in
+    ppp1)
+	iptables --flush
+	iptables --table nat --flush
+	iptables --delete-chain
+	iptables --table nat --append POSTROUTING --out-interface ppp0 -j MASQUERADE
+	iptables --append FORWARD --in-interface ppp1 -j ACCEPT
+	echo 1 > /proc/sys/net/ipv4/ip_forward
+	;;
+    ppp0)
+        setprop "net.interfaces.defaultroute" "gprs"
+        ;;
+esac
+
+# Use interface name if linkname is not available
+NAME=${LINKNAME:-"$1"}
+
+setprop "net.dns1" "$DNS1"
+setprop "net.dns2" "$DNS2"
+setprop "net.$NAME.local-ip" "$IPLOCAL"
+setprop "net.$NAME.gw" "$IPREMOTE"

--- /dev/null
+++ b/generic_x86/ppp/peers/gprs
@@ -0,0 +1,11 @@
+#/etc/ppp/peers/gprs
+# This is pppd script for China Mobile, used Huawei GTM900-B GPRS Module
+# Usage:   root>pppd call gprs
+
+460800
+nocrtscts
+usepeerdns
+debug
+ipcp-accept-local
+ipcp-accept-remote
+defaultroute