SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-bus: Get rid of circular dependency between sd-bus.h and sd-bus-vtable.h

Browse Source 
Let's move more types to sd-bus-protocol.h so we can get rid of the
circular include between sd-bus-vtable.h and sd-bus.h.
This commit is contained in:
Daan De Meyer
2025-04-23 09:53:28 +02:00
parent b7591658f0
commit 36642d0304
4 changed files with 94 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-bus/test-bus-vtable.c
+1
View File
@@ -9,6 +9,7 @@
#include <errno.h>
#include <stdio.h>
#include "sd-bus.h"
#include "sd-bus-vtable.h"
#ifndef __cplusplus
src/systemd/sd-bus-protocol.h
+87
View File
@@ -103,6 +103,93 @@ enum {
/* https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names */
#define SD_BUS_MAXIMUM_NAME_LENGTH 255
#define SD_BUS_DEFAULT ((sd_bus *) 1)
#define SD_BUS_DEFAULT_USER ((sd_bus *) 2)
#define SD_BUS_DEFAULT_SYSTEM ((sd_bus *) 3)
/* Types */
typedef struct sd_bus sd_bus;
typedef struct sd_bus_message sd_bus_message;
typedef struct sd_bus_slot sd_bus_slot;
typedef struct sd_bus_creds sd_bus_creds;
typedef struct sd_bus_track sd_bus_track;
typedef struct {
const char *name;
const char *message;
int _need_free;
} sd_bus_error;
typedef struct {
const char *name;
int code;
} sd_bus_error_map;
/* Flags */
__extension__ enum {
SD_BUS_CREDS_PID = 1ULL << 0,
SD_BUS_CREDS_TID = 1ULL << 1,
SD_BUS_CREDS_PPID = 1ULL << 2,
SD_BUS_CREDS_UID = 1ULL << 3,
SD_BUS_CREDS_EUID = 1ULL << 4,
SD_BUS_CREDS_SUID = 1ULL << 5,
SD_BUS_CREDS_FSUID = 1ULL << 6,
SD_BUS_CREDS_GID = 1ULL << 7,
SD_BUS_CREDS_EGID = 1ULL << 8,
SD_BUS_CREDS_SGID = 1ULL << 9,
SD_BUS_CREDS_FSGID = 1ULL << 10,
SD_BUS_CREDS_SUPPLEMENTARY_GIDS = 1ULL << 11,
SD_BUS_CREDS_COMM = 1ULL << 12,
SD_BUS_CREDS_TID_COMM = 1ULL << 13,
SD_BUS_CREDS_EXE = 1ULL << 14,
SD_BUS_CREDS_CMDLINE = 1ULL << 15,
SD_BUS_CREDS_CGROUP = 1ULL << 16,
SD_BUS_CREDS_UNIT = 1ULL << 17,
SD_BUS_CREDS_SLICE = 1ULL << 18,
SD_BUS_CREDS_USER_UNIT = 1ULL << 19,
SD_BUS_CREDS_USER_SLICE = 1ULL << 20,
SD_BUS_CREDS_SESSION = 1ULL << 21,
SD_BUS_CREDS_OWNER_UID = 1ULL << 22,
SD_BUS_CREDS_EFFECTIVE_CAPS = 1ULL << 23,
SD_BUS_CREDS_PERMITTED_CAPS = 1ULL << 24,
SD_BUS_CREDS_INHERITABLE_CAPS = 1ULL << 25,
SD_BUS_CREDS_BOUNDING_CAPS = 1ULL << 26,
SD_BUS_CREDS_SELINUX_CONTEXT = 1ULL << 27,
SD_BUS_CREDS_AUDIT_SESSION_ID = 1ULL << 28,
SD_BUS_CREDS_AUDIT_LOGIN_UID = 1ULL << 29,
SD_BUS_CREDS_TTY = 1ULL << 30,
SD_BUS_CREDS_UNIQUE_NAME = 1ULL << 31,
SD_BUS_CREDS_WELL_KNOWN_NAMES = 1ULL << 32,
SD_BUS_CREDS_DESCRIPTION = 1ULL << 33,
SD_BUS_CREDS_PIDFD = 1ULL << 34,
SD_BUS_CREDS_AUGMENT = 1ULL << 63, /* special flag, if on sd-bus will augment creds struct, in a potentially race-full way. */
_SD_BUS_CREDS_ALL = (1ULL << 35) -1
};
__extension__ enum {
SD_BUS_NAME_REPLACE_EXISTING = 1ULL << 0,
SD_BUS_NAME_ALLOW_REPLACEMENT = 1ULL << 1,
SD_BUS_NAME_QUEUE = 1ULL << 2
};
__extension__ enum {
SD_BUS_MESSAGE_DUMP_WITH_HEADER = 1ULL << 0,
SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY = 1ULL << 1,
_SD_BUS_MESSAGE_DUMP_KNOWN_FLAGS = SD_BUS_MESSAGE_DUMP_WITH_HEADER | SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY
};
/* Callbacks */
typedef int (*sd_bus_message_handler_t)(sd_bus_message *m, void *userdata, sd_bus_error *ret_error);
typedef int (*sd_bus_property_get_t) (sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *ret_error);
typedef int (*sd_bus_property_set_t) (sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *value, void *userdata, sd_bus_error *ret_error);
typedef int (*sd_bus_object_find_t) (sd_bus *bus, const char *path, const char *interface, void *userdata, void **ret_found, sd_bus_error *ret_error);
typedef int (*sd_bus_node_enumerator_t) (sd_bus *bus, const char *prefix, void *userdata, char ***ret_nodes, sd_bus_error *ret_error);
typedef int (*sd_bus_track_handler_t) (sd_bus_track *track, void *userdata);
typedef _sd_destroy_t sd_bus_destroy_t;
_SD_END_DECLARATIONS;
#endif
src/systemd/sd-bus-vtable.h
+4 -2
View File
@@ -17,14 +17,16 @@
along with systemd; If not, see <https://www.gnu.org/licenses/>.
***/
#include <stddef.h>
#include <stdint.h>
#include "_sd-common.h"
#include "sd-bus-protocol.h"
_SD_BEGIN_DECLARATIONS;
typedef struct sd_bus_vtable sd_bus_vtable;
#include "sd-bus.h"
enum {
_SD_BUS_VTABLE_START = '<',
_SD_BUS_VTABLE_END = '>',
src/systemd/sd-bus.h
+2 -90
View File
@@ -27,99 +27,11 @@
#include "sd-id128.h"
#include "_sd-common.h"
_SD_BEGIN_DECLARATIONS;
#define SD_BUS_DEFAULT ((sd_bus *) 1)
#define SD_BUS_DEFAULT_USER ((sd_bus *) 2)
#define SD_BUS_DEFAULT_SYSTEM ((sd_bus *) 3)
/* Types */
typedef struct sd_bus sd_bus;
typedef struct sd_bus_message sd_bus_message;
typedef struct sd_bus_slot sd_bus_slot;
typedef struct sd_bus_creds sd_bus_creds;
typedef struct sd_bus_track sd_bus_track;
typedef struct {
const char *name;
const char *message;
int _need_free;
} sd_bus_error;
typedef struct {
const char *name;
int code;
} sd_bus_error_map;
/* Flags */
__extension__ enum {
SD_BUS_CREDS_PID = 1ULL << 0,
SD_BUS_CREDS_TID = 1ULL << 1,
SD_BUS_CREDS_PPID = 1ULL << 2,
SD_BUS_CREDS_UID = 1ULL << 3,
SD_BUS_CREDS_EUID = 1ULL << 4,
SD_BUS_CREDS_SUID = 1ULL << 5,
SD_BUS_CREDS_FSUID = 1ULL << 6,
SD_BUS_CREDS_GID = 1ULL << 7,
SD_BUS_CREDS_EGID = 1ULL << 8,
SD_BUS_CREDS_SGID = 1ULL << 9,
SD_BUS_CREDS_FSGID = 1ULL << 10,
SD_BUS_CREDS_SUPPLEMENTARY_GIDS = 1ULL << 11,
SD_BUS_CREDS_COMM = 1ULL << 12,
SD_BUS_CREDS_TID_COMM = 1ULL << 13,
SD_BUS_CREDS_EXE = 1ULL << 14,
SD_BUS_CREDS_CMDLINE = 1ULL << 15,
SD_BUS_CREDS_CGROUP = 1ULL << 16,
SD_BUS_CREDS_UNIT = 1ULL << 17,
SD_BUS_CREDS_SLICE = 1ULL << 18,
SD_BUS_CREDS_USER_UNIT = 1ULL << 19,
SD_BUS_CREDS_USER_SLICE = 1ULL << 20,
SD_BUS_CREDS_SESSION = 1ULL << 21,
SD_BUS_CREDS_OWNER_UID = 1ULL << 22,
SD_BUS_CREDS_EFFECTIVE_CAPS = 1ULL << 23,
SD_BUS_CREDS_PERMITTED_CAPS = 1ULL << 24,
SD_BUS_CREDS_INHERITABLE_CAPS = 1ULL << 25,
SD_BUS_CREDS_BOUNDING_CAPS = 1ULL << 26,
SD_BUS_CREDS_SELINUX_CONTEXT = 1ULL << 27,
SD_BUS_CREDS_AUDIT_SESSION_ID = 1ULL << 28,
SD_BUS_CREDS_AUDIT_LOGIN_UID = 1ULL << 29,
SD_BUS_CREDS_TTY = 1ULL << 30,
SD_BUS_CREDS_UNIQUE_NAME = 1ULL << 31,
SD_BUS_CREDS_WELL_KNOWN_NAMES = 1ULL << 32,
SD_BUS_CREDS_DESCRIPTION = 1ULL << 33,
SD_BUS_CREDS_PIDFD = 1ULL << 34,
SD_BUS_CREDS_AUGMENT = 1ULL << 63, /* special flag, if on sd-bus will augment creds struct, in a potentially race-full way. */
_SD_BUS_CREDS_ALL = (1ULL << 35) -1
};
__extension__ enum {
SD_BUS_NAME_REPLACE_EXISTING = 1ULL << 0,
SD_BUS_NAME_ALLOW_REPLACEMENT = 1ULL << 1,
SD_BUS_NAME_QUEUE = 1ULL << 2
};
__extension__ enum {
SD_BUS_MESSAGE_DUMP_WITH_HEADER = 1ULL << 0,
SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY = 1ULL << 1,
_SD_BUS_MESSAGE_DUMP_KNOWN_FLAGS = SD_BUS_MESSAGE_DUMP_WITH_HEADER | SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY
};
/* Callbacks */
typedef int (*sd_bus_message_handler_t)(sd_bus_message *m, void *userdata, sd_bus_error *ret_error);
typedef int (*sd_bus_property_get_t) (sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *ret_error);
typedef int (*sd_bus_property_set_t) (sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *value, void *userdata, sd_bus_error *ret_error);
typedef int (*sd_bus_object_find_t) (sd_bus *bus, const char *path, const char *interface, void *userdata, void **ret_found, sd_bus_error *ret_error);
typedef int (*sd_bus_node_enumerator_t) (sd_bus *bus, const char *prefix, void *userdata, char ***ret_nodes, sd_bus_error *ret_error);
typedef int (*sd_bus_track_handler_t) (sd_bus_track *track, void *userdata);
typedef _sd_destroy_t sd_bus_destroy_t;
#include "sd-bus-protocol.h"
#include "sd-bus-vtable.h"
_SD_BEGIN_DECLARATIONS;
/* Naming */
int sd_bus_interface_name_is_valid(const char *p);