joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge changes Ie826477d,I5125a3ac am: f8ed984e9c am: c08c9c8d96

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961299

Change-Id: I6bddf77824763929d694e153e8fa4cccde5d34ea
This commit is contained in:
Nucca Chen 2022-01-26 15:22:50 +00:00 • committed by Automerger Merge Worker
commit dc86ef31c6
3 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

40
service/jni/com_android_server_connectivity_ClatCoordinator.cpp
View file

@ -426,6 +426,43 @@ static jint com_android_server_connectivity_ClatCoordinator_startClatd(
return pid;
}
// Stop clatd process. SIGTERM with timeout first, if fail, SIGKILL.
// See stopProcess() in system/netd/server/NetdConstants.cpp.
// TODO: have a function stopProcess(int pid, const char *name) in common location and call it.
static constexpr int WAITPID_ATTEMPTS = 50;
static constexpr int WAITPID_RETRY_INTERVAL_US = 100000;
static void stopClatdProcess(int pid) {
int err = kill(pid, SIGTERM);
if (err) {
err = errno;
}
if (err == ESRCH) {
ALOGE("clatd child process %d unexpectedly disappeared", pid);
return;
}
if (err) {
ALOGE("Error killing clatd child process %d: %s", pid, strerror(err));
}
int status = 0;
int ret = 0;
for (int count = 0; ret == 0 && count < WAITPID_ATTEMPTS; count++) {
usleep(WAITPID_RETRY_INTERVAL_US);
ret = waitpid(pid, &status, WNOHANG);
}
if (ret == 0) {
ALOGE("Failed to SIGTERM clatd pid=%d, try SIGKILL", pid);
// TODO: fix that kill failed or waitpid doesn't return.
kill(pid, SIGKILL);
ret = waitpid(pid, &status, 0);
}
if (ret == -1) {
ALOGE("Error waiting for clatd child process %d: %s", pid, strerror(errno));
} else {
ALOGD("clatd process %d terminated status=%d", pid, status);
}
}
static void com_android_server_connectivity_ClatCoordinator_stopClatd(JNIEnv* env, jobject clazz,
jstring iface, jstring pfx96,
jstring v4, jstring v6,
@ -448,8 +485,7 @@ static void com_android_server_connectivity_ClatCoordinator_stopClatd(JNIEnv* en
}
}
kill(pid, SIGTERM);
waitpid(pid, nullptr, 0); // Should we block in JNI?
stopClatdProcess(pid);
}
/*

2
service/src/com/android/server/connectivity/ClatCoordinator.java
View file

@ -220,7 +220,7 @@ public class ClatCoordinator {
@NonNull final IpPrefix nat64Prefix)
throws IOException {
if (mIface != null || mPid != INVALID_PID) {
throw new IOException("Clatd has started on " + mIface + " (pid " + mPid + ")");
throw new IOException("Clatd is already running on " + mIface + " (pid " + mPid + ")");
}
if (nat64Prefix.getPrefixLength() != 96) {
throw new IOException("Prefix must be 96 bits long: " + nat64Prefix);

2
tests/unit/java/com/android/server/connectivity/ClatCoordinatorTest.java
View file

@ -340,7 +340,7 @@ public class ClatCoordinatorTest {
inOrder.verifyNoMoreInteractions();
// [2] Start clatd again failed.
assertThrows("java.io.IOException: Clatd has started on test0 (pid 10483)",
assertThrows("java.io.IOException: Clatd is already running on test0 (pid 10483)",
IOException.class,
() -> coordinator.clatStart(BASE_IFACE, NETID, NAT64_IP_PREFIX));