Merge "DnsPinger -- log setup problems" (f70430d6) · Commits · e / os / android_frameworks_base

core/java/android/net/DnsPinger.java

+11 −8

Original line number	Diff line number	Diff line
		@@ -147,8 +147,9 @@ public final class DnsPinger extends Handler {
		DatagramPacket packet = new DatagramPacket(buf,
		buf.length, dnsAddress, DNS_PORT);
		if (V) {
		Slog.v(TAG, "Sending a ping to " + dnsAddress.getHostAddress()
		+ " with ID " + newActivePing.packetId + ".");
		Slog.v(TAG, "Sending a ping " + newActivePing.internalId +
		" to " + dnsAddress.getHostAddress()
		+ " with packetId " + newActivePing.packetId + ".");
		}

		newActivePing.socket.send(packet);
		@@ -157,7 +158,7 @@ public final class DnsPinger extends Handler {
		sendMessageDelayed(obtainMessage(ACTION_LISTEN_FOR_RESPONSE, mEventCounter, 0),
		RECEIVE_POLL_INTERVAL_MS);
		} catch (IOException e) {
		sendResponse((short) msg.arg1, SOCKET_EXCEPTION);
		sendResponse(msg.arg1, -9999, SOCKET_EXCEPTION);
		}
		break;
		case ACTION_LISTEN_FOR_RESPONSE:
		@@ -193,12 +194,12 @@ public final class DnsPinger extends Handler {
		while (iter.hasNext()) {
		ActivePing curPing = iter.next();
		if (curPing.result != null) {
		sendResponse(curPing.internalId, curPing.result);
		sendResponse(curPing.internalId, curPing.packetId, curPing.result);
		curPing.socket.close();
		iter.remove();
		} else if (SystemClock.elapsedRealtime() >
		curPing.start + curPing.timeout) {
		sendResponse(curPing.internalId, TIMEOUT);
		sendResponse(curPing.internalId, curPing.packetId, TIMEOUT);
		curPing.socket.close();
		iter.remove();
		}
		@@ -255,9 +256,11 @@ public final class DnsPinger extends Handler {
		obtainMessage(ACTION_CANCEL_ALL_PINGS).sendToTarget();
		}

		private void sendResponse(int internalId, int responseVal) {
		private void sendResponse(int internalId, int externalId, int responseVal) {
		if(V) {
		Slog.v(TAG, "Responding with id " + internalId + " and val " + responseVal);
		Slog.d(TAG, "Responding to packet " + internalId +
		" externalId " + externalId +
		" and val " + responseVal);
		}
		mTarget.sendMessage(obtainMessage(DNS_PING_RESULT, internalId, responseVal));
		}
		@@ -288,7 +291,7 @@ public final class DnsPinger extends Handler {

		private static final byte[] mDnsQuery = new byte[] {
		0, 0, // [0-1] is for ID (will set each time)
		0, 0, // [2-3] are flags. Set byte[2] = 1 for recursion desired (RD) on. Currently off.
		1, 0, // [2-3] are flags. Set byte[2] = 1 for recursion desired (RD) on. Currently on.
		0, 1, // [4-5] bytes are for number of queries (QCOUNT)
		0, 0, // [6-7] unused count field for dns response packets
		0, 0, // [8-9] unused count field for dns response packets

wifi/java/android/net/wifi/WifiWatchdogStateMachine.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ public class WifiWatchdogStateMachine extends StateMachine {
		private static final long DEFAULT_WALLED_GARDEN_INTERVAL_MS = 30 * 60 * 1000;

		private static final int DEFAULT_MAX_SSID_BLACKLISTS = 7;
		private static final int DEFAULT_NUM_DNS_PINGS = 5;
		private static final int DEFAULT_NUM_DNS_PINGS = 15; // Multiple pings to detect setup issues
		private static final int DEFAULT_MIN_DNS_RESPONSES = 3;

		private static final int DEFAULT_DNS_PING_TIMEOUT_MS = 2000;
		@@ -94,7 +94,7 @@ public class WifiWatchdogStateMachine extends StateMachine {
		private static final String DEFAULT_WALLED_GARDEN_URL =
		"http://clients3.google.com/generate_204";
		private static final int WALLED_GARDEN_SOCKET_TIMEOUT_MS = 10000;
		private static final int DNS_INTRATEST_PING_INTERVAL = 20;
		private static final int DNS_INTRATEST_PING_INTERVAL = 200; // Long delay to detect setup issues

		private static final int BASE = Protocol.BASE_WIFI_WATCHDOG;