shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 18:27:04 +03:00
Code

bus: rename send_hello flag to bus_cient

Browse Source 
This way we can hide more than just the hello logic behind this flag,
for example, later on automatic match management.
This commit is contained in:
Lennart Poettering 2013-03-26 00:36:43 +01:00
parent 06f4289808
commit 94bbf1ba6d
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsystemd-bus/bus-internal.h
View File

@ -72,7 +72,7 @@ struct sd_bus {
bool negotiate_fds:1; bool negotiate_fds:1;
bool can_fds:1; bool can_fds:1;
bool send_hello:1; bool bus_client:1;
bool ucred_valid:1; bool ucred_valid:1;
void *rbuffer; void *rbuffer;

12
src/libsystemd-bus/sd-bus.c
View File

@ -176,13 +176,13 @@ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) {
return 0; return 0;
} }
int sd_bus_set_hello(sd_bus *bus, int b) { int sd_bus_set_bus_client(sd_bus *bus, int b) {
if (!bus) if (!bus)
return -EINVAL; return -EINVAL;
if (bus->state != BUS_UNSET) if (bus->state != BUS_UNSET)
return -EPERM; return -EPERM;
bus->send_hello = !!b; bus->bus_client = !!b;
return 0; return 0;
} }
@ -230,7 +230,7 @@ static int bus_send_hello(sd_bus *bus) {
assert(bus); assert(bus);
if (!bus->send_hello) if (!bus->bus_client)
return 0; return 0;
r = sd_bus_message_new_method_call( r = sd_bus_message_new_method_call(
@ -253,7 +253,7 @@ static int bus_send_hello(sd_bus *bus) {
int bus_start_running(sd_bus *bus) { int bus_start_running(sd_bus *bus) {
assert(bus); assert(bus);
if (bus->send_hello) { if (bus->bus_client) {
bus->state = BUS_HELLO; bus->state = BUS_HELLO;
return 1; return 1;
} }
@ -753,7 +753,7 @@ int sd_bus_open_system(sd_bus **ret) {
b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + sizeof("/run/dbus/system_bus_socket") - 1; b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + sizeof("/run/dbus/system_bus_socket") - 1;
} }
b->send_hello = true; b->bus_client = true;
r = sd_bus_start(b); r = sd_bus_start(b);
if (r < 0) if (r < 0)
@ -803,7 +803,7 @@ int sd_bus_open_user(sd_bus **ret) {
b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + l + 4; b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + l + 4;
} }
b->send_hello = true; b->bus_client = true;
r = sd_bus_start(b); r = sd_bus_start(b);
if (r < 0) if (r < 0)

3
src/libsystemd-bus/sd-bus.h
View File

@ -31,6 +31,7 @@
/* TODO: /* TODO:
* - implicitly add stub introspection calls * - implicitly add stub introspection calls
* - server side * - server side
* - allow installing match callbacks,
* *
* Later: * Later:
* - add page donation logic * - add page donation logic
@ -58,7 +59,7 @@ int sd_bus_new(sd_bus **ret);
int sd_bus_set_address(sd_bus *bus, const char *address); int sd_bus_set_address(sd_bus *bus, const char *address);
int sd_bus_set_fd(sd_bus *bus, int fd); int sd_bus_set_fd(sd_bus *bus, int fd);
int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]); int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]);
int sd_bus_set_hello(sd_bus *bus, int b); int sd_bus_set_bus_client(sd_bus *bus, int b);
int sd_bus_set_negotiate_fds(sd_bus *bus, int b); int sd_bus_set_negotiate_fds(sd_bus *bus, int b);
int sd_bus_start(sd_bus *ret); int sd_bus_start(sd_bus *ret);