chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix service file to match installed elogind binary location
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
bus-internal.h
diff --git
a/src/libelogind/sd-bus/bus-internal.h
b/src/libelogind/sd-bus/bus-internal.h
index 1351938c80e7f0294831b441329a4fcd7311b1de..4818ae28b5ffa074d6dc07079f527323f7ab207b 100644
(file)
--- a/
src/libelogind/sd-bus/bus-internal.h
+++ b/
src/libelogind/sd-bus/bus-internal.h
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#pragma once
/***
#pragma once
/***
@@
-21,21
+19,21
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sys/socket.h>
#include <pthread.h>
#include <pthread.h>
-
-#include "hashmap.h"
-#include "prioq.h"
-#include "list.h"
-#include "util.h"
-#include "refcnt.h"
-#include "socket-util.h"
+#include <sys/socket.h>
#include "sd-bus.h"
#include "sd-bus.h"
+
#include "bus-error.h"
#include "bus-error.h"
-#include "bus-match.h"
#include "bus-kernel.h"
#include "bus-kernel.h"
+#include "bus-match.h"
+#include "hashmap.h"
#include "kdbus.h"
#include "kdbus.h"
+#include "list.h"
+#include "prioq.h"
+#include "refcnt.h"
+#include "socket-util.h"
+#include "util.h"
struct reply_callback {
sd_bus_message_handler_t callback;
struct reply_callback {
sd_bus_message_handler_t callback;
@@
-141,6
+139,7
@@
struct sd_bus_slot {
void *userdata;
BusSlotType type:5;
bool floating:1;
void *userdata;
BusSlotType type:5;
bool floating:1;
+ bool match_added:1;
char *description;
LIST_FIELDS(sd_bus_slot, slots);
char *description;
LIST_FIELDS(sd_bus_slot, slots);
@@
-210,6
+209,10
@@
struct sd_bus {
bool is_system:1;
bool is_user:1;
bool allow_interactive_authorization:1;
bool is_system:1;
bool is_user:1;
bool allow_interactive_authorization:1;
+ bool exit_on_disconnect:1;
+ bool exited:1;
+ bool exit_triggered:1;
+ bool is_local:1;
int use_memfd;
int use_memfd;
@@
-261,7
+264,7
@@
struct sd_bus {
usec_t auth_timeout;
struct ucred ucred;
usec_t auth_timeout;
struct ucred ucred;
- char
label[NAME_MAX]
;
+ char
*label
;
uint64_t creds_mask;
uint64_t creds_mask;
@@
-321,12
+324,13
@@
struct sd_bus {
sd_bus_track *track_queue;
LIST_HEAD(sd_bus_slot, slots);
sd_bus_track *track_queue;
LIST_HEAD(sd_bus_slot, slots);
+ LIST_HEAD(sd_bus_track, tracks);
};
#define BUS_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC))
};
#define BUS_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC))
-#define BUS_WQUEUE_MAX
1024
-#define BUS_RQUEUE_MAX
64*1024
+#define BUS_WQUEUE_MAX
(192*1024)
+#define BUS_RQUEUE_MAX
(192*1024)
#define BUS_MESSAGE_SIZE_MAX (64*1024*1024)
#define BUS_AUTH_SIZE_MAX (64*1024)
#define BUS_MESSAGE_SIZE_MAX (64*1024*1024)
#define BUS_AUTH_SIZE_MAX (64*1024)
@@
-343,7
+347,9
@@
struct sd_bus {
bool interface_name_is_valid(const char *p) _pure_;
bool service_name_is_valid(const char *p) _pure_;
bool interface_name_is_valid(const char *p) _pure_;
bool service_name_is_valid(const char *p) _pure_;
+#if 0 /// UNNEEDED by elogind
char* service_name_startswith(const char *a, const char *b);
char* service_name_startswith(const char *a, const char *b);
+#endif // 0
bool member_name_is_valid(const char *p) _pure_;
bool object_path_is_valid(const char *p) _pure_;
char *object_path_startswith(const char *a, const char *b) _pure_;
bool member_name_is_valid(const char *p) _pure_;
bool object_path_is_valid(const char *p) _pure_;
char *object_path_startswith(const char *a, const char *b) _pure_;
@@
-380,13
+386,25
@@
char *bus_address_escape(const char *v);
* bus from the callback doesn't destroy the object we are working
* on */
#define BUS_DONT_DESTROY(bus) \
* bus from the callback doesn't destroy the object we are working
* on */
#define BUS_DONT_DESTROY(bus) \
- _cleanup_
bus_unref_
_unused_ sd_bus *_dont_destroy_##bus = sd_bus_ref(bus)
+ _cleanup_
(sd_bus_unrefp)
_unused_ sd_bus *_dont_destroy_##bus = sd_bus_ref(bus)
int bus_set_address_system(sd_bus *bus);
int bus_set_address_system(sd_bus *bus);
+#if 0 /// UNNEEDED by elogind
int bus_set_address_user(sd_bus *bus);
int bus_set_address_user(sd_bus *bus);
+#endif // 0
int bus_set_address_system_remote(sd_bus *b, const char *host);
int bus_set_address_system_machine(sd_bus *b, const char *machine);
int bus_set_address_system_remote(sd_bus *b, const char *host);
int bus_set_address_system_machine(sd_bus *b, const char *machine);
+#if 0 /// UNNEEDED by elogind
int bus_remove_match_by_string(sd_bus *bus, const char *match, sd_bus_message_handler_t callback, void *userdata);
int bus_remove_match_by_string(sd_bus *bus, const char *match, sd_bus_message_handler_t callback, void *userdata);
+#endif // 0
int bus_get_root_path(sd_bus *bus);
int bus_get_root_path(sd_bus *bus);
+
+int bus_maybe_reply_error(sd_bus_message *m, int r, sd_bus_error *error);
+
+#define bus_assert_return(expr, r, error) \
+ do { \
+ if (!assert_log(expr, #expr)) \
+ return sd_bus_error_set_errno(error, r); \
+ } while (false)