Merge "Add LinkAddress" (be93061e) · Commits · e / os / android_frameworks_base

core/java/android/net/LinkAddress.aidl

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		/**
		*
		* Copyright (C) 2010 The Android 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.
		*/

		package android.net;

		parcelable LinkAddress;

core/java/android/net/LinkAddress.java

0 → 100644

+149 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android 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.
		*/

		package android.net;

		import android.os.Parcel;
		import android.os.Parcelable;

		import java.net.InetAddress;
		import java.net.InterfaceAddress;
		import java.net.UnknownHostException;

		/**
		* Identifies an address of a network link
		* @hide
		*/
		public class LinkAddress implements Parcelable {
		/**
		* IPv4 or IPv6 address.
		*/
		private final InetAddress address;

		/**
		* Network prefix
		*/
		private final int prefix;

		public LinkAddress(InetAddress address, InetAddress mask) {
		this.address = address;
		this.prefix = computeprefix(mask);
		}

		public LinkAddress(InetAddress address, int prefix) {
		this.address = address;
		this.prefix = prefix;
		}

		public LinkAddress(InterfaceAddress interfaceAddress) {
		this.address = interfaceAddress.getAddress();
		this.prefix = interfaceAddress.getNetworkPrefixLength();
		}

		private static int computeprefix(InetAddress mask) {
		int count = 0;
		for (byte b : mask.getAddress()) {
		for (int i = 0; i < 8; ++i) {
		if ((b & (1 << i)) != 0) {
		++count;
		}
		}
		}
		return count;
		}

		@Override
		public String toString() {
		return (address == null ? "" : (address.getHostAddress() + "/" + prefix));
		}

		/**
		* Compares this {@code LinkAddress} instance against the specified address
		* in {@code obj}. Two addresses are equal if their InetAddress and prefix
		* are equal
		*
		* @param obj the object to be tested for equality.
		* @return {@code true} if both objects are equal, {@code false} otherwise.
		*/
		@Override
		public boolean equals(Object obj) {
		if (!(obj instanceof LinkAddress)) {
		return false;
		}
		LinkAddress linkAddress = (LinkAddress) obj;
		return this.address.equals(linkAddress.address) &&
		this.prefix == linkAddress.prefix;
		}

		/**
		* Returns the InetAddress for this address.
		*/
		public InetAddress getAddress() {
		return address;
		}

		/**
		* Get network prefix length
		*/
		public int getNetworkPrefix() {
		return prefix;
		}

		/**
		* Implement the Parcelable interface
		* @hide
		*/
		public int describeContents() {
		return 0;
		}

		/**
		* Implement the Parcelable interface.
		* @hide
		*/
		public void writeToParcel(Parcel dest, int flags) {
		if (address != null) {
		dest.writeByte((byte)1);
		dest.writeByteArray(address.getAddress());
		dest.writeInt(prefix);
		} else {
		dest.writeByte((byte)0);
		}
		}

		/**
		* Implement the Parcelable interface.
		* @hide
		*/
		public static final Creator<LinkAddress> CREATOR =
		new Creator<LinkAddress>() {
		public LinkAddress createFromParcel(Parcel in) {
		InetAddress address = null;
		int prefix = 0;
		if (in.readByte() == 1) {
		try {
		address = InetAddress.getByAddress(in.createByteArray());
		prefix = in.readInt();
		} catch (UnknownHostException e) { }
		}
		return new LinkAddress(address, prefix);
		}

		public LinkAddress[] newArray(int size) {
		return new LinkAddress[size];
		}
		};
		}

core/java/android/net/LinkProperties.java

+35 −30

