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

Merge "Fix ConntrackSocketTest#testIpv4ConntrackSocket flaky"

Browse Source
This commit is contained in:
KH Shi
2022-12-06 05:46:54 +00:00
committed by Gerrit Code Review
parent ed3e683407 09eb7631fa
commit cc8db2ac6e
2 changed files with 67 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Tethering/src/com/android/networkstack/tethering/OffloadHardwareInterface.java
View File

@@ -295,8 +295,7 @@ public class OffloadHardwareInterface {
NF_NETLINK_CONNTRACK_NEW | NF_NETLINK_CONNTRACK_DESTROY);
if (h1 == null) return false;
sendIpv4NfGenMsg(h1, (short) ((NFNL_SUBSYS_CTNETLINK << 8) | IPCTNL_MSG_CT_GET),
(short) (NLM_F_REQUEST | NLM_F_DUMP));
requestSocketDump(h1);
final NativeHandle h2 = mDeps.createConntrackSocket(
NF_NETLINK_CONNTRACK_UPDATE | NF_NETLINK_CONNTRACK_DESTROY);
@@ -325,7 +324,7 @@ public class OffloadHardwareInterface {
}
@VisibleForTesting
public void sendIpv4NfGenMsg(@NonNull NativeHandle handle, short type, short flags) {
void sendIpv4NfGenMsg(@NonNull NativeHandle handle, short type, short flags) {
final int length = StructNlMsgHdr.STRUCT_SIZE + StructNfGenMsg.STRUCT_SIZE;
final byte[] msg = new byte[length];
final ByteBuffer byteBuffer = ByteBuffer.wrap(msg);
@@ -350,6 +349,12 @@ public class OffloadHardwareInterface {
}
}
@VisibleForTesting
void requestSocketDump(NativeHandle handle) {
sendIpv4NfGenMsg(handle, (short) ((NFNL_SUBSYS_CTNETLINK << 8) | IPCTNL_MSG_CT_GET),
(short) (NLM_F_REQUEST | NLM_F_DUMP));
}
private void closeFdInNativeHandle(final NativeHandle h) {
try {
h.close();