Fix bugs and crashes in PacketKeepalive API. (9acca095) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/KeepalivePacketData.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ public class KeepalivePacketData {
		// Check we have two IP addresses of the same family.
		if (srcAddress == null \|\| dstAddress == null \|\|
		!srcAddress.getClass().getName().equals(dstAddress.getClass().getName())) {
		throw new InvalidPacketException(ERROR_INVALID_IP_ADDRESS);
		}

		// Set the protocol.
		@@ -102,7 +103,7 @@ public class KeepalivePacketData {
		InetAddress srcAddress, int srcPort,
		InetAddress dstAddress, int dstPort) throws InvalidPacketException {

		if (!(srcAddress instanceof Inet4Address)) {
		if (!(srcAddress instanceof Inet4Address) \|\| !(dstAddress instanceof Inet4Address)) {
		throw new InvalidPacketException(ERROR_INVALID_IP_ADDRESS);
		}

services/core/java/com/android/server/connectivity/KeepaliveTracker.java

+13 −8

Original line number	Diff line number	Diff line
		@@ -208,6 +208,8 @@ public class KeepaliveTracker {
		Log.d(TAG, "Stopping keepalive " + mSlot + " on " + mNai.name());
		mNai.asyncChannel.sendMessage(CMD_STOP_PACKET_KEEPALIVE, mSlot);
		}
		// TODO: at the moment we unconditionally return failure here. In cases where the
		// NetworkAgent is alive, should we ask it to reply, so it can return failure?
		notifyMessenger(mSlot, reason);
		unlinkDeathRecipient();
		}
		@@ -233,17 +235,14 @@ public class KeepaliveTracker {
		mKeepalives.put(nai, networkKeepalives);
		}

		// Find the lowest-numbered free slot.
		// Find the lowest-numbered free slot. Slot numbers start from 1, because that's what two
		// separate chipset implementations independently came up with.
		int slot;
		for (slot = 0; slot < networkKeepalives.size(); slot++) {
		for (slot = 1; slot <= networkKeepalives.size(); slot++) {
		if (networkKeepalives.get(slot) == null) {
		return slot;
		}
		}
		// No free slot, pick one at the end.

		// HACK for broadcom hardware that does not support slot 0!
		if (slot == 0) slot = 1;
		return slot;
		}

		@@ -267,14 +266,15 @@ public class KeepaliveTracker {
		}

		public void handleStopKeepalive(NetworkAgentInfo nai, int slot, int reason) {
		String networkName = (nai == null) ? "(null)" : nai.name();
		HashMap <Integer, KeepaliveInfo> networkKeepalives = mKeepalives.get(nai);
		if (networkKeepalives == null) {
		Log.e(TAG, "Attempt to stop keepalive on nonexistent network " + nai.name());
		Log.e(TAG, "Attempt to stop keepalive on nonexistent network " + networkName);
		return;
		}
		KeepaliveInfo ki = networkKeepalives.get(slot);
		if (ki == null) {
		Log.e(TAG, "Attempt to stop nonexistent keepalive " + slot + " on " + nai.name());
		Log.e(TAG, "Attempt to stop nonexistent keepalive " + slot + " on " + networkName);
		return;
		}
		ki.stop(reason);
		@@ -332,6 +332,11 @@ public class KeepaliveTracker {

		public void startNattKeepalive(NetworkAgentInfo nai, int intervalSeconds, Messenger messenger,
		IBinder binder, String srcAddrString, int srcPort, String dstAddrString, int dstPort) {
		if (nai == null) {
		notifyMessenger(messenger, NO_KEEPALIVE, ERROR_INVALID_NETWORK);
		return;
		}

		InetAddress srcAddress, dstAddress;
		try {
		srcAddress = NetworkUtils.numericToInetAddress(srcAddrString);