From f4df5902d83a6c4bc7b68a16dd0846888d7cbdb2 Mon Sep 17 00:00:00 2001
From: DaanDeMeyer <daan.j.demeyer@gmail.com>
Date: Sun, 13 Jul 2025 12:45:37 +0200
Subject: [PATCH] bpf: Use hyphens in directory names instead of underscores

---
 src/core/bpf-restrict-fs.c                                  | 2 +-
 src/core/bpf-restrict-ifaces.c                              | 2 +-
 src/core/bpf-socket-bind.c                                  | 4 ++--
 src/core/bpf/{restrict_fs => restrict-fs}/meson.build       | 0
 .../bpf/{restrict_fs => restrict-fs}/restrict-fs-skel.h     | 2 +-
 src/core/bpf/{restrict_fs => restrict-fs}/restrict-fs.bpf.c | 0
 .../bpf/{restrict_ifaces => restrict-ifaces}/meson.build    | 0
 .../restrict-ifaces-skel.h                                  | 2 +-
 .../restrict-ifaces.bpf.c                                   | 0
 src/core/bpf/{socket_bind => socket-bind}/meson.build       | 0
 .../bpf/{socket_bind => socket-bind}/socket-bind-api.bpf.h  | 0
 .../bpf/{socket_bind => socket-bind}/socket-bind-skel.h     | 2 +-
 src/core/bpf/{socket_bind => socket-bind}/socket-bind.bpf.c | 0
 src/core/cgroup.c                                           | 2 +-
 src/core/meson.build                                        | 6 +++---
 .../bpf/{sysctl_monitor => sysctl-monitor}/meson.build      | 0
 .../sysctl-monitor-skel.h                                   | 2 +-
 .../{sysctl_monitor => sysctl-monitor}/sysctl-monitor.bpf.c | 0
 .../{sysctl_monitor => sysctl-monitor}/sysctl-write-event.h | 0
 src/network/meson.build                                     | 2 +-
 src/network/networkd-sysctl.c                               | 4 ++--
 .../bpf/{userns_restrict => userns-restrict}/meson.build    | 0
 .../userns-restrict-skel.h                                  | 2 +-
 .../userns-restrict.bpf.c                                   | 0
 src/nsresourced/meson.build                                 | 2 +-
 src/nsresourced/userns-restrict.h                           | 2 +-
 src/shared/bpf-dlopen.h                                     | 2 +-
 27 files changed, 19 insertions(+), 19 deletions(-)
 rename src/core/bpf/{restrict_fs => restrict-fs}/meson.build (100%)
 rename src/core/bpf/{restrict_fs => restrict-fs}/restrict-fs-skel.h (93%)
 rename src/core/bpf/{restrict_fs => restrict-fs}/restrict-fs.bpf.c (100%)
 rename src/core/bpf/{restrict_ifaces => restrict-ifaces}/meson.build (100%)
 rename src/core/bpf/{restrict_ifaces => restrict-ifaces}/restrict-ifaces-skel.h (91%)
 rename src/core/bpf/{restrict_ifaces => restrict-ifaces}/restrict-ifaces.bpf.c (100%)
 rename src/core/bpf/{socket_bind => socket-bind}/meson.build (100%)
 rename src/core/bpf/{socket_bind => socket-bind}/socket-bind-api.bpf.h (100%)
 rename src/core/bpf/{socket_bind => socket-bind}/socket-bind-skel.h (93%)
 rename src/core/bpf/{socket_bind => socket-bind}/socket-bind.bpf.c (100%)
 rename src/network/bpf/{sysctl_monitor => sysctl-monitor}/meson.build (100%)
 rename src/network/bpf/{sysctl_monitor => sysctl-monitor}/sysctl-monitor-skel.h (92%)
 rename src/network/bpf/{sysctl_monitor => sysctl-monitor}/sysctl-monitor.bpf.c (100%)
 rename src/network/bpf/{sysctl_monitor => sysctl-monitor}/sysctl-write-event.h (100%)
 rename src/nsresourced/bpf/{userns_restrict => userns-restrict}/meson.build (100%)
 rename src/nsresourced/bpf/{userns_restrict => userns-restrict}/userns-restrict-skel.h (92%)
 rename src/nsresourced/bpf/{userns_restrict => userns-restrict}/userns-restrict.bpf.c (100%)

