diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-29 15:55:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-29 15:55:34 -0700 |
| commit | 30be93c6e2b5c2eb6c6e9e21a04dc0dbe2f4c8ca (patch) | |
| tree | 0393f272d9cd62aaef4a1a515897ff97206d60c2 | |
| parent | 69f2d3ce91f18dd20441dc4c51839add63cac3e1 (diff) | |
| parent | 60c8f863ca84f3e5bb8e78d8001c53511f094d53 (diff) | |
| download | system_core-30be93c6e2b5c2eb6c6e9e21a04dc0dbe2f4c8ca.zip system_core-30be93c6e2b5c2eb6c6e9e21a04dc0dbe2f4c8ca.tar.gz system_core-30be93c6e2b5c2eb6c6e9e21a04dc0dbe2f4c8ca.tar.bz2 | |
am 60c8f863: resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp
Merge commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53'
* commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53':
Userland support for VM interconnection
| -rwxr-xr-x | rootdir/etc/init.goldfish.sh | 10 | ||||
| -rw-r--r-- | toolbox/Android.mk | 2 | ||||
| -rw-r--r-- | toolbox/route.c | 24 |
3 files changed, 28 insertions, 8 deletions
diff --git a/rootdir/etc/init.goldfish.sh b/rootdir/etc/init.goldfish.sh index 5ff0a3a..cfa2c82 100755 --- a/rootdir/etc/init.goldfish.sh +++ b/rootdir/etc/init.goldfish.sh @@ -45,3 +45,13 @@ esac # this line doesn't really do anything useful. however without it the # previous setprop doesn't seem to apply for some really odd reason setprop ro.qemu.init.completed 1 + +# set up the second interface (for inter-emulator connections) +# if required +my_ip=`getprop net.shared_net_ip` +case "$my_ip" in + "") + ;; + *) ifconfig eth1 "$my_ip" netmask 255.255.255.0 up + ;; +esac diff --git a/toolbox/Android.mk b/toolbox/Android.mk index 588dac0..ef3980a 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -41,7 +41,7 @@ TOOLS := \ printenv \ smd \ chmod \ - chown \ + chown \ newfs_msdos \ netstat \ ioctl \ diff --git a/toolbox/route.c b/toolbox/route.c index 107e48a..3e10014 100644 --- a/toolbox/route.c +++ b/toolbox/route.c @@ -80,14 +80,24 @@ int route_main(int argc, char *argv[]) /* route add -net 192.168.1.2 netmask 255.255.255.0 gw 192.168.1.1 */ if (argc > 7 && !strcmp(argv[2], "-net") && - !strcmp(argv[4], "netmask") && !strcmp(argv[6], "gw")) { - rt.rt_flags = RTF_UP | RTF_GATEWAY; - if (set_address(argv[3], &rt.rt_dst) && - set_address(argv[5], &rt.rt_genmask) && - set_address(argv[7], &rt.rt_gateway)) { - errno = 0; + !strcmp(argv[4], "netmask")) { + if (!strcmp(argv[6], "gw")) { + rt.rt_flags = RTF_UP | RTF_GATEWAY; + if (set_address(argv[3], &rt.rt_dst) && + set_address(argv[5], &rt.rt_genmask) && + set_address(argv[7], &rt.rt_gateway)) { + errno = 0; + } + goto apply; + } else if (!strcmp(argv[6], "dev")) { + rt.rt_flags = RTF_UP; + rt.rt_dev = argv[7]; + if (set_address(argv[3], &rt.rt_dst) && + set_address(argv[5], &rt.rt_genmask)) { + errno = 0; + } + goto apply; } - goto apply; } } |