| commit | 69b6ca4ff169a2f4d9d48bffb560a188f7ce2cfd | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Tue May 02 22:29:45 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue May 02 22:29:45 2023 +0000 |
| tree | 1aba62b357e9efca910adc02219de564c24c2db2 | |
| parent | 277b236de32a1a0714e219686631a06fe11ad9df [diff] | |
| parent | 9dfbb45bb6b09634b9a66ff1fca3c7a47ca63405 [diff] |
Merge "Add null check for tupleOrig in ConntrackMessage"
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())