diff --git a/src/core/bpf-restrict-fs.c b/src/core/bpf-restrict-fs.c
index 33e525c911a..859ba556a02 100644
--- a/src/core/bpf-restrict-fs.c
+++ b/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
 
diff --git a/src/core/bpf-restrict-ifaces.c b/src/core/bpf-restrict-ifaces.c
index 971772badef..dc8b976b7f0 100644
--- a/src/core/bpf-restrict-ifaces.c
+++ b/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);
diff --git a/src/core/bpf-socket-bind.c b/src/core/bpf-socket-bind.c
index 6838476d048..1fc73c19ab7 100644
--- a/src/core/bpf-socket-bind.c
+++ b/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 */
diff --git a/src/core/bpf/restrict_fs/meson.build b/src/core/bpf/restrict-fs/meson.build
similarity index 100%
rename from src/core/bpf/restrict_fs/meson.build
rename to src/core/bpf/restrict-fs/meson.build
diff --git a/src/core/bpf/restrict_fs/restrict-fs-skel.h b/src/core/bpf/restrict-fs/restrict-fs-skel.h
similarity index 93%
rename from src/core/bpf/restrict_fs/restrict-fs-skel.h
rename to src/core/bpf/restrict-fs/restrict-fs-skel.h
index 825b8131f94..51b15ae812b 100644
--- a/src/core/bpf/restrict_fs/restrict-fs-skel.h
+++ b/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"
diff --git a/src/core/bpf/restrict_fs/restrict-fs.bpf.c b/src/core/bpf/restrict-fs/restrict-fs.bpf.c
similarity index 100%
rename from src/core/bpf/restrict_fs/restrict-fs.bpf.c
rename to src/core/bpf/restrict-fs/restrict-fs.bpf.c
diff --git a/src/core/bpf/restrict_ifaces/meson.build b/src/core/bpf/restrict-ifaces/meson.build
similarity index 100%
rename from src/core/bpf/restrict_ifaces/meson.build
rename to src/core/bpf/restrict-ifaces/meson.build
diff --git a/src/core/bpf/restrict_ifaces/restrict-ifaces-skel.h b/src/core/bpf/restrict-ifaces/restrict-ifaces-skel.h
similarity index 91%
rename from src/core/bpf/restrict_ifaces/restrict-ifaces-skel.h
rename to src/core/bpf/restrict-ifaces/restrict-ifaces-skel.h
index f0675f270ba..fbebad688d9 100644
--- a/src/core/bpf/restrict_ifaces/restrict-ifaces-skel.h
+++ b/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"
diff --git a/src/core/bpf/restrict_ifaces/restrict-ifaces.bpf.c b/src/core/bpf/restrict-ifaces/restrict-ifaces.bpf.c
similarity index 100%
rename from src/core/bpf/restrict_ifaces/restrict-ifaces.bpf.c
rename to src/core/bpf/restrict-ifaces/restrict-ifaces.bpf.c
diff --git a/src/core/bpf/socket_bind/meson.build b/src/core/bpf/socket-bind/meson.build
similarity index 100%
rename from src/core/bpf/socket_bind/meson.build
rename to src/core/bpf/socket-bind/meson.build
diff --git a/src/core/bpf/socket_bind/socket-bind-api.bpf.h b/src/core/bpf/socket-bind/socket-bind-api.bpf.h
similarity index 100%
rename from src/core/bpf/socket_bind/socket-bind-api.bpf.h
rename to src/core/bpf/socket-bind/socket-bind-api.bpf.h
diff --git a/src/core/bpf/socket_bind/socket-bind-skel.h b/src/core/bpf/socket-bind/socket-bind-skel.h
similarity index 93%
rename from src/core/bpf/socket_bind/socket-bind-skel.h
rename to src/core/bpf/socket-bind/socket-bind-skel.h
index c92eae002da..72d708dbfc8 100644
--- a/src/core/bpf/socket_bind/socket-bind-skel.h
+++ b/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"
diff --git a/src/core/bpf/socket_bind/socket-bind.bpf.c b/src/core/bpf/socket-bind/socket-bind.bpf.c
similarity index 100%
rename from src/core/bpf/socket_bind/socket-bind.bpf.c
rename to src/core/bpf/socket-bind/socket-bind.bpf.c
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 118fe988a68..4667d41ae3f 100644
--- a/src/core/cgroup.c
+++ b/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)
diff --git a/src/core/meson.build b/src/core/meson.build
index 991c3bb0d19..8bb0054c146 100644
--- a/src/core/meson.build
+++ b/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 += [
diff --git a/src/network/bpf/sysctl_monitor/meson.build b/src/network/bpf/sysctl-monitor/meson.build
similarity index 100%
rename from src/network/bpf/sysctl_monitor/meson.build
rename to src/network/bpf/sysctl-monitor/meson.build
diff --git a/src/network/bpf/sysctl_monitor/sysctl-monitor-skel.h b/src/network/bpf/sysctl-monitor/sysctl-monitor-skel.h
similarity index 92%
rename from src/network/bpf/sysctl_monitor/sysctl-monitor-skel.h
rename to src/network/bpf/sysctl-monitor/sysctl-monitor-skel.h
index d002414521f..26ee2945789 100644
--- a/src/network/bpf/sysctl_monitor/sysctl-monitor-skel.h
+++ b/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"
diff --git a/src/network/bpf/sysctl_monitor/sysctl-monitor.bpf.c b/src/network/bpf/sysctl-monitor/sysctl-monitor.bpf.c
similarity index 100%
rename from src/network/bpf/sysctl_monitor/sysctl-monitor.bpf.c
rename to src/network/bpf/sysctl-monitor/sysctl-monitor.bpf.c
diff --git a/src/network/bpf/sysctl_monitor/sysctl-write-event.h b/src/network/bpf/sysctl-monitor/sysctl-write-event.h
similarity index 100%
rename from src/network/bpf/sysctl_monitor/sysctl-write-event.h
rename to src/network/bpf/sysctl-monitor/sysctl-write-event.h
diff --git a/src/network/meson.build b/src/network/meson.build
index 0c8dd46a673..c6a323c929b 100644
--- a/src/network/meson.build
+++ b/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'
diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c
index efb9f45df9a..4f9b6522d77 100644
--- a/src/network/networkd-sysctl.c
+++ b/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);
diff --git a/src/nsresourced/bpf/userns_restrict/meson.build b/src/nsresourced/bpf/userns-restrict/meson.build
similarity index 100%
rename from src/nsresourced/bpf/userns_restrict/meson.build
rename to src/nsresourced/bpf/userns-restrict/meson.build
diff --git a/src/nsresourced/bpf/userns_restrict/userns-restrict-skel.h b/src/nsresourced/bpf/userns-restrict/userns-restrict-skel.h
similarity index 92%
rename from src/nsresourced/bpf/userns_restrict/userns-restrict-skel.h
rename to src/nsresourced/bpf/userns-restrict/userns-restrict-skel.h
index 271caf46624..a7cbeb8e75a 100644
--- a/src/nsresourced/bpf/userns_restrict/userns-restrict-skel.h
+++ b/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"
diff --git a/src/nsresourced/bpf/userns_restrict/userns-restrict.bpf.c b/src/nsresourced/bpf/userns-restrict/userns-restrict.bpf.c
similarity index 100%
rename from src/nsresourced/bpf/userns_restrict/userns-restrict.bpf.c
rename to src/nsresourced/bpf/userns-restrict/userns-restrict.bpf.c
diff --git a/src/nsresourced/meson.build b/src/nsresourced/meson.build
index 805a4788d02..31d334f8111 100644
--- a/src/nsresourced/meson.build
+++ b/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',
diff --git a/src/nsresourced/userns-restrict.h b/src/nsresourced/userns-restrict.h
index d9c0f611ef8..a1a29ba8f67 100644
--- a/src/nsresourced/userns-restrict.h
+++ b/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
diff --git a/src/shared/bpf-dlopen.h b/src/shared/bpf-dlopen.h
index 639c1128946..3a985738ec7 100644
--- a/src/shared/bpf-dlopen.h
+++ b/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);
-- 
2.47.3