commit 12c0ea929c3343319da2fd95c8aa21c241fdd677
author Maciej Żenczykowski <maze@google.com> Sun Aug 20 17:06:45 2023 +0000
committer Maciej Żenczykowski <maze@google.com> Mon Aug 21 19:53:04 2023 +0000
tree cf7f5c76a067ee19fdee251ed7690c09197c4513
parent eb1eb69f862583d71382758d1736f0a18a0f956d

BpfMap.h - hide getMap()

This leaks (what should be) an internal only fd.

There's still multiple uses of getMap() left in:
  common/native/bpf_headers/BpfMapTest.cpp

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

staticlibs/native/bpf_headers/include/bpf/BpfMap.h

diff --git a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
index aa7bafe..0ab2fda 100644
--- a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
+++ b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
@@ -180,9 +180,9 @@
             const function<Result<void>(const Key& key, const Value& value,
                                         BpfMap<Key, Value>& map)>& filter);
 
+#ifdef BPF_MAP_MAKE_VISIBLE_FOR_TESTING
     const unique_fd& getMap() const { return mMapFd; };
 
-#ifdef BPF_MAP_MAKE_VISIBLE_FOR_TESTING
     // Copy assignment operator - due to need for fd duping, should not be used in non-test code.
     BpfMap<Key, Value>& operator=(const BpfMap<Key, Value>& other) {
         if (this != &other) mMapFd.reset(fcntl(other.mMapFd.get(), F_DUPFD_CLOEXEC, 0));