LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "ClatCoordinator: close tun fd if detect mtu failed" am: 0750626dd0

Browse Source 
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>
This commit is contained in:
Treehugger Robot
2022-06-03 15:35:22 +00:00
committed by Automerger Merge Worker
parent 293129ca50 0750626dd0
commit c457e23c54
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
service/src/com/android/server/connectivity/ClatCoordinator.java
View File

@@ -570,8 +570,14 @@ public class ClatCoordinator {
// Detect ipv4 mtu. // Detect ipv4 mtu.
final Integer fwmark = getFwmark(netId); 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); 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); final int mtu = adjustMtu(detectedMtu);
Log.i(TAG, "ipv4 mtu is " + mtu); Log.i(TAG, "ipv4 mtu is " + mtu);