LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" am: 91cc5cc467

Browse Source 
am: a1ed113552

Change-Id: I410acc19ceb13e32c65cbdf3095da9db0802470c
This commit is contained in:
Junyu Lai
2019-04-23 01:18:54 -07:00
committed by android-build-merger
parent f9360a6b69 a1ed113552
commit 7e2ba67527
3 changed files with 115 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -4228,6 +4228,25 @@ public class ConnectivityServiceTest {
callback.expectStarted();
ka.stop();
callback.expectStopped();
// Check that the same NATT socket cannot be used by 2 keepalives.
try (SocketKeepalive ka2 = mCm.createSocketKeepalive(
myNet, testSocket, myIPv4, dstIPv4, executor, callback)) {
// Check that second keepalive cannot be started if the first one is running.
ka.start(validKaInterval);
callback.expectStarted();
ka2.start(validKaInterval);
callback.expectError(SocketKeepalive.ERROR_INVALID_SOCKET);
ka.stop();
callback.expectStopped();
// Check that second keepalive can be started/stopped normally if the first one is
// stopped.
ka2.start(validKaInterval);
callback.expectStarted();
ka2.stop();
callback.expectStopped();
}
}
// Check that deleting the IP address stops the keepalive.
@@ -4291,6 +4310,10 @@ public class ConnectivityServiceTest {
testSocket.close();
testSocket2.close();
}
// Check that the closed socket cannot be used to start keepalive.
ka.start(validKaInterval);
callback.expectError(SocketKeepalive.ERROR_INVALID_SOCKET);
}
// Check that there is no port leaked after all keepalives and sockets are closed.