| commit | 1b24c548609222e2ceb440063008efdd17ff5625 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jun 03 16:28:05 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 03 16:28:05 2022 +0000 |
| tree | 5eb6600ed4dd43d44de8a78beef17bfc39b5bab6 | |
| parent | 59093c0a5595e8849f0d38b85b4e9632e7085bd4 [diff] | |
| parent | f6c13d21d44b1c840467ce766d708ce6e54eeed1 [diff] |
Merge "ClatCoordinator: close tun fd if detect mtu failed" am: 0750626dd0 am: c457e23c54 am: cf505ed93f am: f6c13d21d4 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2109964 Change-Id: Ia6245a2001d686c09ec6eaac9375ef3ebcc7e1df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service/src/com/android/server/connectivity/ClatCoordinator.java b/service/src/com/android/server/connectivity/ClatCoordinator.java index 4a7c77a..8cefd47 100644 --- a/service/src/com/android/server/connectivity/ClatCoordinator.java +++ b/service/src/com/android/server/connectivity/ClatCoordinator.java
@@ -570,8 +570,14 @@ // Detect ipv4 mtu. final Integer fwmark = getFwmark(netId); - final int detectedMtu = mDeps.detectMtu(pfx96Str, + final int detectedMtu; + try { + detectedMtu = mDeps.detectMtu(pfx96Str, ByteBuffer.wrap(GOOGLE_DNS_4.getAddress()).getInt(), fwmark); + } catch (IOException e) { + tunFd.close(); + throw new IOException("Detect MTU on " + tunIface + " failed: " + e); + } final int mtu = adjustMtu(detectedMtu); Log.i(TAG, "ipv4 mtu is " + mtu);