| commit | 7b38eabba17d21c9ecadb4285e284ec1aa407197 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Thu Sep 14 03:15:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 14 03:15:07 2023 +0000 |
| tree | 460056bc29006e633b7ace3116227a8f8915ecfd | |
| parent | acb4a0e1d1e40fbe8f27423c5729b9a93ae8aac0 [diff] | |
| parent | b9cf34715cb9370d52ca33db8e4d13aa4e3e3e66 [diff] |
netd.c - nettrace - add 'wakeup' boolean am: b9cf34715c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2751707 Change-Id: Ib2354cf50a18d1536cfb7461a96ffb6851a05d35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bpf_progs/netd.c b/bpf_progs/netd.c index 368cfca..c3258e9 100644 --- a/bpf_progs/netd.c +++ b/bpf_progs/netd.c
@@ -319,6 +319,7 @@ pkt->dport = dport; pkt->egress = egress; + pkt->wakeup = !egress && (skb->mark & 0x80000000); // Fwmark.ingress_cpu_wakeup pkt->ipProto = proto; pkt->tcpFlags = flags; pkt->ipVersion = ipVersion;
diff --git a/bpf_progs/netd.h b/bpf_progs/netd.h index 836e998..6e9acaa 100644 --- a/bpf_progs/netd.h +++ b/bpf_progs/netd.h
@@ -81,7 +81,8 @@ __be16 sport; __be16 dport; - bool egress; + bool egress:1, + wakeup:1; uint8_t ipProto; uint8_t tcpFlags; uint8_t ipVersion; // 4=IPv4, 6=IPv6, 0=unknown