| commit | acbc9193a07ebdf111493bbc9f562cfca5040a1b | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Mon Apr 17 19:55:11 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 17 19:55:11 2023 +0000 |
| tree | aa3344ac40034f0a8d597b64265421bb7a72adc7 | |
| parent | 89227a1ce10435385c906d0854122814edd795a6 [diff] | |
| parent | 5d8992e2b1f722fbf0ce72b663ef2cb3facc3b8a [diff] |
Merge "clat: make sure the tun device doesn't yet exist" am: 5d8992e2b1 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2535059 Change-Id: I8df66eb17b97acbccf4125cc7b395c10b7590fbc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp index 19f2fb8..e63e423 100644 --- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp +++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
@@ -233,7 +233,7 @@ } struct ifreq ifr = { - .ifr_flags = IFF_TUN, + .ifr_flags = static_cast<short>(IFF_TUN | IFF_TUN_EXCL), }; strlcpy(ifr.ifr_name, v4interface.c_str(), sizeof(ifr.ifr_name));