#include "strv.h"
#include "set.h"
#include "missing.h"
+#include "def.h"
#include "sd-bus.h"
#include "bus-internal.h"
if (e)
r = sd_bus_set_address(b, e);
else
-#ifdef ENABLE_KDBUS
- r = sd_bus_set_address(b, "kernel:path=/dev/kdbus/0-system/bus;unix:path=/run/dbus/system_bus_socket");
-#else
- r = sd_bus_set_address(b, "unix:path=/run/dbus/system_bus_socket");
-#endif
-
+ r = sd_bus_set_address(b, DEFAULT_SYSTEM_BUS_PATH);
if (r < 0)
goto fail;
}
#ifdef ENABLE_KDBUS
- asprintf(&b->address, "kernel:path=/dev/kdbus/%lu-user/bus;unix:path=%s/bus", (unsigned long) getuid(), ee);
+ asprintf(&b->address, KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT, (unsigned long) getuid(), ee);
#else
- b->address = strjoin("unix:path=", ee, "/bus", NULL);
+ asprintf(&b->address, UNIX_USER_BUS_FMT, ee);
#endif
} else {
#ifdef ENABLE_KDBUS
- asprintf(&b->address, "kernel:path=/dev/kdbus/%lu-user/bus", (unsigned long) getuid());
+ asprintf(&b->address, KERNEL_USER_BUS_FMT, (unsigned long) getuid());
#else
return -ECONNREFUSED;
#endif
/* We'll leave the fd open in case this is a kernel bus, since
* there might still be memblocks around that reference this
- * bus, and they might need to invoke the * KDBUS_CMD_FREE
+ * bus, and they might need to invoke the KDBUS_CMD_FREE
* ioctl on the fd when they are freed. */
}
if (r <= 0)
return r;
- if (bus->is_kernel || bus->windex >= BUS_MESSAGE_SIZE(m))
+ if (bus->is_kernel || *idx >= BUS_MESSAGE_SIZE(m))
log_debug("Sent message type=%s sender=%s destination=%s object=%s interface=%s member=%s cookie=%lu reply_cookie=%lu error=%s",
bus_message_type_to_string(m->header->type),
strna(sd_bus_message_get_sender(m)),