commit b27132f716e162be112df339af3dd44f75295d8f
author Maciej Żenczykowski <maze@google.com> Wed Apr 19 16:45:07 2023 -0700
committer Maciej Żenczykowski <maze@google.com> Thu Apr 20 04:04:51 2023 +0000
tree d74d4890dc4e610eab68007d2823e0be2a46d12b
parent b6232eb6f06e1a2ad9f9b0d549791905971fed0c

sed -i -r 's@/[*]ignore_on_user[*]/true@IGNORE_ON_USER@g' netd.c

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I756e4451d252ab43b4fbe57f185c950cd519b359

bpf_progs/netd.c

diff --git a/bpf_progs/netd.c b/bpf_progs/netd.c
index 80a53ae..39dff7f 100644
--- a/bpf_progs/netd.c
+++ b/bpf_progs/netd.c
@@ -100,14 +100,14 @@
 DEFINE_BPF_MAP_EXT(packet_trace_enabled_map, ARRAY, uint32_t, bool, 1,
                    AID_ROOT, AID_SYSTEM, 0060, "fs_bpf_net_shared", "", false,
                    BPFLOADER_IGNORED_ON_VERSION, BPFLOADER_MAX_VER, LOAD_ON_ENG,
-                   /*ignore_on_user*/true, LOAD_ON_USERDEBUG)
+                   IGNORE_ON_USER, LOAD_ON_USERDEBUG)
 
 // A ring buffer on which packet information is pushed. This map will only be loaded
 // on eng and userdebug devices. User devices won't load this to save memory.
 DEFINE_BPF_RINGBUF_EXT(packet_trace_ringbuf, PacketTrace, PACKET_TRACE_BUF_SIZE,
                        AID_ROOT, AID_SYSTEM, 0060, "fs_bpf_net_shared", "", false,
                        BPFLOADER_IGNORED_ON_VERSION, BPFLOADER_MAX_VER, LOAD_ON_ENG,
-                       /*ignore_on_user*/true, LOAD_ON_USERDEBUG);
+                       IGNORE_ON_USER, LOAD_ON_USERDEBUG);
 
 // iptables xt_bpf programs need to be usable by both netd and netutils_wrappers
 // selinux contexts, because even non-xt_bpf iptables mutations are implemented as