bpf: Use hyphens in directory names instead of underscores

src/core/bpf-restrict-fs.c

@@ -17,7 +17,7 @@
 /* libbpf, clang and llc compile time dependencies are satisfied */
 #include "bpf-dlopen.h"
 #include "bpf-link.h"
-#include "bpf/restrict_fs/restrict-fs-skel.h"
+#include "bpf/restrict-fs/restrict-fs-skel.h"
 
 #define CGROUP_HASH_SIZE_MAX 2048
 

src/core/bpf-restrict-ifaces.c

@@ -16,7 +16,7 @@
 
 #include "bpf-dlopen.h"
 #include "bpf-link.h"
-#include "bpf/restrict_ifaces/restrict-ifaces-skel.h"
+#include "bpf/restrict-ifaces/restrict-ifaces-skel.h"
 
 static struct restrict_ifaces_bpf *restrict_ifaces_bpf_free(struct restrict_ifaces_bpf *obj) {
         restrict_ifaces_bpf__destroy(obj);

src/core/bpf-socket-bind.c

@@ -11,8 +11,8 @@
 /* libbpf, clang, llvm and bpftool compile time dependencies are satisfied */
 #include "bpf-dlopen.h"
 #include "bpf-link.h"
-#include "bpf/socket_bind/socket-bind-api.bpf.h"
-#include "bpf/socket_bind/socket-bind-skel.h"
+#include "bpf/socket-bind/socket-bind-api.bpf.h"
+#include "bpf/socket-bind/socket-bind-skel.h"
 
 static struct socket_bind_bpf *socket_bind_bpf_free(struct socket_bind_bpf *obj) {
         /* socket_bind_bpf__destroy handles object == NULL case */

src/core/bpf/restrict-fs/restrict-fs-skel.h

@@ -13,4 +13,4 @@
 #define bpf_object__load_skeleton sym_bpf_object__load_skeleton
 #define bpf_object__destroy_skeleton sym_bpf_object__destroy_skeleton
 
-#include "bpf/restrict_fs/restrict-fs.skel.h"
+#include "bpf/restrict-fs/restrict-fs.skel.h"

src/core/bpf/restrict-ifaces/restrict-ifaces-skel.h

@@ -13,4 +13,4 @@
 #define bpf_object__load_skeleton sym_bpf_object__load_skeleton
 #define bpf_object__destroy_skeleton sym_bpf_object__destroy_skeleton
 
-#include "bpf/restrict_ifaces/restrict-ifaces.skel.h"
+#include "bpf/restrict-ifaces/restrict-ifaces.skel.h"

src/core/bpf/socket-bind/socket-bind-skel.h

@@ -13,4 +13,4 @@
 #define bpf_object__load_skeleton sym_bpf_object__load_skeleton
 #define bpf_object__destroy_skeleton sym_bpf_object__destroy_skeleton
 
-#include "bpf/socket_bind/socket-bind.skel.h"
+#include "bpf/socket-bind/socket-bind.skel.h"

src/core/cgroup.c

@@ -54,7 +54,7 @@
 #include "bpf-dlopen.h"
 #include "bpf-link.h"
 #include "bpf-restrict-fs.h"
-#include "bpf/restrict_fs/restrict-fs-skel.h"
+#include "bpf/restrict-fs/restrict-fs-skel.h"
 #endif
 
 #define CGROUP_CPU_QUOTA_DEFAULT_PERIOD_USEC (100 * USEC_PER_MSEC)

src/core/meson.build

@@ -70,9 +70,9 @@ libcore_sources = files(
         'varlink-unit.c',
 )
 
-subdir('bpf/socket_bind')
-subdir('bpf/restrict_fs')
-subdir('bpf/restrict_ifaces')
+subdir('bpf/socket-bind')
+subdir('bpf/restrict-fs')
+subdir('bpf/restrict-ifaces')
 
 if conf.get('BPF_FRAMEWORK') == 1
         libcore_sources += [

src/network/bpf/sysctl-monitor/sysctl-monitor-skel.h

@@ -13,4 +13,4 @@
 #define bpf_object__load_skeleton sym_bpf_object__load_skeleton
 #define bpf_object__open_skeleton sym_bpf_object__open_skeleton
 
-#include "bpf/sysctl_monitor/sysctl-monitor.skel.h"
+#include "bpf/sysctl-monitor/sysctl-monitor.skel.h"

src/network/meson.build

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-subdir('bpf/sysctl_monitor')
+subdir('bpf/sysctl-monitor')
 
 systemd_networkd_sources = files(
         'networkd.c'

src/network/networkd-sysctl.c

@@ -29,8 +29,8 @@
 #if HAVE_VMLINUX_H
 
 #include "bpf-link.h"
-#include "bpf/sysctl_monitor/sysctl-monitor-skel.h"
-#include "bpf/sysctl_monitor/sysctl-write-event.h"
+#include "bpf/sysctl-monitor/sysctl-monitor-skel.h"
+#include "bpf/sysctl-monitor/sysctl-write-event.h"
 
 static struct sysctl_monitor_bpf* sysctl_monitor_bpf_free(struct sysctl_monitor_bpf *obj) {
         sysctl_monitor_bpf__destroy(obj);

src/nsresourced/bpf/userns-restrict/userns-restrict-skel.h

@@ -14,4 +14,4 @@
 #define bpf_object__load_skeleton sym_bpf_object__load_skeleton
 #define bpf_object__open_skeleton sym_bpf_object__open_skeleton
 
-#include "bpf/userns_restrict/userns-restrict.skel.h"
+#include "bpf/userns-restrict/userns-restrict.skel.h"

src/nsresourced/meson.build

@@ -4,7 +4,7 @@ if conf.get('ENABLE_NSRESOURCED') != 1
         subdir_done()
 endif
 
-subdir('bpf/userns_restrict')
+subdir('bpf/userns-restrict')
 
 systemd_nsresourced_sources = files(
         'nsresourced-manager.c',

src/nsresourced/userns-restrict.h

@@ -4,7 +4,7 @@
 #include "forward.h"
 
 #if HAVE_VMLINUX_H
-#include "bpf/userns_restrict/userns-restrict-skel.h"
+#include "bpf/userns-restrict/userns-restrict-skel.h"
 #else
 struct userns_restrict_bpf;
 #endif

src/shared/bpf-dlopen.h

@@ -26,7 +26,7 @@ extern DLSYM_PROTOTYPE(bpf_map_get_fd_by_id);
 extern DLSYM_PROTOTYPE(bpf_map_lookup_elem);
 extern DLSYM_PROTOTYPE(bpf_map_update_elem);
 /* The *_skeleton APIs are autogenerated by bpftool, the targets can be found
- * in ./build/src/core/bpf/socket_bind/socket-bind.skel.h */
+ * in ./build/src/core/bpf/socket-bind/socket-bind.skel.h */
 extern DLSYM_PROTOTYPE(bpf_object__attach_skeleton);
 extern DLSYM_PROTOTYPE(bpf_object__destroy_skeleton);
 extern DLSYM_PROTOTYPE(bpf_object__detach_skeleton);