morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

sd-bus/bus-track: use install_callback in sd_bus_track_add_name()

Browse Source 
Previously we didn't provide any install_callback to
sd_bus_add_match_async() so in case AddMatch() method call timed out we
destroyed the bus connection. This seems overly aggressive and simply
updating the sd_bus_track object accordingly should be enough.

Follow-up for 37ce3fd2b7.

Fixes #32381
This commit is contained in:
Michal Sekletar
2025-07-31 18:26:09 +02:00
committed by Luca Boccassi
parent d05a077f16
commit dcf42d1ee2
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/libsystemd/sd-bus/bus-track.c
View File

@@ -3,6 +3,7 @@
#include "sd-bus.h"
#include "alloc-util.h"
#include "bus-error.h"
#include "bus-internal.h"
#include "bus-track.h"
#include "hashmap.h"
@@ -13,6 +14,7 @@ typedef struct BusTrackItem {
unsigned n_ref;
char *name;
sd_bus_slot *slot;
sd_bus_track *track;
} BusTrackItem;
struct sd_bus_track {
@@ -166,17 +168,38 @@ static sd_bus_track* track_free(sd_bus_track *track) {
DEFINE_PUBLIC_TRIVIAL_REF_UNREF_FUNC(sd_bus_track, sd_bus_track, track_free);
static int on_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *reterr_error) {
sd_bus_track *track = ASSERT_PTR(userdata);
BusTrackItem *item = ASSERT_PTR(userdata);
const char *name;
int r;
assert(message);
assert(item->track);
r = sd_bus_message_read(message, "sss", &name, NULL, NULL);
if (r < 0)
return 0;
bus_track_remove_name_fully(track, name);
bus_track_remove_name_fully(item->track, name);
return 0;
}
static int name_owner_changed_install_callback(sd_bus_message *message, void *userdata, sd_bus_error *reterr_error) {
BusTrackItem *item = ASSERT_PTR(userdata);
const sd_bus_error *e;
int r;
assert(message);
assert(item->track);
assert(item->name);
e = sd_bus_message_get_error(message);
if (!e)
return 0;
r = sd_bus_error_get_errno(e);
log_debug_errno(r, "Failed to install match for tracking name '%s': %s", item->name, bus_error_message(e, r));
bus_track_remove_name_fully(item->track, item->name);
return 0;
}
@@ -218,6 +241,7 @@ _public_ int sd_bus_track_add_name(sd_bus_track *track, const char *name) {
*n = (BusTrackItem) {
.n_ref = 1,
.track = track,
};
n->name = strdup(name);
@@ -229,7 +253,7 @@ _public_ int sd_bus_track_add_name(sd_bus_track *track, const char *name) {
bus_track_remove_from_queue(track); /* don't dispatch this while we work in it */
r = sd_bus_add_match_async(track->bus, &n->slot, match, on_name_owner_changed, NULL, track);
r = sd_bus_add_match_async(track->bus, &n->slot, match, on_name_owner_changed, name_owner_changed_install_callback, n);
if (r < 0) {
bus_track_add_to_queue(track);
return r;