Pass network properties to ConnectivityService.
Used as a bag to hold ipaddr, gateway, dns, proxy info. addr's are InetAddresses for v4/v6 use. Cleaning up some old v4-only code bug:2655015 Change-Id: I7ac886fe5c519e8bab42f49cd82a5189d9c9ab59
This commit is contained in:
Robert Greenwalt
parent
4e6e6a1042
commit
a7dfbd3a1d
3 changed files with 419 additions and 94 deletions
196
core/java/android/net/NetworkProperties.java
Normal file
196
core/java/android/net/NetworkProperties.java
Normal file
|
|
@ -0,0 +1,196 @@
|
|||
/*
|
||||
* Copyright (C) 2008 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.Parcelable;
|
||||
import android.os.Parcel;
|
||||
import android.util.Log;
|
||||
|
||||
import java.net.InetAddress;
|
||||
import java.net.NetworkInterface;
|
||||
import java.net.SocketException;
|
||||
import java.net.UnknownHostException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* Describes the properties of a network interface or single address
|
||||
* of an interface.
|
||||
* TODO - consider adding optional fields like Apn and ApnType
|
||||
* @hide
|
||||
*/
|
||||
public class NetworkProperties implements Parcelable {
|
||||
|
||||
private NetworkInterface mIface;
|
||||
private Collection<InetAddress> mAddresses;
|
||||
private Collection<InetAddress> mDnses;
|
||||
private InetAddress mGateway;
|
||||
private ProxyProperties mHttpProxy;
|
||||
|
||||
public NetworkProperties() {
|
||||
clear();
|
||||
}
|
||||
|
||||
public synchronized void setInterface(NetworkInterface iface) {
|
||||
mIface = iface;
|
||||
}
|
||||
public synchronized NetworkInterface getInterface() {
|
||||
return mIface;
|
||||
}
|
||||
public synchronized String getInterfaceName() {
|
||||
return (mIface == null ? null : mIface.getName());
|
||||
}
|
||||
|
||||
public synchronized void addAddress(InetAddress address) {
|
||||
mAddresses.add(address);
|
||||
}
|
||||
public synchronized Collection<InetAddress> getAddresses() {
|
||||
return mAddresses;
|
||||
}
|
||||
|
||||
public synchronized void addDns(InetAddress dns) {
|
||||
mDnses.add(dns);
|
||||
}
|
||||
public synchronized Collection<InetAddress> getDnses() {
|
||||
return mDnses;
|
||||
}
|
||||
|
||||
public synchronized void setGateway(InetAddress gateway) {
|
||||
mGateway = gateway;
|
||||
}
|
||||
public synchronized InetAddress getGateway() {
|
||||
return mGateway;
|
||||
}
|
||||
|
||||
public synchronized void setHttpProxy(ProxyProperties proxy) {
|
||||
mHttpProxy = proxy;
|
||||
}
|
||||
public synchronized ProxyProperties getHttpProxy() {
|
||||
return mHttpProxy;
|
||||
}
|
||||
|
||||
public synchronized void clear() {
|
||||
mIface = null;
|
||||
mAddresses = new ArrayList<InetAddress>();
|
||||
mDnses = new ArrayList<InetAddress>();
|
||||
mGateway = null;
|
||||
mHttpProxy = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implement the Parcelable interface
|
||||
* @hide
|
||||
*/
|
||||
public int describeContents() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
public synchronized String toString() {
|
||||
String ifaceName = (mIface == null ? "" : "InterfaceName: " + mIface.getName() + " ");
|
||||
|
||||
String ip = "IpAddresses: [";
|
||||
for (InetAddress addr : mAddresses) ip += addr.toString() + ",";
|
||||
ip += "] ";
|
||||
|
||||
String dns = "DnsAddresses: [";
|
||||
for (InetAddress addr : mDnses) dns += addr.toString() + ",";
|
||||
dns += "] ";
|
||||
|
||||
String proxy = (mHttpProxy == null ? "" : "HttpProxy: " + mHttpProxy.toString() + " ");
|
||||
String gateway = (mGateway == null ? "" : "Gateway: " + mGateway.toString() + " ");
|
||||
|
||||
return ifaceName + ip + gateway + dns + proxy;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implement the Parcelable interface.
|
||||
* @hide
|
||||
*/
|
||||
public synchronized void writeToParcel(Parcel dest, int flags) {
|
||||
dest.writeString(getInterfaceName());
|
||||
dest.writeInt(mAddresses.size());
|
||||
for(InetAddress a : mAddresses) {
|
||||
dest.writeString(a.getHostName());
|
||||
dest.writeByteArray(a.getAddress());
|
||||
}
|
||||
dest.writeInt(mDnses.size());
|
||||
for(InetAddress d : mDnses) {
|
||||
dest.writeString(d.getHostName());
|
||||
dest.writeByteArray(d.getAddress());
|
||||
}
|
||||
if (mGateway != null) {
|
||||
dest.writeByte((byte)1);
|
||||
dest.writeString(mGateway.getHostName());
|
||||
dest.writeByteArray(mGateway.getAddress());
|
||||
} else {
|
||||
dest.writeByte((byte)0);
|
||||
}
|
||||
if (mHttpProxy != null) {
|
||||
dest.writeByte((byte)1);
|
||||
dest.writeParcelable(mHttpProxy, flags);
|
||||
} else {
|
||||
dest.writeByte((byte)0);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Implement the Parcelable interface.
|
||||
* @hide
|
||||
*/
|
||||
public static final Creator<NetworkProperties> CREATOR =
|
||||
new Creator<NetworkProperties>() {
|
||||
public NetworkProperties createFromParcel(Parcel in) {
|
||||
NetworkProperties netProp = new NetworkProperties();
|
||||
String iface = in.readString();
|
||||
if (iface != null) {
|
||||
try {
|
||||
netProp.setInterface(NetworkInterface.getByName(iface));
|
||||
} catch (Exception e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
int addressCount = in.readInt();
|
||||
for (int i=0; i<addressCount; i++) {
|
||||
try {
|
||||
netProp.addAddress(InetAddress.getByAddress(in.readString(),
|
||||
in.createByteArray()));
|
||||
} catch (UnknownHostException e) { }
|
||||
}
|
||||
addressCount = in.readInt();
|
||||
for (int i=0; i<addressCount; i++) {
|
||||
try {
|
||||
netProp.addDns(InetAddress.getByAddress(in.readString(),
|
||||
in.createByteArray()));
|
||||
} catch (UnknownHostException e) { }
|
||||
}
|
||||
if (in.readByte() == 1) {
|
||||
try {
|
||||
netProp.setGateway(InetAddress.getByAddress(in.readString(),
|
||||
in.createByteArray()));
|
||||
} catch (UnknownHostException e) {}
|
||||
}
|
||||
if (in.readByte() == 1) {
|
||||
netProp.setHttpProxy((ProxyProperties)in.readParcelable(null));
|
||||
}
|
||||
return netProp;
|
||||
}
|
||||
|
||||
public NetworkProperties[] newArray(int size) {
|
||||
return new NetworkProperties[size];
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -32,13 +32,37 @@ public class NetworkUtils {
|
|||
public native static int disableInterface(String interfaceName);
|
||||
|
||||
/** Add a route to the specified host via the named interface. */
|
||||
public native static int addHostRoute(String interfaceName, int hostaddr);
|
||||
public static int addHostRoute(String interfaceName, InetAddress hostaddr) {
|
||||
int v4Int = v4StringToInt(hostaddr.getHostAddress());
|
||||
if (v4Int != 0) {
|
||||
return addHostRouteNative(interfaceName, v4Int);
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
private native static int addHostRouteNative(String interfaceName, int hostaddr);
|
||||
|
||||
/** Add a default route for the named interface. */
|
||||
public native static int setDefaultRoute(String interfaceName, int gwayAddr);
|
||||
public static int setDefaultRoute(String interfaceName, InetAddress gwayAddr) {
|
||||
int v4Int = v4StringToInt(gwayAddr.getHostAddress());
|
||||
if (v4Int != 0) {
|
||||
return setDefaultRouteNative(interfaceName, v4Int);
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
private native static int setDefaultRouteNative(String interfaceName, int hostaddr);
|
||||
|
||||
/** Return the gateway address for the default route for the named interface. */
|
||||
public native static int getDefaultRoute(String interfaceName);
|
||||
public static InetAddress getDefaultRoute(String interfaceName) {
|
||||
int addr = getDefaultRouteNative(interfaceName);
|
||||
try {
|
||||
return InetAddress.getByAddress(v4IntToArray(addr));
|
||||
} catch (UnknownHostException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
private native static int getDefaultRouteNative(String interfaceName);
|
||||
|
||||
/** Remove host routes that uses the named interface. */
|
||||
public native static int removeHostRoutes(String interfaceName);
|
||||
|
|
@ -105,27 +129,30 @@ public class NetworkUtils {
|
|||
private native static boolean configureNative(
|
||||
String interfaceName, int ipAddress, int netmask, int gateway, int dns1, int dns2);
|
||||
|
||||
/**
|
||||
* Look up a host name and return the result as an int. Works if the argument
|
||||
* is an IP address in dot notation. Obviously, this can only be used for IPv4
|
||||
* addresses.
|
||||
* @param hostname the name of the host (or the IP address)
|
||||
* @return the IP address as an {@code int} in network byte order
|
||||
*/
|
||||
public static int lookupHost(String hostname) {
|
||||
InetAddress inetAddress;
|
||||
// The following two functions are glue to tie the old int-based address scheme
|
||||
// to the new InetAddress scheme. They should go away when we go fully to InetAddress
|
||||
// TODO - remove when we switch fully to InetAddress
|
||||
public static byte[] v4IntToArray(int addr) {
|
||||
byte[] addrBytes = new byte[4];
|
||||
addrBytes[0] = (byte)(addr & 0xff);
|
||||
addrBytes[1] = (byte)((addr >> 8) & 0xff);
|
||||
addrBytes[2] = (byte)((addr >> 16) & 0xff);
|
||||
addrBytes[3] = (byte)((addr >> 24) & 0xff);
|
||||
return addrBytes;
|
||||
}
|
||||
|
||||
public static int v4StringToInt(String str) {
|
||||
int result = 0;
|
||||
String[] array = str.split("\\.");
|
||||
if (array.length != 4) return 0;
|
||||
try {
|
||||
inetAddress = InetAddress.getByName(hostname);
|
||||
} catch (UnknownHostException e) {
|
||||
return -1;
|
||||
result = Integer.parseInt(array[3]);
|
||||
result = (result << 8) + Integer.parseInt(array[2]);
|
||||
result = (result << 8) + Integer.parseInt(array[1]);
|
||||
result = (result << 8) + Integer.parseInt(array[0]);
|
||||
} catch (NumberFormatException e) {
|
||||
return 0;
|
||||
}
|
||||
byte[] addrBytes;
|
||||
int addr;
|
||||
addrBytes = inetAddress.getAddress();
|
||||
addr = ((addrBytes[3] & 0xff) << 24)
|
||||
| ((addrBytes[2] & 0xff) << 16)
|
||||
| ((addrBytes[1] & 0xff) << 8)
|
||||
| (addrBytes[0] & 0xff);
|
||||
return addr;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
108
core/java/android/net/ProxyProperties.java
Normal file
108
core/java/android/net/ProxyProperties.java
Normal file
|
|
@ -0,0 +1,108 @@
|
|||
/*
|
||||
* Copyright (C) 2007 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.UnknownHostException;
|
||||
|
||||
/**
|
||||
* A container class for the http proxy info
|
||||
* @hide
|
||||
*/
|
||||
public class ProxyProperties implements Parcelable {
|
||||
|
||||
private InetAddress mProxy;
|
||||
private int mPort;
|
||||
private String mExclusionList;
|
||||
|
||||
public ProxyProperties() {
|
||||
}
|
||||
|
||||
public synchronized InetAddress getAddress() {
|
||||
return mProxy;
|
||||
}
|
||||
public synchronized void setAddress(InetAddress proxy) {
|
||||
mProxy = proxy;
|
||||
}
|
||||
|
||||
public synchronized int getPort() {
|
||||
return mPort;
|
||||
}
|
||||
public synchronized void setPort(int port) {
|
||||
mPort = port;
|
||||
}
|
||||
|
||||
public synchronized String getExclusionList() {
|
||||
return mExclusionList;
|
||||
}
|
||||
public synchronized void setExclusionList(String exclusionList) {
|
||||
mExclusionList = exclusionList;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implement the Parcelable interface
|
||||
* @hide
|
||||
*/
|
||||
public int describeContents() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implement the Parcelable interface.
|
||||
* @hide
|
||||
*/
|
||||
public synchronized void writeToParcel(Parcel dest, int flags) {
|
||||
if (mProxy != null) {
|
||||
dest.writeByte((byte)1);
|
||||
dest.writeString(mProxy.getHostName());
|
||||
dest.writeByteArray(mProxy.getAddress());
|
||||
} else {
|
||||
dest.writeByte((byte)0);
|
||||
}
|
||||
dest.writeInt(mPort);
|
||||
dest.writeString(mExclusionList);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implement the Parcelable interface.
|
||||
* @hide
|
||||
*/
|
||||
public static final Creator<ProxyProperties> CREATOR =
|
||||
new Creator<ProxyProperties>() {
|
||||
public ProxyProperties createFromParcel(Parcel in) {
|
||||
ProxyProperties proxyProperties = new ProxyProperties();
|
||||
if (in.readByte() == 1) {
|
||||
try {
|
||||
proxyProperties.setAddress(InetAddress.getByAddress(in.readString(),
|
||||
in.createByteArray()));
|
||||
} catch (UnknownHostException e) {}
|
||||
}
|
||||
proxyProperties.setPort(in.readInt());
|
||||
proxyProperties.setExclusionList(in.readString());
|
||||
return proxyProperties;
|
||||
}
|
||||
|
||||
public ProxyProperties[] newArray(int size) {
|
||||
return new ProxyProperties[size];
|
||||
}
|
||||
};
|
||||
|
||||
};
|
||||
Loading…
Reference in a new issue