| commit | 087577476b9f3da9317479503ef4785fcc3ce529 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Tue May 02 23:29:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 02 23:29:49 2023 +0000 |
| tree | d56ee6d65eae79e2aa3a6076fb49f71244328a04 | |
| parent | 41ab1ebbc9e7b2a31981e2625ba3953066b1096c [diff] | |
| parent | 69b6ca4ff169a2f4d9d48bffb560a188f7ce2cfd [diff] |
Merge "Add null check for tupleOrig in ConntrackMessage" am: 69b6ca4ff1 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2574182 Change-Id: Ib6e15089788682fbac4be874d062823152d6bad7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Tethering/tests/privileged/src/com/android/networkstack/tethering/ConntrackSocketTest.java b/Tethering/tests/privileged/src/com/android/networkstack/tethering/ConntrackSocketTest.java index b3fb3e4..81d4fbe 100644 --- a/Tethering/tests/privileged/src/com/android/networkstack/tethering/ConntrackSocketTest.java +++ b/Tethering/tests/privileged/src/com/android/networkstack/tethering/ConntrackSocketTest.java
@@ -106,6 +106,7 @@ ConntrackMessage.Tuple tuple = ctmsg.tupleOrig; if (nlmsghdr.nlmsg_type == (NFNL_SUBSYS_CTNETLINK << 8 | IPCTNL_MSG_CT_NEW) + && tuple != null && tuple.protoNum == IPPROTO_TCP && tuple.srcIp.equals(local.getAddress()) && tuple.dstIp.equals(remote.getAddress())