diff options
| author | Chenbo Feng <fengc@google.com> | 2018-11-26 15:18:46 -0800 |
|---|---|---|
| committer | Chenbo Feng <fengc@google.com> | 2018-11-28 11:31:36 -0800 |
| commit | 1f20ad3d7888ee1fc8621c7d06d3b746fe75030e (patch) | |
| tree | ba75616035c335c59d4c6606d2baeb429fab6ddd /bpfloader | |
| parent | 249e2f869e111a21749da7edcb8351b7119a6356 (diff) | |
| download | bpf-1f20ad3d7888ee1fc8621c7d06d3b746fe75030e.tar.gz | |
Code style clean upandroid-wear-8.0.0_r2
Apply the git clang format on the bpf project to make sure the existing
code compliance with the standard.
Test: project compiles and bpfMapTest pass.
Bug: 112334572
Change-Id: I4774aa2a197be2c671f6fb307c1fc9b71edfeeec
Diffstat (limited to 'bpfloader')
| -rw-r--r-- | bpfloader/BpfLoader.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp index 3d3d4dd..128531e 100644 --- a/bpfloader/BpfLoader.cpp +++ b/bpfloader/BpfLoader.cpp @@ -67,14 +67,14 @@ using android::bpf::BpfProgInfo; int main() { const std::vector<BpfMapInfo> mapPatterns = { - BpfMapInfo(COOKIE_TAG_MAP, COOKIE_TAG_MAP_PATH), - BpfMapInfo(UID_COUNTERSET_MAP, UID_COUNTERSET_MAP_PATH), - BpfMapInfo(APP_UID_STATS_MAP, APP_UID_STATS_MAP_PATH), - BpfMapInfo(UID_STATS_MAP, UID_STATS_MAP_PATH), - BpfMapInfo(TAG_STATS_MAP, TAG_STATS_MAP_PATH), - BpfMapInfo(IFACE_STATS_MAP, IFACE_STATS_MAP_PATH), - BpfMapInfo(CONFIGURATION_MAP, CONFIGURATION_MAP_PATH), - BpfMapInfo(UID_OWNER_MAP, UID_OWNER_MAP_PATH), + BpfMapInfo(COOKIE_TAG_MAP, COOKIE_TAG_MAP_PATH), + BpfMapInfo(UID_COUNTERSET_MAP, UID_COUNTERSET_MAP_PATH), + BpfMapInfo(APP_UID_STATS_MAP, APP_UID_STATS_MAP_PATH), + BpfMapInfo(UID_STATS_MAP, UID_STATS_MAP_PATH), + BpfMapInfo(TAG_STATS_MAP, TAG_STATS_MAP_PATH), + BpfMapInfo(IFACE_STATS_MAP, IFACE_STATS_MAP_PATH), + BpfMapInfo(CONFIGURATION_MAP, CONFIGURATION_MAP_PATH), + BpfMapInfo(UID_OWNER_MAP, UID_OWNER_MAP_PATH), }; for (int i = 0; i < mapPatterns.size(); i++) { if (mapPatterns[i].fd < 0) { @@ -83,18 +83,18 @@ int main() { } } BpfProgInfo programs[] = { - {BPF_CGROUP_INET_EGRESS, BPF_EGRESS_PROG_PATH, BPF_CGROUP_EGRESS_PROG_NAME, - BPF_PROG_TYPE_CGROUP_SKB, unique_fd(-1)}, - {BPF_CGROUP_INET_INGRESS, BPF_INGRESS_PROG_PATH, BPF_CGROUP_INGRESS_PROG_NAME, - BPF_PROG_TYPE_CGROUP_SKB, unique_fd(-1)}, - {MAX_BPF_ATTACH_TYPE, XT_BPF_INGRESS_PROG_PATH, XT_BPF_INGRESS_PROG_NAME, - BPF_PROG_TYPE_SOCKET_FILTER, unique_fd(-1)}, - {MAX_BPF_ATTACH_TYPE, XT_BPF_EGRESS_PROG_PATH, XT_BPF_EGRESS_PROG_NAME, - BPF_PROG_TYPE_SOCKET_FILTER, unique_fd(-1)}, - {MAX_BPF_ATTACH_TYPE, XT_BPF_WHITELIST_PROG_PATH, XT_BPF_WHITELIST_PROG_NAME, - BPF_PROG_TYPE_SOCKET_FILTER, unique_fd(-1)}, - {MAX_BPF_ATTACH_TYPE, XT_BPF_BLACKLIST_PROG_PATH, XT_BPF_BLACKLIST_PROG_NAME, - BPF_PROG_TYPE_SOCKET_FILTER, unique_fd(-1)}}; + {BPF_CGROUP_INET_EGRESS, BPF_EGRESS_PROG_PATH, BPF_CGROUP_EGRESS_PROG_NAME, + BPF_PROG_TYPE_CGROUP_SKB, unique_fd(-1)}, + {BPF_CGROUP_INET_INGRESS, BPF_INGRESS_PROG_PATH, BPF_CGROUP_INGRESS_PROG_NAME, + BPF_PROG_TYPE_CGROUP_SKB, unique_fd(-1)}, + {MAX_BPF_ATTACH_TYPE, XT_BPF_INGRESS_PROG_PATH, XT_BPF_INGRESS_PROG_NAME, + BPF_PROG_TYPE_SOCKET_FILTER, unique_fd(-1)}, + {MAX_BPF_ATTACH_TYPE, XT_BPF_EGRESS_PROG_PATH, XT_BPF_EGRESS_PROG_NAME, + BPF_PROG_TYPE_SOCKET_FILTER, unique_fd(-1)}, + {MAX_BPF_ATTACH_TYPE, XT_BPF_WHITELIST_PROG_PATH, XT_BPF_WHITELIST_PROG_NAME, + BPF_PROG_TYPE_SOCKET_FILTER, unique_fd(-1)}, + {MAX_BPF_ATTACH_TYPE, XT_BPF_BLACKLIST_PROG_PATH, XT_BPF_BLACKLIST_PROG_NAME, + BPF_PROG_TYPE_SOCKET_FILTER, unique_fd(-1)}}; int ret = android::bpf::parseProgramsFromFile(BPF_PROG_SRC, programs, ARRAY_SIZE(programs), mapPatterns); CLEANANDEXIT(ret, mapPatterns); |