| commit | c457e23c54de511d2ab829ea54a16e145f2f49a0 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jun 03 15:35:22 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 03 15:35:22 2022 +0000 |
| tree | 2c5c2841053d93ff6ad007e4e1cc2d724e59f118 | |
| parent | 293129ca50f9e182fb2ef84677fc0a3ee079296b [diff] | |
| parent | 0750626dd02b7d19d093ee071c9e9f50012c9e4d [diff] |
Merge "ClatCoordinator: close tun fd if detect mtu failed" am: 0750626dd0 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2109964 Change-Id: I5978450e855123a90fd793881a9f501960a9dd16 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);