Original line number	Diff line number	Diff line
		@@ -36,8 +36,8 @@ import java.util.Collections;
		*/
		public class LinkProperties implements Parcelable {

		private NetworkInterface mIface;
		private Collection<InetAddress> mAddresses;
		String mIfaceName;
		private Collection<LinkAddress> mLinkAddresses;
		private Collection<InetAddress> mDnses;
		private InetAddress mGateway;
		private ProxyProperties mHttpProxy;
		@@ -49,34 +49,42 @@ public class LinkProperties implements Parcelable {
		// copy constructor instead of clone
		public LinkProperties(LinkProperties source) {
		if (source != null) {
		mIface = source.getInterface();
		mAddresses = source.getAddresses();
		mIfaceName = source.getInterfaceName();
		mLinkAddresses = source.getLinkAddresses();
		mDnses = source.getDnses();
		mGateway = source.getGateway();
		mHttpProxy = new ProxyProperties(source.getHttpProxy());
		}
		}

		public void setInterface(NetworkInterface iface) {
		mIface = iface;
		}
		public NetworkInterface getInterface() {
		return mIface;
		public void setInterfaceName(String iface) {
		mIfaceName = iface;
		}

		public String getInterfaceName() {
		return (mIface == null ? null : mIface.getName());
		return mIfaceName;
		}

		public void addAddress(InetAddress address) {
		mAddresses.add(address);
		}
		public Collection<InetAddress> getAddresses() {
		return Collections.unmodifiableCollection(mAddresses);
		Collection<InetAddress> addresses = new ArrayList<InetAddress>();
		for (LinkAddress linkAddress : mLinkAddresses) {
		addresses.add(linkAddress.getAddress());
		}
		return Collections.unmodifiableCollection(addresses);
		}

		public void addLinkAddress(LinkAddress address) {
		mLinkAddresses.add(address);
		}

		public Collection<LinkAddress> getLinkAddresses() {
		return Collections.unmodifiableCollection(mLinkAddresses);
		}

		public void addDns(InetAddress dns) {
		mDnses.add(dns);
		}

		public Collection<InetAddress> getDnses() {
		return Collections.unmodifiableCollection(mDnses);
		}
		@@ -96,8 +104,8 @@ public class LinkProperties implements Parcelable {
		}

		public void clear() {
		mIface = null;
		mAddresses = new ArrayList<InetAddress>();
		mIfaceName = null;
		mLinkAddresses = new ArrayList<LinkAddress>();
		mDnses = new ArrayList<InetAddress>();
		mGateway = null;
		mHttpProxy = null;
		@@ -113,11 +121,11 @@ public class LinkProperties implements Parcelable {

		@Override
		public String toString() {
		String ifaceName = (mIface == null ? "" : "InterfaceName: " + mIface.getName() + " ");
		String ifaceName = (mIfaceName == null ? "" : "InterfaceName: " + mIfaceName + " ");

		String ip = "IpAddresses: [";
		for (InetAddress addr : mAddresses) ip += addr.getHostAddress() + ",";
		ip += "] ";
		String linkAddresses = "LinkAddresses: [";
		for (LinkAddress addr : mLinkAddresses) linkAddresses += addr.toString();
		linkAddresses += "] ";

		String dns = "DnsAddresses: [";
		for (InetAddress addr : mDnses) dns += addr.getHostAddress() + ",";
		@@ -126,7 +134,7 @@ public class LinkProperties implements Parcelable {
		String proxy = (mHttpProxy == null ? "" : "HttpProxy: " + mHttpProxy.toString() + " ");
		String gateway = (mGateway == null ? "" : "Gateway: " + mGateway.getHostAddress() + " ");

		return ifaceName + ip + gateway + dns + proxy;
		return ifaceName + linkAddresses + gateway + dns + proxy;
		}

		/**
		@@ -135,12 +143,11 @@ public class LinkProperties implements Parcelable {
		*/
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeString(getInterfaceName());
		dest.writeInt(mAddresses.size());
		//TODO: explore an easy alternative to preserve hostname
		// without doing a lookup
		for(InetAddress a : mAddresses) {
		dest.writeByteArray(a.getAddress());
		dest.writeInt(mLinkAddresses.size());
		for(LinkAddress linkAddress : mLinkAddresses) {
		dest.writeParcelable(linkAddress, flags);
		}

		dest.writeInt(mDnses.size());
		for(InetAddress d : mDnses) {
		dest.writeByteArray(d.getAddress());
		@@ -170,16 +177,14 @@ public class LinkProperties implements Parcelable {
		String iface = in.readString();
		if (iface != null) {
		try {
		netProp.setInterface(NetworkInterface.getByName(iface));
		netProp.setInterfaceName(iface);
		} catch (Exception e) {
		return null;
		}
		}
		int addressCount = in.readInt();
		for (int i=0; i<addressCount; i++) {
		try {
		netProp.addAddress(InetAddress.getByAddress(in.createByteArray()));
		} catch (UnknownHostException e) { }
		netProp.addLinkAddress((LinkAddress)in.readParcelable(null));
		}
		addressCount = in.readInt();
		for (int i=0; i<addressCount; i++) {

services/java/com/android/server/TelephonyRegistry.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -584,9 +584,9 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
		}
		if (linkProperties != null) {
		intent.putExtra(Phone.DATA_LINK_PROPERTIES_KEY, linkProperties);
		NetworkInterface iface = linkProperties.getInterface();
		String iface = linkProperties.getInterfaceName();
		if (iface != null) {
		intent.putExtra(Phone.DATA_IFACE_NAME_KEY, iface.getName());
		intent.putExtra(Phone.DATA_IFACE_NAME_KEY, iface);
		}
		}
		if (linkCapabilities != null) {

telephony/java/com/android/internal/telephony/DataConnection.java

+17 −17

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import com.android.internal.telephony.gsm.ApnSetting;
		import com.android.internal.util.HierarchicalState;
		import com.android.internal.util.HierarchicalStateMachine;

		import android.net.LinkAddress;
		import android.net.LinkCapabilities;
		import android.net.LinkProperties;
		import android.os.AsyncResult;
		@@ -29,10 +30,10 @@ import android.os.SystemProperties;
		import android.util.EventLog;

		import java.net.InetAddress;
		import java.net.InterfaceAddress;
		import java.net.NetworkInterface;
		import java.net.SocketException;
		import java.net.UnknownHostException;
		import java.util.HashMap;

		/**
		* {@hide}
		@@ -428,16 +429,16 @@ public abstract class DataConnection extends HierarchicalStateMachine {
		try {
		String prefix = "net." + interfaceName + ".";

		linkProperties.setInterface(NetworkInterface.getByName(interfaceName));
		NetworkInterface networkInterface = NetworkInterface.getByName(interfaceName);
		linkProperties.setInterfaceName(interfaceName);

		// TODO: Get gateway and dns via RIL interface not property?
		String gatewayAddress = SystemProperties.get(prefix + "gw");
		linkProperties.setGateway(InetAddress.getByName(gatewayAddress));

		if (response.length > 2) {
		String ipAddress = response[2];
		linkProperties.addAddress(InetAddress.getByName(ipAddress));

		for (InterfaceAddress addr : networkInterface.getInterfaceAddresses()) {
		linkProperties.addLinkAddress(new LinkAddress(addr));
		}
		// TODO: Get gateway and dns via RIL interface not property?
		String dnsServers[] = new String[2];
		dnsServers[0] = SystemProperties.get(prefix + "dns1");
		@@ -448,7 +449,6 @@ public abstract class DataConnection extends HierarchicalStateMachine {
		} else {
		result = SetupResult.ERR_BadDns;
		}
		}
		} catch (UnknownHostException e1) {
		log("onSetupCompleted: UnknowHostException " + e1);
		e1.printStackTrace();