From 0e949cff539d678a901c1f0d6fedef5c40634059 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 25 Jan 2024 14:06:59 +0100 Subject: [PATCH] =?UTF-8?q?bpf-socket-bind:=20rename=20bpf=5Fserialize=5Fs?= =?UTF-8?q?ocket=5Fbind()=20=E2=86=92=20bpf=5Fsocket=5Fbind=5Fserialize()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This function is the only outlier, all other BPF glue functions are called bpf__xyz(). Hence swap this over here too. --- src/core/bpf-socket-bind.c | 4 ++-- src/core/bpf-socket-bind.h | 2 +- src/core/unit-serialize.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/bpf-socket-bind.c b/src/core/bpf-socket-bind.c index 9f290ab412..b1b1a6770e 100644 --- a/src/core/bpf-socket-bind.c +++ b/src/core/bpf-socket-bind.c @@ -212,7 +212,7 @@ int bpf_socket_bind_install(Unit *u) { return r; } -int bpf_serialize_socket_bind(Unit *u, FILE *f, FDSet *fds) { +int bpf_socket_bind_serialize(Unit *u, FILE *f, FDSet *fds) { int r; assert(u); @@ -238,7 +238,7 @@ int bpf_socket_bind_install(Unit *u) { "bpf-socket-bind: Failed to install; BPF framework is not supported"); } -int bpf_serialize_socket_bind(Unit *u, FILE *f, FDSet *fds) { +int bpf_socket_bind_serialize(Unit *u, FILE *f, FDSet *fds) { return 0; } #endif diff --git a/src/core/bpf-socket-bind.h b/src/core/bpf-socket-bind.h index 7d426df714..28b25f6872 100644 --- a/src/core/bpf-socket-bind.h +++ b/src/core/bpf-socket-bind.h @@ -12,4 +12,4 @@ int bpf_socket_bind_add_initial_link_fd(Unit *u, int fd); int bpf_socket_bind_install(Unit *u); -int bpf_serialize_socket_bind(Unit *u, FILE *f, FDSet *fds); +int bpf_socket_bind_serialize(Unit *u, FILE *f, FDSet *fds); diff --git a/src/core/unit-serialize.c b/src/core/unit-serialize.c index 7f07bc8e31..297bf771b7 100644 --- a/src/core/unit-serialize.c +++ b/src/core/unit-serialize.c @@ -191,7 +191,7 @@ int unit_serialize_state(Unit *u, FILE *f, FDSet *fds, bool switching_root) { (void) serialize_cgroup_mask(f, "cgroup-enabled-mask", u->cgroup_enabled_mask); (void) serialize_cgroup_mask(f, "cgroup-invalidated-mask", u->cgroup_invalidated_mask); - (void) bpf_serialize_socket_bind(u, f, fds); + (void) bpf_socket_bind_serialize(u, f, fds); (void) bpf_program_serialize_attachment(f, fds, "ip-bpf-ingress-installed", u->ip_bpf_ingress_installed); (void) bpf_program_serialize_attachment(f, fds, "ip-bpf-egress-installed", u->ip_bpf_egress_installed);