diff options
author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-05 10:58:35 +0000 |
---|---|---|
committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-05 10:58:35 +0000 |
commit | 66ad244a2537618814523280de1f8379fed15d36 (patch) | |
tree | c8a25dc49761dd546d4603ded8cf1dcf5803a2fd /net/android | |
parent | a0ac817e277134e9d442f10370690bb8831e7e51 (diff) | |
download | chromium_src-66ad244a2537618814523280de1f8379fed15d36.zip chromium_src-66ad244a2537618814523280de1f8379fed15d36.tar.gz chromium_src-66ad244a2537618814523280de1f8379fed15d36.tar.bz2 |
Added net::NetworkInterface::interface_index.
Not implemented for Android.
BUG=319068
Review URL: https://codereview.chromium.org/100703002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android')
-rw-r--r-- | net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java index 49b6634..b7aec32 100644 --- a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java +++ b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java @@ -143,11 +143,12 @@ class AndroidNetworkLibrary { /** * @return the network interfaces list (if any) string. The items in - * the list string are delimited by a semicolon ";", each item - * is a network interface name and address pair and formatted - * as "name,address". e.g. - * eth0,10.0.0.2;eth0,fe80::5054:ff:fe12:3456 - * represents a network list string which containts two items. + * the list string are delimited by a new line, each item + * is tab separated network interface name, address with network + * prefix length and network interface index. + * as "name\taddress/prefix\tindex". e.g. + * eth0\t10.0.0.2/8\t5\neth0\tfe80::5054:ff:fe12:3456/16\t5 + * represents a network list string with two items. */ @CalledByNative static public String getNetworkList() { @@ -183,6 +184,10 @@ class AndroidNetworkLibrary { addressString.append(ipAddress); addressString.append("/"); addressString.append(interfaceAddress.getNetworkPrefixLength()); + addressString.append("\t"); + + // TODO(vitalybuka): use netIf.getIndex() when API level 19 is availible. + addressString.append("0"); if (result.length() != 0) result.append("\n"); |