Skip to content

Commit

Permalink
Merge "Fix a couple of isReachable bugs."
Browse files Browse the repository at this point in the history
  • Loading branch information
@enh-google
enh-google authored and Android (Google) Code Review committed Sep 30, 2011
2 parents 7546799 + 9b4a8ec commit 8f0e611
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 128 deletions.
131 changes: 34 additions & 97 deletions luni/src/main/java/java/net/InetAddress.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@
import java.util.Comparator;
import java.util.Enumeration;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
import libcore.io.ErrnoException;
import libcore.io.GaiException;
import libcore.io.Libcore;
import libcore.io.IoBridge;
import libcore.io.Libcore;
import libcore.io.Memory;
import libcore.io.StructAddrinfo;
import static libcore.io.OsConstants.*;
Expand Down Expand Up @@ -133,12 +135,6 @@ public class InetAddress implements Serializable {

private static final long serialVersionUID = 3286316764910316507L;

private transient Object waitReachable = new Object();

private boolean reached;

private int addrCount;

private int family;

byte[] ipaddress;
Expand Down Expand Up @@ -641,8 +637,8 @@ public boolean isSiteLocalAddress() {

/**
* Tries to reach this {@code InetAddress}. This method first tries to use
* ICMP <i>(ICMP ECHO REQUEST)</i>. When first step fails, a TCP connection
* on port 7 (Echo) of the remote host is established.
* ICMP <i>(ICMP ECHO REQUEST)</i>, falling back to a TCP connection
* on port 7 (Echo) of the remote host.
*
* @param timeout
* timeout in milliseconds before the test fails if no connection
Expand All @@ -660,8 +656,8 @@ public boolean isReachable(int timeout) throws IOException {

/**
* Tries to reach this {@code InetAddress}. This method first tries to use
* ICMP <i>(ICMP ECHO REQUEST)</i>. When first step fails, a TCP connection
* on port 7 (Echo) of the remote host is established.
* ICMP <i>(ICMP ECHO REQUEST)</i>, falling back to a TCP connection
* on port 7 (Echo) of the remote host.
*
* @param networkInterface
* the network interface on which to connection should be
Expand All @@ -678,112 +674,53 @@ public boolean isReachable(int timeout) throws IOException {
* @throws IllegalArgumentException
* if ttl or timeout is less than zero.
*/
public boolean isReachable(NetworkInterface networkInterface, final int ttl,
final int timeout) throws IOException {
public boolean isReachable(NetworkInterface networkInterface, final int ttl, final int timeout) throws IOException {
if (ttl < 0 || timeout < 0) {
throw new IllegalArgumentException("ttl < 0 || timeout < 0");
}

// The simple case.
if (networkInterface == null) {
return isReachableByTCP(this, null, timeout);
} else {
return isReachableByMultiThread(networkInterface, ttl, timeout);
return isReachable(this, null, timeout);
}
}

/*
* Uses multi-Thread to try if isReachable, returns true if any of threads
* returns in time
*/
private boolean isReachableByMultiThread(NetworkInterface netif,
final int ttl, final int timeout)
throws IOException {
List<InetAddress> addresses = Collections.list(netif.getInetAddresses());
if (addresses.isEmpty()) {
// Try each NetworkInterface in parallel.
// Use a thread pool Executor?
List<InetAddress> sourceAddresses = Collections.list(networkInterface.getInetAddresses());
if (sourceAddresses.isEmpty()) {
return false;
}
reached = false;
addrCount = addresses.size();
boolean needWait = false;
for (final InetAddress addr : addresses) {
// loopback interface can only reach to local addresses
if (addr.isLoopbackAddress()) {
Enumeration<NetworkInterface> NetworkInterfaces = NetworkInterface
.getNetworkInterfaces();
while (NetworkInterfaces.hasMoreElements()) {
NetworkInterface networkInterface = NetworkInterfaces
.nextElement();
Enumeration<InetAddress> localAddresses = networkInterface
.getInetAddresses();
while (localAddresses.hasMoreElements()) {
if (InetAddress.this.equals(localAddresses
.nextElement())) {
return true;
}
}
}

synchronized (waitReachable) {
addrCount--;

if (addrCount == 0) {
// if count equals zero, all thread
// expired,notifies main thread
waitReachable.notifyAll();
}
}
continue;
}

needWait = true;
final InetAddress destinationAddress = this;
final CountDownLatch latch = new CountDownLatch(sourceAddresses.size());
final AtomicBoolean isReachable = new AtomicBoolean(false);
for (final InetAddress sourceAddress : sourceAddresses) {
new Thread() {
@Override public void run() {
/*
* Spec violation! This implementation doesn't attempt an
* ICMP; it skips right to TCP echo.
*/
boolean threadReached = false;
try {
threadReached = isReachableByTCP(addr, InetAddress.this, timeout);
} catch (IOException e) {
}

synchronized (waitReachable) {
if (threadReached) {
// if thread reached this address, sets reached to
// true and notifies main thread
reached = true;
waitReachable.notifyAll();
} else {
addrCount--;
if (addrCount == 0) {
// if count equals zero, all thread
// expired,notifies main thread
waitReachable.notifyAll();
if (isReachable(destinationAddress, sourceAddress, timeout)) {
isReachable.set(true);
// Wake the main thread so it can return success without
// waiting for any other threads to time out.
while (latch.getCount() > 0) {
latch.countDown();
}
}
} catch (IOException ignored) {
}
latch.countDown();
}
}.start();
}

if (needWait) {
synchronized (waitReachable) {
try {
while (!reached && (addrCount != 0)) {
// wait for notification
waitReachable.wait(1000);
}
} catch (InterruptedException e) {
// do nothing
}
return reached;
}
try {
latch.await();
} catch (InterruptedException ignored) {
Thread.currentThread().interrupt(); // Leave the interrupted bit set.
}

return false;
return isReachable.get();
}

private boolean isReachableByTCP(InetAddress destination, InetAddress source, int timeout) throws IOException {
private boolean isReachable(InetAddress destination, InetAddress source, int timeout) throws IOException {
// TODO: try ICMP first (http://code.google.com/p/android/issues/detail?id=20106)
FileDescriptor fd = IoBridge.socket(true);
boolean reached = false;
try {
Expand Down
20 changes: 19 additions & 1 deletion luni/src/test/java/libcore/java/net/InetAddressTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,19 @@

package libcore.java.net;

import java.net.InetAddress;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.UnknownHostException;
import java.util.Collections;
import tests.util.SerializationTester;

public class InetAddressTest extends junit.framework.TestCase {
private static final byte[] LOOPBACK6_BYTES = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
Expand Down Expand Up @@ -127,6 +136,15 @@ public void test_isMCSiteLocalAddress() throws Exception {
assertTrue(InetAddress.getByName("ff15::").isMCSiteLocal());
}

public void test_isReachable() throws Exception {
// http://code.google.com/p/android/issues/detail?id=20203
InetAddress addr = SerializationTester.getDeserializedObject(InetAddress.getByName("www.google.com"));
addr.isReachable(500);
for (NetworkInterface nif : Collections.list(NetworkInterface.getNetworkInterfaces())) {
addr.isReachable(nif, 20, 500);
}
}

public void test_isSiteLocalAddress() throws Exception {
assertFalse(InetAddress.getByName("144.32.32.1").isSiteLocalAddress());
assertTrue(InetAddress.getByName("10.0.0.1").isSiteLocalAddress());
Expand Down
12 changes: 3 additions & 9 deletions luni/src/test/java/libcore/java/text/AttributedCharacterIteratorAttributeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.text.DateFormat;
import java.text.NumberFormat;
import junit.framework.TestCase;
import tests.util.SerializationTester;

/**
* AttributedCharacterIterator.Attribute is used like the base enum type and
Expand All @@ -44,21 +45,14 @@ public void testSerialization() throws IOException, ClassNotFoundException {
public void testSerializingSubclass() throws IOException, ClassNotFoundException {
AttributedCharacterIterator.Attribute a = new CustomAttribute();
try {
reserialize(a);
SerializationTester.getDeserializedObject(a);
fail();
} catch (InvalidObjectException expected) {
}
}

private void assertSameReserialized(Object o) throws ClassNotFoundException, IOException {
assertSame(o, reserialize(o));
}

private Object reserialize(Object o) throws IOException, ClassNotFoundException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
new ObjectOutputStream(out).writeObject(o);
InputStream in = new ByteArrayInputStream(out.toByteArray());
return new ObjectInputStream(in).readObject();
assertSame(o, SerializationTester.getDeserializedObject(o));
}

private static class CustomAttribute extends AttributedCharacterIterator.Attribute {
Expand Down
14 changes: 7 additions & 7 deletions luni/src/test/java/libcore/java/util/OldCollectionsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -606,41 +606,41 @@ public void test_EmptySet_readResolve() throws Exception {
public void test_checkedCollectionSerializationCompatability() throws Exception {
Collection<String> c = Collections.emptySet();
c = Collections.checkedCollection(c, String.class);
SerializationTester.assertCompabilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedCollection.golden.ser");
SerializationTester.assertCompatibilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedCollection.golden.ser");
}
public void test_checkedListRandomAccessSerializationCompatability() throws Exception {
List<String> c = new ArrayList<String>();
assertTrue(c instanceof RandomAccess);
c = Collections.checkedList(c, String.class);
SerializationTester.assertCompabilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedListRandomAccess.golden.ser");
SerializationTester.assertCompatibilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedListRandomAccess.golden.ser");
}
public void test_checkedListSerializationCompatability() throws Exception {
List<String> c = new LinkedList<String>();
assertFalse(c instanceof RandomAccess);
c = Collections.checkedList(c, String.class);
SerializationTester.assertCompabilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedList.golden.ser");
SerializationTester.assertCompatibilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedList.golden.ser");
}
public void test_checkedSetSerializationCompatability() throws Exception {
Set<String> c = new HashSet<String>();
assertFalse(c instanceof SortedSet);
c = Collections.checkedSet(c, String.class);
SerializationTester.assertCompabilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSet.golden.ser");
SerializationTester.assertCompatibilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSet.golden.ser");
}
public void test_checkedMapSerializationCompatability() throws Exception {
Map<String, String> c = new HashMap<String, String>();
assertFalse(c instanceof SortedMap);
c = Collections.checkedMap(c, String.class, String.class);
SerializationTester.assertCompabilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedMap.golden.ser");
SerializationTester.assertCompatibilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedMap.golden.ser");
}
public void test_checkedSortedSetSerializationCompatability() throws Exception {
SortedSet<String> c = new TreeSet<String>();
c = Collections.checkedSortedSet(c, String.class);
SerializationTester.assertCompabilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSortedSet.golden.ser");
SerializationTester.assertCompatibilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSortedSet.golden.ser");
}
public void test_checkedSortedMapSerializationCompatability() throws Exception {
SortedMap<String, String> c = new TreeMap<String, String>();
c = Collections.checkedSortedMap(c, String.class, String.class);
SerializationTester.assertCompabilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSortedMap.golden.ser");
SerializationTester.assertCompatibilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSortedMap.golden.ser");
}

public void test_checkedCollectionLjava_util_CollectionLjava_lang_Class() {
Expand Down
13 changes: 5 additions & 8 deletions luni/src/test/java/libcore/java/util/OldPriorityQueueTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,8 @@ public void test_remove_Ljava_lang_Object_not_exists() {
public void test_Serialization() throws Exception {
Integer[] array = { 2, 45, 7, -12, 9, 23, 17, 1118, 10, 16, 39 };
List<Integer> list = Arrays.asList(array);
PriorityQueue<Integer> srcIntegerQueue = new PriorityQueue<Integer>(
list);
PriorityQueue<Integer> destIntegerQueue = (PriorityQueue<Integer>) SerializationTester
.getDeserilizedObject(srcIntegerQueue);
PriorityQueue<Integer> srcIntegerQueue = new PriorityQueue<Integer>(list);
PriorityQueue<Integer> destIntegerQueue = SerializationTester.getDeserializedObject(srcIntegerQueue);
Arrays.sort(array);
for (int i = 0; i < array.length; i++) {
assertEquals(array[i], destIntegerQueue.poll());
Expand All @@ -81,10 +79,9 @@ public void test_Serialization() throws Exception {
public void test_Serialization_casting() throws Exception {
Integer[] array = { 2, 45, 7, -12, 9, 23, 17, 1118, 10, 16, 39 };
List<Integer> list = Arrays.asList(array);
PriorityQueue<Integer> srcIntegerQueue = new PriorityQueue<Integer>(
list);
PriorityQueue<String> destStringQueue = (PriorityQueue<String>) SerializationTester
.getDeserilizedObject(srcIntegerQueue);
PriorityQueue<Integer> srcIntegerQueue = new PriorityQueue<Integer>(list);
Object dodgy = SerializationTester.getDeserializedObject((Object) srcIntegerQueue);
PriorityQueue<String> destStringQueue = (PriorityQueue<String>) dodgy;
// will not incur class cast exception.
Object o = destStringQueue.peek();
Arrays.sort(array);
Expand Down
12 changes: 6 additions & 6 deletions support/src/test/java/tests/util/SerializationTester.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private SerializationTester() {
* the input object
* @return the deserialized object
*/
public static Object getDeserilizedObject(Object inputObject)
public static <T> T getDeserializedObject(T inputObject)
throws IOException, ClassNotFoundException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(bos);
Expand All @@ -78,7 +78,7 @@ public static Object getDeserilizedObject(Object inputObject)
Object outputObject = ois.readObject();
lastOutput = outputObject;
ois.close();
return outputObject;
return (T) outputObject;
}

/**
Expand All @@ -92,7 +92,7 @@ public static Object getDeserilizedObject(Object inputObject)
* If any occurs.
*/
public static boolean assertSame(Object inputObject) throws Exception {
return inputObject == getDeserilizedObject(inputObject);
return inputObject == getDeserializedObject(inputObject);
}

/**
Expand All @@ -106,7 +106,7 @@ public static boolean assertSame(Object inputObject) throws Exception {
* If any occurs.
*/
public static boolean assertEquals(Object inputObject) throws Exception {
return inputObject.equals(getDeserilizedObject(inputObject));
return inputObject.equals(getDeserializedObject(inputObject));
}

/**
Expand All @@ -120,7 +120,7 @@ public static boolean assertEquals(Object inputObject) throws Exception {
* @throws Exception
* If any occurs.
*/
public static boolean assertCompabilitySame(Object obj, String fileName)
public static boolean assertCompatibilitySame(Object obj, String fileName)
throws Exception {
return obj == readObject(obj, fileName);
}
Expand All @@ -137,7 +137,7 @@ public static boolean assertCompabilitySame(Object obj, String fileName)
* @throws Exception
* If any occurs.
*/
public static boolean assertCompabilityEquals(Object obj, String fileName)
public static boolean assertCompatibilityEquals(Object obj, String fileName)
throws Exception {
return obj.equals(readObject(obj, fileName));
}
Expand Down

0 comments on commit 8f0e611

Please sign in to comment.