From ea2dad5bba9f6313f63b10affc9ea0b3cf3cdeba Mon Sep 17 00:00:00 2001 From: Nicu Pavel Date: Mon, 20 Jun 2011 14:08:41 +0300 Subject: [PATCH] [picopc] Added ethernet patch based on Yi Sun from android-x86.org Changes from android-x86.org: - ported to gingerbread - fixed issue with static IP not being setup correctly - changed statusbarpolicy.java - added new ethernet icons from Iulian Luca Change-Id: I92b2a9f9e464662e207fa88f8d581bb3909e6908 --- Android.mk | 1 + api/current.xml | 1086 ++++++++++++++++++++ core/java/android/app/ContextImpl.java | 21 + core/java/android/content/Context.java | 10 + core/java/android/provider/Settings.java | 13 + core/jni/Android.mk | 1 + core/jni/AndroidRuntime.cpp | 2 + core/jni/android_net_ethernet.cpp | 419 ++++++++ core/res/res/values/config.xml | 2 + .../java/android/net/ethernet/EthernetDevInfo.aidl | 19 + .../java/android/net/ethernet/EthernetDevInfo.java | 152 +++ .../java/android/net/ethernet/EthernetManager.java | 158 +++ .../java/android/net/ethernet/EthernetMonitor.java | 134 +++ .../java/android/net/ethernet/EthernetNative.java | 30 + .../android/net/ethernet/EthernetStateTracker.java | 416 ++++++++ .../android/net/ethernet/IEthernetManager.aidl | 30 + .../res/drawable-hdpi/connect_creating.png | Bin 0 -> 429 bytes .../res/drawable-hdpi/connect_established.png | Bin 0 -> 564 bytes packages/SystemUI/res/drawable-hdpi/connect_no.png | Bin 0 -> 438 bytes .../res/drawable-mdpi/connect_creating.png | Bin 0 -> 476 bytes .../res/drawable-mdpi/connect_established.png | Bin 0 -> 562 bytes packages/SystemUI/res/drawable-mdpi/connect_no.png | Bin 0 -> 373 bytes .../systemui/statusbar/StatusBarPolicy.java | 54 + .../com/android/server/ConnectivityService.java | 31 +- .../java/com/android/server/EthernetService.java | 212 ++++ 25 files changed, 2787 insertions(+), 4 deletions(-) create mode 100644 core/jni/android_net_ethernet.cpp create mode 100644 ethernet/java/android/net/ethernet/EthernetDevInfo.aidl create mode 100644 ethernet/java/android/net/ethernet/EthernetDevInfo.java create mode 100644 ethernet/java/android/net/ethernet/EthernetManager.java create mode 100644 ethernet/java/android/net/ethernet/EthernetMonitor.java create mode 100644 ethernet/java/android/net/ethernet/EthernetNative.java create mode 100644 ethernet/java/android/net/ethernet/EthernetStateTracker.java create mode 100644 ethernet/java/android/net/ethernet/IEthernetManager.aidl create mode 100755 packages/SystemUI/res/drawable-hdpi/connect_creating.png create mode 100755 packages/SystemUI/res/drawable-hdpi/connect_established.png create mode 100755 packages/SystemUI/res/drawable-hdpi/connect_no.png create mode 100755 packages/SystemUI/res/drawable-mdpi/connect_creating.png create mode 100755 packages/SystemUI/res/drawable-mdpi/connect_established.png create mode 100755 packages/SystemUI/res/drawable-mdpi/connect_no.png create mode 100644 services/java/com/android/server/EthernetService.java diff --git a/Android.mk b/Android.mk index e727130..4bee33d 100644 --- a/Android.mk +++ b/Android.mk @@ -187,6 +187,7 @@ LOCAL_SRC_FILES += \ telephony/java/com/android/internal/telephony/ISms.aidl \ telephony/java/com/android/internal/telephony/IWapPushManager.aidl \ wifi/java/android/net/wifi/IWifiManager.aidl \ + ethernet/java/android/net/ethernet/IEthernetManager.aidl \ telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \ vpn/java/android/net/vpn/IVpnService.aidl \ voip/java/android/net/sip/ISipSession.aidl \ diff --git a/api/current.xml b/api/current.xml index f524509..ca07c83 100644 --- a/api/current.xml +++ b/api/current.xml @@ -35629,6 +35629,17 @@ visibility="public" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sSharedPrefs = new HashMap(); @@ -940,6 +943,8 @@ class ContextImpl extends Context { return getThrottleManager(); } else if (WIFI_SERVICE.equals(name)) { return getWifiManager(); + } else if (ETHERNET_SERVICE.equals(name)) { + return getEthernetManager(); } else if (NOTIFICATION_SERVICE.equals(name)) { return getNotificationManager(); } else if (KEYGUARD_SERVICE.equals(name)) { @@ -1067,6 +1072,22 @@ class ContextImpl extends Context { return sWifiManager; } + private EthernetManager getEthernetManager() + { + synchronized (sSync) { + if (sEthernetManager == null) { + IBinder b = ServiceManager.getService(ETHERNET_SERVICE); + if (b == null) + { + Log.w(TAG, "Error getting service name:" + ETHERNET_SERVICE); + } + IEthernetManager service = IEthernetManager.Stub.asInterface(b); + sEthernetManager = new EthernetManager(service, mMainThread.getHandler()); + } + } + return sEthernetManager; + } + private NotificationManager getNotificationManager() { synchronized (mSync) { if (mNotificationManager == null) { diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index ec2d640..901e214 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1459,6 +1459,16 @@ public abstract class Context { public static final String WIFI_SERVICE = "wifi"; /** + * Use with {@link #getSystemService} to retrieve a {@link + * android.net.ethernet.EthernetManager} for handling management of + * Ethernet access. + * + * @see #getSystemService + * @see android.net.ethernet.EthernetManager + */ + public static final String ETHERNET_SERVICE = "ethernet"; + + /** * Use with {@link #getSystemService} to retrieve a * {@link android.media.AudioManager} for handling management of volume, * ringer modes and audio routing. diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 38c5dc4..608a029 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2591,6 +2591,19 @@ public final class Settings { public static final String WIFI_ON = "wifi_on"; /** + * Ethernet related configurations + */ + public static final String ETHERNET_ON = "ethernet_on"; + public static final String ETHERNET_MODE = "ethernet_mode"; + public static final String ETHERNET_IP = "ethernet_ip"; + public static final String ETHERNET_MASK = "ethernet_netmask"; + public static final String ETHERNET_DNS = "ethernet_dns"; + public static final String ETHERNET_ROUTE = "ethernet_iproute"; + public static final String ETHERNET_CONF = "ethernet_conf"; + public static final String ETHERNET_IFNAME = "ethernet_ifname"; + + + /** * Used to save the Wifi_ON state prior to tethering. * This state will be checked to restore Wifi after * the user turns off tethering. diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 12b9ca5..79f65a4 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -66,6 +66,7 @@ LOCAL_SRC_FILES:= \ android_net_NetUtils.cpp \ android_net_TrafficStats.cpp \ android_net_wifi_Wifi.cpp \ + android_net_ethernet.cpp \ android_nio_utils.cpp \ android_nfc_NdefMessage.cpp \ android_nfc_NdefRecord.cpp \ diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index d9759bf..123c7fa 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -145,6 +145,7 @@ extern int register_android_net_LocalSocketImpl(JNIEnv* env); extern int register_android_net_NetworkUtils(JNIEnv* env); extern int register_android_net_TrafficStats(JNIEnv* env); extern int register_android_net_wifi_WifiManager(JNIEnv* env); +extern int register_android_net_ethernet_EthernetManager(JNIEnv* env); extern int register_android_security_Md5MessageDigest(JNIEnv *env); extern int register_android_text_AndroidCharacter(JNIEnv *env); extern int register_android_text_AndroidBidi(JNIEnv *env); @@ -1255,6 +1256,7 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_net_NetworkUtils), REG_JNI(register_android_net_TrafficStats), REG_JNI(register_android_net_wifi_WifiManager), + REG_JNI(register_android_net_ethernet_EthernetManager), REG_JNI(register_android_nfc_NdefMessage), REG_JNI(register_android_nfc_NdefRecord), REG_JNI(register_android_os_MemoryFile), diff --git a/core/jni/android_net_ethernet.cpp b/core/jni/android_net_ethernet.cpp new file mode 100644 index 0000000..b01c199 --- /dev/null +++ b/core/jni/android_net_ethernet.cpp @@ -0,0 +1,419 @@ +/* + * Copyright 2010, The Android-x86 Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Author: Yi Sun + */ + +#define LOG_TAG "ethernet" + +#include "jni.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#define ETH_PKG_NAME "android/net/ethernet/EthernetNative" +#define NL_SOCK_INV -1 +#define RET_STR_SZ 4096 +#define NL_POLL_MSG_SZ 8*1024 +#define SYSFS_PATH_MAX 256 + +namespace android { + static struct fieldIds { + jclass dhcpInfoClass; + jmethodID constructorId; + jfieldID ipaddress; + jfieldID gateway; + jfieldID netmask; + jfieldID dns1; + jfieldID dns2; + jfieldID serverAddress; + jfieldID leaseDuration; + } dhcpInfoFieldIds; + + struct interface_info_t { + unsigned int i; /* interface index */ + char *name; /* name (eth0, eth1, ...) */ + struct interface_info_t *next; + }; + + interface_info_t *interfaces = NULL; + int total_int = 0; + static const char SYSFS_CLASS_NET[] = "/sys/class/net"; + static int nl_socket_msg = NL_SOCK_INV; + static struct sockaddr_nl addr_msg; + static int nl_socket_poll = NL_SOCK_INV; + static struct sockaddr_nl addr_poll; + static int getinterfacename(int index, char *name, size_t len); + + static interface_info_t *find_info_by_index(unsigned int index) + { + interface_info_t *info = interfaces; + while (info) { + if (info->i == index) + break; + info = info->next; + } + return info; + } + + static jstring android_net_ethernet_waitForEvent(JNIEnv *env, jobject clazz) + { + char *buff; + struct nlmsghdr *nh; + struct ifinfomsg *einfo; + struct iovec iov; + struct msghdr msg; + char *result = NULL; + char rbuf[4096]; + unsigned int left; + interface_info_t *info; + int len; + + LOGV("Poll events from ethernet devices"); + /* + *wait on uevent netlink socket for the ethernet device + */ + buff = (char *)malloc(NL_POLL_MSG_SZ); + if (!buff) { + LOGE("Allocate poll buffer failed"); + goto error; + } + + iov.iov_base = buff; + iov.iov_len = NL_POLL_MSG_SZ; + msg.msg_name = (void *)&addr_msg; + msg.msg_namelen = sizeof(addr_msg); + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + msg.msg_control = NULL; + msg.msg_controllen = 0; + msg.msg_flags = 0; + + if ((len = recvmsg(nl_socket_poll, &msg, 0)) >= 0) { + LOGV("recvmsg get data"); + result = rbuf; + left = 4096; + rbuf[0] = '\0'; + for (nh = (struct nlmsghdr *) buff; NLMSG_OK (nh, len); + nh = NLMSG_NEXT (nh, len)) { + + if (nh->nlmsg_type == NLMSG_DONE) { + LOGE("Did not find useful eth interface information"); + goto error; + } + + if (nh->nlmsg_type == NLMSG_ERROR) { + /* Do some error handling. */ + LOGE("Read device name failed"); + goto error; + } + + LOGV(" event :%d found", nh->nlmsg_type); + einfo = (struct ifinfomsg *)NLMSG_DATA(nh); + LOGV("the device flag :%X", einfo->ifi_flags); + if (nh->nlmsg_type == RTM_DELLINK || + nh->nlmsg_type == RTM_NEWLINK || + nh->nlmsg_type == RTM_DELADDR || + nh->nlmsg_type == RTM_NEWADDR) { + int type = nh->nlmsg_type; + if (type == RTM_NEWLINK && + (!(einfo->ifi_flags & IFF_LOWER_UP))) { + type = RTM_DELLINK; + } + if ((info = find_info_by_index + (((struct ifinfomsg*) NLMSG_DATA(nh))->ifi_index)) != NULL) + snprintf(result,left, "%s:%d:",info->name,type); + left = left - strlen(result); + result =(char *)(result+ strlen(result)); + } + + } + LOGV("Done parsing"); + rbuf[4096 - left] = '\0'; + LOGV("poll state :%s, left:%d", rbuf, left); + } + + + error: + free(buff); + return env->NewStringUTF(rbuf); + } + + static int netlink_send_dump_request(int sock, int type, int family) + { + int ret; + char buf[4096]; + struct sockaddr_nl snl; + struct nlmsghdr *nlh; + struct rtgenmsg *g; + + memset(&snl, 0, sizeof(snl)); + snl.nl_family = AF_NETLINK; + + memset(buf, 0, sizeof(buf)); + nlh = (struct nlmsghdr *)buf; + g = (struct rtgenmsg *)(buf + sizeof(struct nlmsghdr)); + + nlh->nlmsg_len = NLMSG_LENGTH(sizeof(struct rtgenmsg)); + nlh->nlmsg_flags = NLM_F_REQUEST|NLM_F_DUMP; + nlh->nlmsg_type = type; + g->rtgen_family = family; + + ret = sendto(sock, buf, nlh->nlmsg_len, 0, (struct sockaddr *)&snl, + sizeof(snl)); + if (ret < 0) { + perror("netlink_send_dump_request sendto"); + return -1; + } + + return ret; + } + + static void free_int_list() + { + interface_info_t *tmp = interfaces; + while (tmp) { + if (tmp->name) + free(tmp->name); + interfaces = tmp->next; + free(tmp); + tmp = interfaces; + total_int--; + } + if (total_int) { + LOGE("Wrong interface count found"); + total_int = 0; + } + } + + static void add_int_to_list(interface_info_t *node) + { + /* Todo: Lock here!!!! */ + node->next = interfaces; + interfaces = node; + total_int++; + } + + static int netlink_init_interfaces_list(void) + { + int ret = -1; + DIR *netdir; + struct dirent *de; + char path[SYSFS_PATH_MAX]; + interface_info_t *intfinfo; + int index; + FILE *ifidx; + #define MAX_FGETS_LEN 4 + char idx[MAX_FGETS_LEN+1]; + + if ((netdir = opendir(SYSFS_CLASS_NET)) != NULL) { + while ((de = readdir(netdir))) { + if ((!strcmp(de->d_name, ".")) || (!strcmp(de->d_name, "..")) + ||(!strcmp(de->d_name, "lo")) || (!strcmp(de->d_name, "wmaster0")) || + (!strcmp(de->d_name, "pan0"))) + continue; + snprintf(path, SYSFS_PATH_MAX,"%s/%s/phy80211", SYSFS_CLASS_NET, de->d_name); + if (!access(path, F_OK)) + continue; + snprintf(path, SYSFS_PATH_MAX,"%s/%s/wireless", SYSFS_CLASS_NET, de->d_name); + if (!access(path, F_OK)) + continue; + + snprintf(path, SYSFS_PATH_MAX,"%s/%s/ifindex", SYSFS_CLASS_NET, de->d_name); + if ((ifidx = fopen(path, "r")) != NULL) { + memset(idx, 0, MAX_FGETS_LEN+1); + if (fgets(idx,MAX_FGETS_LEN, ifidx) != NULL) { + index = strtoimax(idx, NULL, 10); + } else { + LOGE("Can not read %s", path); + continue; + } + } else { + LOGE("Can not open %s for read", path); + continue; + } + /* make some room! */ + intfinfo = (interface_info_t *)malloc(sizeof(interface_info_t)); + if (intfinfo == NULL) { + LOGE("malloc in netlink_init_interfaces_table"); + goto error; + } + /* copy the interface name (eth0, eth1, ...) */ + intfinfo->name = strndup((char *) de->d_name, SYSFS_PATH_MAX); + intfinfo->i = index; + LOGI("interface %s:%d found", intfinfo->name, intfinfo->i); + add_int_to_list(intfinfo); + } + closedir(netdir); + } + ret = 0; + + error: + return ret; + } + + /* + * The netlink socket + */ + + static jint android_net_ethernet_initEthernetNative(JNIEnv *env, + jobject clazz) + { + int ret = -1; + + memset(&addr_msg, 0, sizeof(sockaddr_nl)); + addr_msg.nl_family = AF_NETLINK; + memset(&addr_poll, 0, sizeof(sockaddr_nl)); + addr_poll.nl_family = AF_NETLINK; + addr_poll.nl_pid = 0;//getpid(); + addr_poll.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR; + + /* + *Create connection to netlink socket + */ + nl_socket_msg = socket(AF_NETLINK,SOCK_RAW,NETLINK_ROUTE); + if (nl_socket_msg <= 0) { + LOGE("Can not create netlink msg socket"); + goto error; + } + if (bind(nl_socket_msg, (struct sockaddr *)(&addr_msg), + sizeof(struct sockaddr_nl))) { + LOGE("Can not bind to netlink msg socket"); + goto error; + } + + nl_socket_poll = socket(AF_NETLINK,SOCK_RAW,NETLINK_ROUTE); + if (nl_socket_poll <= 0) { + LOGE("Can not create netlink poll socket"); + goto error; + } + + errno = 0; + if (bind(nl_socket_poll, (struct sockaddr *)(&addr_poll), + sizeof(struct sockaddr_nl))) { + LOGE("Can not bind to netlink poll socket,%s", strerror(errno)); + + goto error; + } + + if ((ret = netlink_init_interfaces_list()) < 0) { + LOGE("Can not collect the interface list"); + goto error; + } + LOGE("%s exited with success", __FUNCTION__); + return ret; + + error: + LOGE("%s exited with error", __FUNCTION__); + if (nl_socket_msg > 0) + close(nl_socket_msg); + if (nl_socket_poll > 0) + close(nl_socket_poll); + return ret; + } + + static jstring android_net_ethernet_getInterfaceName(JNIEnv *env, + jobject clazz, + jint index) + { + int i = 0; + interface_info_t *info; + LOGI("User ask for device name on %d, list:%X, total:%d", + index, (unsigned int)interfaces, total_int); + info = interfaces; + if (total_int != 0 && index <= (total_int - 1)) { + while (info) { + if (index == i) { + LOGV("Found: %s", info->name); + return env->NewStringUTF(info->name); + } + info = info->next; + i++; + } + } + LOGI("No device name found"); + return env->NewStringUTF(NULL); + } + + + static jint android_net_ethernet_getInterfaceCnt() + { + return total_int; + } + + static JNINativeMethod gEthernetMethods[] = { + {"waitForEvent", "()Ljava/lang/String;", + (void *)android_net_ethernet_waitForEvent}, + {"getInterfaceName", "(I)Ljava/lang/String;", + (void *)android_net_ethernet_getInterfaceName}, + {"initEthernetNative", "()I", + (void *)android_net_ethernet_initEthernetNative}, + {"getInterfaceCnt","()I", + (void *)android_net_ethernet_getInterfaceCnt} + }; + + int register_android_net_ethernet_EthernetManager(JNIEnv* env) + { + jclass eth = env->FindClass(ETH_PKG_NAME); + LOGI("Loading ethernet jni class"); + LOG_FATAL_IF(eth == NULL, "Unable to find class " ETH_PKG_NAME); + + dhcpInfoFieldIds.dhcpInfoClass = + env->FindClass("android/net/DhcpInfo"); + if (dhcpInfoFieldIds.dhcpInfoClass != NULL) { + dhcpInfoFieldIds.constructorId = + env->GetMethodID(dhcpInfoFieldIds.dhcpInfoClass, + "", "()V"); + dhcpInfoFieldIds.ipaddress = + env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, + "ipAddress", "I"); + dhcpInfoFieldIds.gateway = + env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, + "gateway", "I"); + dhcpInfoFieldIds.netmask = + env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, + "netmask", "I"); + dhcpInfoFieldIds.dns1 = + env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "dns1", "I"); + dhcpInfoFieldIds.dns2 = + env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "dns2", "I"); + dhcpInfoFieldIds.serverAddress = + env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, + "serverAddress", "I"); + dhcpInfoFieldIds.leaseDuration = + env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, + "leaseDuration", "I"); + } + + return AndroidRuntime::registerNativeMethods(env, + ETH_PKG_NAME, + gEthernetMethods, + NELEM(gEthernetMethods)); + } + +} diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 916dd81..af485ee 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -38,6 +38,7 @@ mute volume wifi + ethernet cdma_eri data_connection phone_evdo_signal @@ -95,6 +96,7 @@ "mobile_mms,2,0,2" "mobile_supl,3,0,2" "mobile_hipri,5,0,3" + "ethernet,9,9,1"