[systemd-commits] 7 commits - TODO src/bus-proxyd src/journal-remote src/libsystemd src/libsystemd-network src/network src/systemd
Lennart Poettering
lennart at kemper.freedesktop.org
Tue Nov 4 09:09:30 PST 2014
TODO | 10 +++++-----
src/bus-proxyd/bus-proxyd.c | 4 ++--
src/journal-remote/journal-remote.c | 14 +++-----------
src/libsystemd-network/sd-dhcp-client.c | 21 +++++++--------------
src/libsystemd-network/sd-dhcp6-client.c | 18 ++++++------------
src/libsystemd-network/sd-icmp6-nd.c | 6 +++---
src/libsystemd-network/sd-ipv4ll.c | 6 +++---
src/libsystemd/libsystemd.sym.m4 | 8 +++++---
src/libsystemd/sd-bus/bus-internal.h | 1 +
src/libsystemd/sd-bus/bus-slot.c | 16 ++++++++++++++++
src/libsystemd/sd-bus/sd-bus.c | 27 +++++++++------------------
src/libsystemd/sd-bus/test-bus-chat.c | 2 +-
src/libsystemd/sd-event/sd-event.c | 29 +++++++++++++++++------------
src/libsystemd/sd-rtnl/sd-rtnl.c | 6 +++---
src/network/networkd-manager.c | 2 +-
src/systemd/sd-bus.h | 8 +++++---
src/systemd/sd-event.h | 4 ++--
17 files changed, 89 insertions(+), 93 deletions(-)
New commits:
commit 57f2a947270faf65e1876797b930e3f6d60ebd06
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Nov 4 17:54:40 2014 +0100
update TODO
diff --git a/TODO b/TODO
index b54aa61..b3c891e 100644
--- a/TODO
+++ b/TODO
@@ -37,6 +37,8 @@ External:
Features:
+* logind: when the power button is pressed short, just popup a logout dialog. If it is pressed for 1s, do the usual shutdown. Inspiration are Macs here.
+
* optionally support running journald from the command line for testing purposes in external projects
* journald: allow per-priority and per-service retention times when rotating/vacuuming
@@ -161,7 +163,6 @@ Features:
* support empty /etc boots nicely:
- nspawn/gpt-generator: introduce new gpt partition type for /usr
- fstab-generator: support systemd.volatile=yes|no|state on the kernel cmdline, too, similar to nspawn's --volatile=
- - fstab-generator: add support for usr= in addition to root= on the kernel cmdline
* generator that automatically discovers btrfs subvolumes, identifies their purpose based on some xattr on them.
@@ -285,6 +286,8 @@ Features:
ReadOnlyDirectories=... for whitelisting files for a service.
* sd-bus:
+ - kdbus: maybe add euid, egid, fsuid, fsgid, controlling tty and ppid metadata fields
+ - see if we can introduce a new sd_bus_get_owner_machine_id() call to retrieve the machine ID of the machine of the bus itself
- when kdbus does not take our message without memfds, try again with memfds
- systemd-bus-proxyd needs to enforce good old XML policy
- allow updating attach flags during runtime
@@ -405,7 +408,7 @@ Features:
* service: watchdog logic: for testing purposes allow ping, but do not require pong
* journal:
- - consider introducing implicit _TTY= field
+ - consider introducing implicit _TTY= + _PPID= + _EUID= + _EGID= + _FSUID= + _FSGID= fields
- import and delete pstore filesystem content at startup
- journald: also get thread ID from client, plus thread name
- journal: when waiting for journal additions in the client always sleep at least 1s or so, in order to minimize wakeups
@@ -432,7 +435,6 @@ Features:
- refuse taking lower-case variable names in sd_journal_send() and friends.
- journald: we currently rotate only after MaxUse+MaxFilesize has been reached.
- journal: deal nicely with byte-by-byte copied files, especially regards header
- - journal: store euid in journal if it differs from uid
- journal: sanely deal with entries which are larger than the individual file size, but where the components would fit
- Replace utmp, wtmp, btmp, and lastlog completely with journal
- journalctl: instead --after-cursor= maybe have a --cursor=XYZ+1 syntax?
@@ -677,8 +679,6 @@ Features:
* fingerprint.target, wireless.target, gps.target, netdevice.target
-* drop cap bounding set in readahead and other services
-
* systemd-python:
- figure out a simple way to wait for journal events in a way that
works with ^C
commit f7fce3454c221fd1fff51528d028576d1cb1c7b6
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Nov 4 17:24:30 2014 +0100
sd-bus: rename sd_bus_get_server_id() to sd_bus_get_owner_id()
In kdbus a "server id" is mostly a misnomer, as there isn't any "server"
involved anymore. Let's rename this to "owner" id hence, since it is an
ID that is picked by the owner of a bus or direct connection. This
matches nicely the sd_bus_get_owner_creds() call we already have.
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index d10de2f..88346ed 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -676,7 +676,7 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
sd_id128_t server_id;
char buf[SD_ID128_STRING_MAX];
- r = sd_bus_get_server_id(a, &server_id);
+ r = sd_bus_get_owner_id(a, &server_id);
if (r < 0)
return synthetic_reply_method_errno(m, r, NULL);
@@ -1230,7 +1230,7 @@ int main(int argc, char *argv[]) {
goto finish;
}
- r = sd_bus_get_server_id(a, &server_id);
+ r = sd_bus_get_owner_id(a, &server_id);
if (r < 0) {
log_error("Failed to get server ID: %s", strerror(-r));
goto finish;
diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym.m4
index 635caf6..0c02db7 100644
--- a/src/libsystemd/libsystemd.sym.m4
+++ b/src/libsystemd/libsystemd.sym.m4
@@ -190,7 +190,7 @@ global:
sd_bus_unref;
sd_bus_is_open;
sd_bus_can_send;
- sd_bus_get_server_id;
+ sd_bus_get_owner_id;
sd_bus_get_owner_creds;
sd_bus_get_description;
sd_bus_send;
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index a3165fb..e6b47f7 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -1412,18 +1412,18 @@ _public_ int sd_bus_can_send(sd_bus *bus, char type) {
return bus_type_is_valid(type);
}
-_public_ int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) {
+_public_ int sd_bus_get_owner_id(sd_bus *bus, sd_id128_t *id) {
int r;
assert_return(bus, -EINVAL);
- assert_return(server_id, -EINVAL);
+ assert_return(id, -EINVAL);
assert_return(!bus_pid_changed(bus), -ECHILD);
r = bus_ensure_running(bus);
if (r < 0)
return r;
- *server_id = bus->server_id;
+ *id = bus->server_id;
return 0;
}
diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index d5903f4..8ee66cf 100644
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -78,7 +78,7 @@ static int server_init(sd_bus **_bus) {
goto fail;
}
- r = sd_bus_get_server_id(bus, &id);
+ r = sd_bus_get_owner_id(bus, &id);
if (r < 0) {
log_error("Failed to get server ID: %s", strerror(-r));
goto fail;
diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index 40c3a4a..49d4907 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -112,7 +112,7 @@ int sd_bus_set_address(sd_bus *bus, const char *address);
int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd);
int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]);
int sd_bus_set_bus_client(sd_bus *bus, int b);
-int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id);
+int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t owner_id);
int sd_bus_set_anonymous(sd_bus *bus, int b);
int sd_bus_set_trusted(sd_bus *bus, int b);
int sd_bus_set_description(sd_bus *bus, const char *description);
@@ -130,7 +130,7 @@ sd_bus *sd_bus_unref(sd_bus *bus);
int sd_bus_is_open(sd_bus *bus);
int sd_bus_can_send(sd_bus *bus, char type);
-int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *peer);
+int sd_bus_get_owner_id(sd_bus *bus, sd_id128_t *id);
int sd_bus_get_owner_creds(sd_bus *bus, uint64_t creds_mask, sd_bus_creds **ret);
int sd_bus_get_description(sd_bus *bus, const char **description);
int sd_bus_get_tid(sd_bus *bus, pid_t *tid);
@@ -147,6 +147,7 @@ int sd_bus_process(sd_bus *bus, sd_bus_message **r);
int sd_bus_process_priority(sd_bus *bus, int64_t max_priority, sd_bus_message **r);
int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec);
int sd_bus_flush(sd_bus *bus);
+
sd_bus_slot* sd_bus_get_current_slot(sd_bus *bus);
sd_bus_message* sd_bus_get_current_message(sd_bus *bus);
sd_bus_message_handler_t sd_bus_get_current_handler(sd_bus *bus);
@@ -171,10 +172,8 @@ sd_bus_slot* sd_bus_slot_ref(sd_bus_slot *slot);
sd_bus_slot* sd_bus_slot_unref(sd_bus_slot *slot);
sd_bus* sd_bus_slot_get_bus(sd_bus_slot *slot);
-
void *sd_bus_slot_get_userdata(sd_bus_slot *slot);
void *sd_bus_slot_set_userdata(sd_bus_slot *slot, void *userdata);
-
int sd_bus_slot_set_description(sd_bus_slot *slot, const char *description);
int sd_bus_slot_get_description(sd_bus_slot *slot, char **description);
commit f4b2933ee7890e5d414ab266d8586f19027a2bd9
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Nov 4 16:58:42 2014 +0100
sd-bus,sd-event: unify error handling of object descriptions
a) When getting the description return ENXIO if none is set
b) Allow setting a description to NULL
c) return ECHILD on fork() like for other calls
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index ba8d5e6..a3165fb 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -325,7 +325,6 @@ _public_ int sd_bus_set_trusted(sd_bus *bus, int b) {
_public_ int sd_bus_set_description(sd_bus *bus, const char *description) {
assert_return(bus, -EINVAL);
- assert_return(description, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD);
@@ -3316,6 +3315,7 @@ _public_ int sd_bus_try_close(sd_bus *bus) {
_public_ int sd_bus_get_description(sd_bus *bus, const char **description) {
assert_return(bus, -EINVAL);
assert_return(description, -EINVAL);
+ assert_return(bus->description, -ENXIO);
assert_return(!bus_pid_changed(bus), -ECHILD);
*description = bus->description;
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index e856d68..fb436ad 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -1258,6 +1258,7 @@ _public_ sd_event_source* sd_event_source_unref(sd_event_source *s) {
_public_ int sd_event_source_set_description(sd_event_source *s, const char *description) {
assert_return(s, -EINVAL);
+ assert_return(!event_pid_changed(s->event), -ECHILD);
return free_and_strdup(&s->description, description);
}
@@ -1265,6 +1266,8 @@ _public_ int sd_event_source_set_description(sd_event_source *s, const char *des
_public_ int sd_event_source_get_description(sd_event_source *s, const char **description) {
assert_return(s, -EINVAL);
assert_return(description, -EINVAL);
+ assert_return(s->description, -ENXIO);
+ assert_return(!event_pid_changed(s->event), -ECHILD);
*description = s->description;
return 0;
commit d1b91c99d9241f7f79756a42f845cf35992888cd
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Nov 4 16:58:15 2014 +0100
sd-bus: make use of free_and_strdup() where it makes sense
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 251720a..ba8d5e6 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -324,21 +324,12 @@ _public_ int sd_bus_set_trusted(sd_bus *bus, int b) {
}
_public_ int sd_bus_set_description(sd_bus *bus, const char *description) {
- char *n;
-
assert_return(bus, -EINVAL);
assert_return(description, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD);
- n = strdup(description);
- if (!n)
- return -ENOMEM;
-
- free(bus->description);
- bus->description = n;
-
- return 0;
+ return free_and_strdup(&bus->description, description);
}
static int hello_callback(sd_bus *bus, sd_bus_message *reply, void *userdata, sd_bus_error *error) {
commit 9cbfc66c621c42aa6e58e9e0da0adfb01efa7537
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Nov 4 16:57:38 2014 +0100
sd-bus: also allow setting descriptions on bus slots
diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym.m4
index 04581c5..635caf6 100644
--- a/src/libsystemd/libsystemd.sym.m4
+++ b/src/libsystemd/libsystemd.sym.m4
@@ -223,6 +223,8 @@ global:
sd_bus_slot_get_bus;
sd_bus_slot_get_userdata;
sd_bus_slot_set_userdata;
+ sd_bus_slot_get_description;
+ sd_bus_slot_set_description;
sd_bus_slot_get_current_message;
sd_bus_message_new_signal;
sd_bus_message_new_method_call;
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
index b1310a8..0738148 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -142,6 +142,7 @@ struct sd_bus_slot {
void *userdata;
BusSlotType type:5;
bool floating:1;
+ char *description;
LIST_FIELDS(sd_bus_slot, slots);
diff --git a/src/libsystemd/sd-bus/bus-slot.c b/src/libsystemd/sd-bus/bus-slot.c
index 568a6ed..8060e98 100644
--- a/src/libsystemd/sd-bus/bus-slot.c
+++ b/src/libsystemd/sd-bus/bus-slot.c
@@ -208,6 +208,7 @@ _public_ sd_bus_slot* sd_bus_slot_unref(sd_bus_slot *slot) {
}
bus_slot_disconnect(slot);
+ free(slot->description);
free(slot);
return NULL;
@@ -265,3 +266,18 @@ _public_ void* sd_bus_slot_get_current_userdata(sd_bus_slot *slot) {
return slot->bus->current_userdata;
}
+
+_public_ int sd_bus_slot_set_description(sd_bus_slot *slot, const char *description) {
+ assert_return(slot, -EINVAL);
+
+ return free_and_strdup(&slot->description, description);
+}
+
+_public_ int sd_bus_slot_get_description(sd_bus_slot *slot, char **description) {
+ assert_return(slot, -EINVAL);
+ assert_return(description, -EINVAL);
+ assert_return(slot->description, -ENXIO);
+
+ *description = slot->description;
+ return 0;
+}
diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index e6c9559..40c3a4a 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -175,6 +175,9 @@ sd_bus* sd_bus_slot_get_bus(sd_bus_slot *slot);
void *sd_bus_slot_get_userdata(sd_bus_slot *slot);
void *sd_bus_slot_set_userdata(sd_bus_slot *slot, void *userdata);
+int sd_bus_slot_set_description(sd_bus_slot *slot, const char *description);
+int sd_bus_slot_get_description(sd_bus_slot *slot, char **description);
+
sd_bus_message* sd_bus_slot_get_current_message(sd_bus_slot *slot);
sd_bus_message_handler_t sd_bus_slot_get_current_handler(sd_bus_slot *bus);
void *sd_bus_slot_get_current_userdata(sd_bus_slot *slot);
commit f1f00dbb7f3741b30d4a26b1a8b65ec46ff1fde3
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Nov 4 16:34:20 2014 +0100
sd-event: implicitly set signal event source's descriptions to the signal name
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 03410c7..7239b8c 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -803,18 +803,10 @@ static int setup_signals(RemoteServer *s) {
if (r < 0)
return r;
- r = sd_event_source_set_description(s->sigterm_event, "sigterm");
- if (r < 0)
- return r;
-
r = sd_event_add_signal(s->events, &s->sigint_event, SIGINT, NULL, s);
if (r < 0)
return r;
- r = sd_event_source_set_description(s->sigint_event, "sigint");
- if (r < 0)
- return r;
-
return 0;
}
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index f0356a4..e856d68 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -1031,6 +1031,9 @@ _public_ int sd_event_add_signal(
}
}
+ /* Use the signal name as description for the event source by default */
+ (void) sd_event_source_set_description(s, signal_to_string(sig));
+
if (ret)
*ret = s;
commit 356779df90a2ecab5da2cb310ad0f8ebc9ca9f46
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Nov 4 16:27:05 2014 +0100
sd-event: rename sd_event_source_set_name() to sd_event_source_get_name()
To mirror the recent name change of the concept for sd_bus objects,
follow the same logic for sd_event_source objects, too.
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index dc7120b..03410c7 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -398,7 +398,7 @@ static int add_source(RemoteServer *s, int fd, char* name, bool own_name) {
goto error;
}
- r = sd_event_source_set_name(source->event, name);
+ r = sd_event_source_set_description(source->event, name);
if (r < 0) {
log_error("Failed to set source name for fd:%d: %s", fd, strerror(-r));
goto error;
@@ -426,7 +426,7 @@ static int add_raw_socket(RemoteServer *s, int fd) {
snprintf(name, sizeof(name), "raw-socket-%d", fd);
- r = sd_event_source_set_name(s->listen_event, name);
+ r = sd_event_source_set_description(s->listen_event, name);
if (r < 0)
return r;
@@ -724,7 +724,7 @@ static int setup_microhttpd_server(RemoteServer *s,
goto error;
}
- r = sd_event_source_set_name(d->event, "epoll-fd");
+ r = sd_event_source_set_description(d->event, "epoll-fd");
if (r < 0) {
log_error("Failed to set source name: %s", strerror(-r));
goto error;
@@ -803,7 +803,7 @@ static int setup_signals(RemoteServer *s) {
if (r < 0)
return r;
- r = sd_event_source_set_name(s->sigterm_event, "sigterm");
+ r = sd_event_source_set_description(s->sigterm_event, "sigterm");
if (r < 0)
return r;
@@ -811,7 +811,7 @@ static int setup_signals(RemoteServer *s) {
if (r < 0)
return r;
- r = sd_event_source_set_name(s->sigint_event, "sigint");
+ r = sd_event_source_set_description(s->sigint_event, "sigint");
if (r < 0)
return r;
diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 1f7f238..689163c 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -723,8 +723,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec,
if (r < 0)
goto error;
- r = sd_event_source_set_name(client->timeout_resend,
- "dhcp4-resend-timer");
+ r = sd_event_source_set_description(client->timeout_resend, "dhcp4-resend-timer");
if (r < 0)
goto error;
@@ -801,8 +800,7 @@ static int client_initialize_io_events(sd_dhcp_client *client,
if (r < 0)
goto error;
- r = sd_event_source_set_name(client->receive_message,
- "dhcp4-receive-message");
+ r = sd_event_source_set_description(client->receive_message, "dhcp4-receive-message");
if (r < 0)
goto error;
@@ -832,8 +830,7 @@ static int client_initialize_time_events(sd_dhcp_client *client) {
r = sd_event_source_set_priority(client->timeout_resend,
client->event_priority);
- r = sd_event_source_set_name(client->timeout_resend,
- "dhcp4-resend-timer");
+ r = sd_event_source_set_description(client->timeout_resend, "dhcp4-resend-timer");
if (r < 0)
goto error;
@@ -1149,8 +1146,7 @@ static int client_set_lease_timeouts(sd_dhcp_client *client) {
if (r < 0)
return r;
- r = sd_event_source_set_name(client->timeout_expire,
- "dhcp4-lifetime");
+ r = sd_event_source_set_description(client->timeout_expire, "dhcp4-lifetime");
if (r < 0)
return r;
@@ -1177,8 +1173,7 @@ static int client_set_lease_timeouts(sd_dhcp_client *client) {
if (r < 0)
return r;
- r = sd_event_source_set_name(client->timeout_t2,
- "dhcp4-t2-timeout");
+ r = sd_event_source_set_description(client->timeout_t2, "dhcp4-t2-timeout");
if (r < 0)
return r;
@@ -1204,8 +1199,7 @@ static int client_set_lease_timeouts(sd_dhcp_client *client) {
if (r < 0)
return r;
- r = sd_event_source_set_name(client->timeout_t1,
- "dhcp4-t1-timer");
+ r = sd_event_source_set_description(client->timeout_t1, "dhcp4-t1-timer");
if (r < 0)
return r;
@@ -1250,8 +1244,7 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message,
if (r < 0)
goto error;
- r = sd_event_source_set_name(client->timeout_resend,
- "dhcp4-resend-timer");
+ r = sd_event_source_set_description(client->timeout_resend, "dhcp4-resend-timer");
if (r < 0)
goto error;
} else if (r == -ENOMSG)
diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index dbec1a2..8537d7c 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -590,8 +590,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec,
if (r < 0)
goto error;
- r = sd_event_source_set_name(client->timeout_resend,
- "dhcp6-resend-timer");
+ r = sd_event_source_set_description(client->timeout_resend, "dhcp6-resend-timer");
if (r < 0)
goto error;
@@ -614,8 +613,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec,
if (r < 0)
goto error;
- r = sd_event_source_set_name(client->timeout_resend_expire,
- "dhcp6-resend-expire-timer");
+ r = sd_event_source_set_description(client->timeout_resend_expire, "dhcp6-resend-expire-timer");
if (r < 0)
goto error;
}
@@ -1010,8 +1008,7 @@ static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
if (r < 0)
return r;
- r = sd_event_source_set_name(client->receive_message,
- "dhcp6-receive-message");
+ r = sd_event_source_set_description(client->receive_message, "dhcp6-receive-message");
if (r < 0)
return r;
@@ -1059,8 +1056,7 @@ static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
if (r < 0)
return r;
- r = sd_event_source_set_name(client->lease->ia.timeout_t1,
- "dhcp6-t1-timeout");
+ r = sd_event_source_set_description(client->lease->ia.timeout_t1, "dhcp6-t1-timeout");
if (r < 0)
return r;
@@ -1084,8 +1080,7 @@ static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
if (r < 0)
return r;
- r = sd_event_source_set_name(client->lease->ia.timeout_t2,
- "dhcp6-t2-timeout");
+ r = sd_event_source_set_description(client->lease->ia.timeout_t2, "dhcp6-t2-timeout");
if (r < 0)
return r;
@@ -1108,8 +1103,7 @@ static int client_start(sd_dhcp6_client *client, enum DHCP6State state)
if (r < 0)
return r;
- r = sd_event_source_set_name(client->timeout_resend,
- "dhcp6-resend-timeout");
+ r = sd_event_source_set_description(client->timeout_resend, "dhcp6-resend-timeout");
if (r < 0)
return r;
diff --git a/src/libsystemd-network/sd-icmp6-nd.c b/src/libsystemd-network/sd-icmp6-nd.c
index bbb4531..2473fbb 100644
--- a/src/libsystemd-network/sd-icmp6-nd.c
+++ b/src/libsystemd-network/sd-icmp6-nd.c
@@ -278,7 +278,7 @@ static int icmp6_router_solicitation_timeout(sd_event_source *s, uint64_t usec,
return 0;
}
- r = sd_event_source_set_name(nd->timeout, "icmp6-timeout");
+ r = sd_event_source_set_description(nd->timeout, "icmp6-timeout");
if (r < 0) {
icmp6_nd_notify(nd, r);
return 0;
@@ -328,7 +328,7 @@ int sd_icmp6_router_solicitation_start(sd_icmp6_nd *nd) {
if (r < 0)
goto error;
- r = sd_event_source_set_name(nd->recv, "icmp6-receive-message");
+ r = sd_event_source_set_description(nd->recv, "icmp6-receive-message");
if (r < 0)
goto error;
@@ -341,7 +341,7 @@ int sd_icmp6_router_solicitation_start(sd_icmp6_nd *nd) {
if (r < 0)
goto error;
- r = sd_event_source_set_name(nd->timeout, "icmp6-timeout");
+ r = sd_event_source_set_description(nd->timeout, "icmp6-timeout");
error:
if (r < 0)
icmp6_nd_init(nd);
diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c
index 8b24331..8626d4a 100644
--- a/src/libsystemd-network/sd-ipv4ll.c
+++ b/src/libsystemd-network/sd-ipv4ll.c
@@ -353,7 +353,7 @@ static void ipv4ll_run_state_machine(sd_ipv4ll *ll, IPv4LLTrigger trigger, void
if (r < 0)
goto out;
- r = sd_event_source_set_name(ll->timer, "ipv4ll-timer");
+ r = sd_event_source_set_description(ll->timer, "ipv4ll-timer");
if (r < 0)
goto out;
}
@@ -564,7 +564,7 @@ int sd_ipv4ll_start (sd_ipv4ll *ll) {
if (r < 0)
goto out;
- r = sd_event_source_set_name(ll->receive_message, "ipv4ll-receive-message");
+ r = sd_event_source_set_description(ll->receive_message, "ipv4ll-receive-message");
if (r < 0)
goto out;
@@ -581,7 +581,7 @@ int sd_ipv4ll_start (sd_ipv4ll *ll) {
if (r < 0)
goto out;
- r = sd_event_source_set_name(ll->timer, "ipv4ll-timer");
+ r = sd_event_source_set_description(ll->timer, "ipv4ll-timer");
out:
if (r < 0)
ipv4ll_stop(ll, IPV4LL_EVENT_STOP);
diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym.m4
index c32d8d9..04581c5 100644
--- a/src/libsystemd/libsystemd.sym.m4
+++ b/src/libsystemd/libsystemd.sym.m4
@@ -387,8 +387,8 @@ global:
sd_event_get_watchdog;
sd_event_source_ref;
sd_event_source_unref;
- sd_event_source_set_name;
- sd_event_source_get_name;
+ sd_event_source_set_description;
+ sd_event_source_get_description;
sd_event_source_set_prepare;
sd_event_source_get_pending;
sd_event_source_get_priority;
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 318cf6b..251720a 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -3015,7 +3015,7 @@ static int attach_io_events(sd_bus *bus) {
if (r < 0)
return r;
- r = sd_event_source_set_name(bus->input_io_event_source, "bus-input");
+ r = sd_event_source_set_description(bus->input_io_event_source, "bus-input");
} else
r = sd_event_source_set_io_fd(bus->input_io_event_source, bus->input_fd);
@@ -3034,7 +3034,7 @@ static int attach_io_events(sd_bus *bus) {
if (r < 0)
return r;
- r = sd_event_source_set_name(bus->input_io_event_source, "bus-output");
+ r = sd_event_source_set_description(bus->input_io_event_source, "bus-output");
} else
r = sd_event_source_set_io_fd(bus->output_io_event_source, bus->output_fd);
@@ -3087,7 +3087,7 @@ _public_ int sd_bus_attach_event(sd_bus *bus, sd_event *event, int priority) {
if (r < 0)
goto fail;
- r = sd_event_source_set_name(bus->time_event_source, "bus-time");
+ r = sd_event_source_set_description(bus->time_event_source, "bus-time");
if (r < 0)
goto fail;
@@ -3095,7 +3095,7 @@ _public_ int sd_bus_attach_event(sd_bus *bus, sd_event *event, int priority) {
if (r < 0)
goto fail;
- r = sd_event_source_set_name(bus->quit_event_source, "bus-exit");
+ r = sd_event_source_set_description(bus->quit_event_source, "bus-exit");
if (r < 0)
goto fail;
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 80a2ae9..f0356a4 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -66,7 +66,7 @@ struct sd_event_source {
void *userdata;
sd_event_handler_t prepare;
- char *name;
+ char *description;
EventSourceType type:5;
int enabled:3;
@@ -737,7 +737,7 @@ static void source_free(sd_event_source *s) {
assert(s);
source_disconnect(s);
- free(s->name);
+ free(s->description);
free(s);
}
@@ -1253,18 +1253,17 @@ _public_ sd_event_source* sd_event_source_unref(sd_event_source *s) {
return NULL;
}
-_public_ int sd_event_source_set_name(sd_event_source *s, const char *name) {
+_public_ int sd_event_source_set_description(sd_event_source *s, const char *description) {
assert_return(s, -EINVAL);
- return free_and_strdup(&s->name, name);
+ return free_and_strdup(&s->description, description);
}
-_public_ int sd_event_source_get_name(sd_event_source *s, const char **name) {
+_public_ int sd_event_source_get_description(sd_event_source *s, const char **description) {
assert_return(s, -EINVAL);
- assert_return(name, -EINVAL);
-
- *name = s->name;
+ assert_return(description, -EINVAL);
+ *description = s->description;
return 0;
}
@@ -2152,8 +2151,8 @@ static int source_dispatch(sd_event_source *s) {
s->dispatching = false;
if (r < 0) {
- if (s->name)
- log_debug("Event source '%s' returned error, disabling: %s", s->name, strerror(-r));
+ if (s->description)
+ log_debug("Event source '%s' returned error, disabling: %s", s->description, strerror(-r));
else
log_debug("Event source %p returned error, disabling: %s", s, strerror(-r));
}
@@ -2190,8 +2189,8 @@ static int event_prepare(sd_event *e) {
s->dispatching = false;
if (r < 0) {
- if (s->name)
- log_debug("Prepare callback of event source '%s' returned error, disabling: %s", s->name, strerror(-r));
+ if (s->description)
+ log_debug("Prepare callback of event source '%s' returned error, disabling: %s", s->description, strerror(-r));
else
log_debug("Prepare callback of event source %p returned error, disabling: %s", s, strerror(-r));
}
diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c
index b7f1afe..1af38f3 100644
--- a/src/libsystemd/sd-rtnl/sd-rtnl.c
+++ b/src/libsystemd/sd-rtnl/sd-rtnl.c
@@ -859,7 +859,7 @@ int sd_rtnl_attach_event(sd_rtnl *rtnl, sd_event *event, int priority) {
if (r < 0)
goto fail;
- r = sd_event_source_set_name(rtnl->io_event_source, "rtnl-receive-message");
+ r = sd_event_source_set_description(rtnl->io_event_source, "rtnl-receive-message");
if (r < 0)
goto fail;
@@ -875,7 +875,7 @@ int sd_rtnl_attach_event(sd_rtnl *rtnl, sd_event *event, int priority) {
if (r < 0)
goto fail;
- r = sd_event_source_set_name(rtnl->time_event_source, "rtnl-timer");
+ r = sd_event_source_set_description(rtnl->time_event_source, "rtnl-timer");
if (r < 0)
goto fail;
@@ -883,7 +883,7 @@ int sd_rtnl_attach_event(sd_rtnl *rtnl, sd_event *event, int priority) {
if (r < 0)
goto fail;
- r = sd_event_source_set_name(rtnl->exit_event_source, "rtnl-exit");
+ r = sd_event_source_set_description(rtnl->exit_event_source, "rtnl-exit");
if (r < 0)
goto fail;
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 2213ad7..2c8a330 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -368,7 +368,7 @@ int manager_udev_listen(Manager *m) {
if (r < 0)
return r;
- r = sd_event_source_set_name(m->udev_event_source, "networkd-udev");
+ r = sd_event_source_set_description(m->udev_event_source, "networkd-udev");
if (r < 0)
return r;
diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h
index 0dbdcdf..25a10f9 100644
--- a/src/systemd/sd-event.h
+++ b/src/systemd/sd-event.h
@@ -109,8 +109,8 @@ sd_event *sd_event_source_get_event(sd_event_source *s);
void* sd_event_source_get_userdata(sd_event_source *s);
void* sd_event_source_set_userdata(sd_event_source *s, void *userdata);
-int sd_event_source_set_name(sd_event_source *s, const char *name);
-int sd_event_source_get_name(sd_event_source *s, const char **name);
+int sd_event_source_set_description(sd_event_source *s, const char *description);
+int sd_event_source_get_description(sd_event_source *s, const char **description);
int sd_event_source_set_prepare(sd_event_source *s, sd_event_handler_t callback);
int sd_event_source_get_pending(sd_event_source *s);
int sd_event_source_get_priority(sd_event_source *s, int64_t *priority);
More information about the systemd-commits
mailing list