Merge "Quit statemachine when dhcp server is stopped" am: e045c0d087 am:... (30e090ce) · Commits · e / os / android_packages_modules_NetworkStack

src/android/net/dhcp/DhcpServer.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ public class DhcpServer extends StateMachine {
		private static final int CMD_UPDATE_PARAMS = 3;
		@VisibleForTesting
		protected static final int CMD_RECEIVE_PACKET = 4;
		private static final int CMD_TERMINATE_AFTER_STOP = 5;

		@NonNull
		private final Context mContext;
		@@ -362,10 +363,12 @@ public class DhcpServer extends StateMachine {
		* Stop listening for packets.
		*
		* <p>As the server is stopped asynchronously, some packets may still be processed shortly after
		* calling this method.
		* calling this method. The server will also be cleaned up and can't be started again, even if
		* it was already stopped.
		*/
		void stop(@Nullable INetworkStackStatusCallback cb) {
		sendMessage(CMD_STOP_DHCP_SERVER, cb);
		sendMessage(CMD_TERMINATE_AFTER_STOP);
		}

		private void maybeNotifyStatus(@Nullable INetworkStackStatusCallback cb, int statusCode) {
		@@ -407,6 +410,9 @@ public class DhcpServer extends StateMachine {
		mEventCallbacks = obj.second;
		transitionTo(mRunningState);
		return HANDLED;
		case CMD_TERMINATE_AFTER_STOP:
		quit();
		return HANDLED;
		default:
		return NOT_HANDLED;
		}

tests/unit/src/android/net/dhcp/DhcpServerTest.java

+23 −3

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ import android.net.dhcp.DhcpLeaseRepository.OutOfAddressesException;
		import android.net.dhcp.DhcpServer.Clock;
		import android.net.dhcp.DhcpServer.Dependencies;
		import android.net.util.SharedLog;
		import android.os.ConditionVariable;
		import android.testing.AndroidTestingRunner;

		import androidx.test.filters.SmallTest;
		@@ -130,11 +131,30 @@ public class DhcpServerTest {
		private ArgumentCaptor<Inet4Address> mResponseDstAddrCaptor;

		@NonNull
		private DhcpServer mServer;
		private MyDhcpServer mServer;

		@Nullable
		private String mPrevShareClassloaderProp;

		private class MyDhcpServer extends DhcpServer {
		private final ConditionVariable mCv = new ConditionVariable(false);

		MyDhcpServer(Context context, String ifName, DhcpServingParams params, SharedLog log,
		Dependencies deps) {
		super(context, ifName, params, log, deps);
		}

		@Override
		protected void onQuitting() {
		super.onQuitting();
		mCv.open();
		}

		public void waitForShutdown() {
		assertTrue(mCv.block(TEST_TIMEOUT_MS));
		}
		}

		private final INetworkStackStatusCallback mAssertSuccessCallback =
		new INetworkStackStatusCallback.Stub() {
		@Override
		@@ -183,7 +203,7 @@ public class DhcpServerTest {
		when(mClock.elapsedRealtime()).thenReturn(TEST_CLOCK_TIME);
		when(mPacketListener.start()).thenReturn(true);

		mServer = new DhcpServer(mContext, TEST_IFACE, makeServingParams(),
		mServer = new MyDhcpServer(mContext, TEST_IFACE, makeServingParams(),
		new SharedLog(DhcpServerTest.class.getSimpleName()), mDeps);
		}

		@@ -191,7 +211,7 @@ public class DhcpServerTest {
		public void tearDown() throws Exception {
		verify(mRepository, never()).addLeaseCallbacks(eq(null));
		mServer.stop(mAssertSuccessCallback);
		HandlerUtilsKt.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);
		mServer.waitForShutdown();
		verify(mPacketListener, times(1)).stop();
		}