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 "TestNetworkService: do not set IFF_MULTICAST when bringUp is false"

Browse source
This commit is contained in:
Patrick Rohr 2022-08-19 21:12:24 +00:00 • committed by Gerrit Code Review
commit d8ade99dd6
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
service/jni/com_android_server_TestNetworkService.cpp
View file

@ -59,7 +59,8 @@ static void setTunTapCarrierEnabledImpl(JNIEnv* env, const char* iface, int tunF
}
}
static int createTunTapImpl(JNIEnv* env, bool isTun, bool hasCarrier, const char* iface) {
static int createTunTapImpl(JNIEnv* env, bool isTun, bool hasCarrier, bool setIffMulticast,
const char* iface) {
base::unique_fd tun(open("/dev/tun", O_RDWR | O_NONBLOCK));
ifreq ifr{};
@ -76,8 +77,8 @@ static int createTunTapImpl(JNIEnv* env, bool isTun, bool hasCarrier, const char
setTunTapCarrierEnabledImpl(env, iface, tun.get(), hasCarrier);
}
// Mark TAP interfaces as supporting multicast
if (!isTun) {
// Mark some TAP interfaces as supporting multicast
if (setIffMulticast && !isTun) {
base::unique_fd inet6CtrlSock(socket(AF_INET6, SOCK_DGRAM, 0));
ifr.ifr_flags = IFF_MULTICAST;
@ -122,14 +123,14 @@ static void setTunTapCarrierEnabled(JNIEnv* env, jclass /* clazz */, jstring
}
static jint createTunTap(JNIEnv* env, jclass /* clazz */, jboolean isTun,
jboolean hasCarrier, jstring jIface) {
jboolean hasCarrier, jboolean setIffMulticast, jstring jIface) {
ScopedUtfChars iface(env, jIface);
if (!iface.c_str()) {
jniThrowNullPointerException(env, "iface");
return -1;
}
return createTunTapImpl(env, isTun, hasCarrier, iface.c_str());
return createTunTapImpl(env, isTun, hasCarrier, setIffMulticast, iface.c_str());
}
static void bringUpInterface(JNIEnv* env, jclass /* clazz */, jstring jIface) {
@ -145,7 +146,7 @@ static void bringUpInterface(JNIEnv* env, jclass /* clazz */, jstring jIface) {
static const JNINativeMethod gMethods[] = {
{"nativeSetTunTapCarrierEnabled", "(Ljava/lang/String;IZ)V", (void*)setTunTapCarrierEnabled},
{"nativeCreateTunTap", "(ZZLjava/lang/String;)I", (void*)createTunTap},
{"nativeCreateTunTap", "(ZZZLjava/lang/String;)I", (void*)createTunTap},
{"nativeBringUpInterface", "(Ljava/lang/String;)V", (void*)bringUpInterface},
};

10
service/src/com/android/server/TestNetworkService.java
View file

@ -77,7 +77,7 @@ class TestNetworkService extends ITestNetworkManager.Stub {
// Native method stubs
private static native int nativeCreateTunTap(boolean isTun, boolean hasCarrier,
@NonNull String iface);
boolean setIffMulticast, @NonNull String iface);
private static native void nativeSetTunTapCarrierEnabled(@NonNull String iface, int tunFd,
boolean enabled);
@ -136,8 +136,14 @@ class TestNetworkService extends ITestNetworkManager.Stub {
final long token = Binder.clearCallingIdentity();
try {
// Note: if the interface is brought up by ethernet, setting IFF_MULTICAST
// races NetUtils#setInterfaceUp(). This flag is not necessary for ethernet
// tests, so let's not set it when bringUp is false. See also b/242343156.
// In the future, we could use RTM_SETLINK with ifi_change set to set the
// flags atomically.
final boolean setIffMulticast = bringUp;
ParcelFileDescriptor tunIntf = ParcelFileDescriptor.adoptFd(
nativeCreateTunTap(isTun, hasCarrier, interfaceName));
nativeCreateTunTap(isTun, hasCarrier, setIffMulticast, interfaceName));
// Disable DAD and remove router_solicitation_delay before assigning link addresses.
if (disableIpv6ProvisioningDelay) {