From: Lennart Poettering Date: Fri, 9 Jun 2023 19:45:31 +0000 (+0200) Subject: bus-util: add bus_property_get_string_set() helper X-Git-Tag: v254-rc1~232^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fefefcd573e7d72fbcd26f39faeca6ea229c20f7;p=thirdparty%2Fsystemd.git bus-util: add bus_property_get_string_set() helper This is a common implementation of a property getter for a Set of strings. --- diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 5581d2277aa..04070a7f1ef 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -930,24 +930,6 @@ static int property_get_load_credential( return sd_bus_message_close_container(reply); } -static int property_get_import_credential( - sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) { - - ExecContext *c = ASSERT_PTR(userdata); - - assert(bus); - assert(property); - assert(reply); - - return bus_message_append_string_set(reply, c->import_credentials); -} - static int property_get_root_hash( sd_bus *bus, const char *path, @@ -1301,7 +1283,7 @@ const sd_bus_vtable bus_exec_vtable[] = { SD_BUS_PROPERTY("SetCredentialEncrypted", "a(say)", property_get_set_credential, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("LoadCredential", "a(ss)", property_get_load_credential, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("LoadCredentialEncrypted", "a(ss)", property_get_load_credential, 0, SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_PROPERTY("ImportCredential", "as", property_get_import_credential, 0, SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("ImportCredential", "as", bus_property_get_string_set, offsetof(ExecContext, import_credentials), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("SupplementaryGroups", "as", NULL, offsetof(ExecContext, supplementary_groups), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("PAMName", "s", NULL, offsetof(ExecContext, pam_name), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("ReadWritePaths", "as", NULL, offsetof(ExecContext, read_write_paths), SD_BUS_VTABLE_PROPERTY_CONST), diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index 3420ebe8c01..334ae8dcff5 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -1677,22 +1677,6 @@ static int bus_property_get_dnssec_statistics( (uint64_t) m->n_dnssec_verdict[DNSSEC_INDETERMINATE]); } -static int bus_property_get_ntas( - sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) { - - Manager *m = ASSERT_PTR(userdata); - - assert(reply); - - return bus_message_append_string_set(reply, m->trust_anchor.negative_by_name); -} - static BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_dns_stub_listener_mode, dns_stub_listener_mode, DnsStubListenerMode); static BUS_DEFINE_PROPERTY_GET(bus_property_get_dnssec_supported, "b", Manager, manager_dnssec_supported); static BUS_DEFINE_PROPERTY_GET2(bus_property_get_dnssec_mode, "s", Manager, manager_get_dnssec_mode, dnssec_mode_to_string); @@ -2090,7 +2074,7 @@ static const sd_bus_vtable resolve_vtable[] = { SD_BUS_PROPERTY("DNSSEC", "s", bus_property_get_dnssec_mode, 0, 0), SD_BUS_PROPERTY("DNSSECStatistics", "(tttt)", bus_property_get_dnssec_statistics, 0, 0), SD_BUS_PROPERTY("DNSSECSupported", "b", bus_property_get_dnssec_supported, 0, 0), - SD_BUS_PROPERTY("DNSSECNegativeTrustAnchors", "as", bus_property_get_ntas, 0, 0), + SD_BUS_PROPERTY("DNSSECNegativeTrustAnchors", "as", bus_property_get_string_set, offsetof(Manager, trust_anchor.negative_by_name), 0), SD_BUS_PROPERTY("DNSStubListener", "s", bus_property_get_dns_stub_listener_mode, offsetof(Manager, dns_stub_listener_mode), 0), SD_BUS_PROPERTY("ResolvConfMode", "s", bus_property_get_resolv_conf_mode, 0, 0), diff --git a/src/resolve/resolved-link-bus.c b/src/resolve/resolved-link-bus.c index 06a4bd4291c..4f8f591306c 100644 --- a/src/resolve/resolved-link-bus.c +++ b/src/resolve/resolved-link-bus.c @@ -207,22 +207,6 @@ static int property_get_scopes_mask( return sd_bus_message_append(reply, "t", mask); } -static int property_get_ntas( - sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) { - - Link *l = ASSERT_PTR(userdata); - - assert(reply); - - return bus_message_append_string_set(reply, l->dnssec_negative_trust_anchors); -} - static int verify_unmanaged_link(Link *l, sd_bus_error *error) { assert(l); @@ -858,7 +842,7 @@ static const sd_bus_vtable link_vtable[] = { SD_BUS_PROPERTY("MulticastDNS", "s", property_get_mdns_support, 0, 0), SD_BUS_PROPERTY("DNSOverTLS", "s", property_get_dns_over_tls_mode, 0, 0), SD_BUS_PROPERTY("DNSSEC", "s", property_get_dnssec_mode, 0, 0), - SD_BUS_PROPERTY("DNSSECNegativeTrustAnchors", "as", property_get_ntas, 0, 0), + SD_BUS_PROPERTY("DNSSECNegativeTrustAnchors", "as", bus_property_get_string_set, offsetof(Link, dnssec_negative_trust_anchors), 0), SD_BUS_PROPERTY("DNSSECSupported", "b", property_get_dnssec_supported, 0, 0), SD_BUS_METHOD_WITH_ARGS("SetDNS", diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 4a48200f7fc..d4c91fa3aab 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -697,3 +697,21 @@ int bus_message_append_string_set(sd_bus_message *m, Set *set) { return sd_bus_message_close_container(m); } + +int bus_property_get_string_set( + sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { + + Set **s = ASSERT_PTR(userdata); + + assert(bus); + assert(property); + assert(reply); + + return bus_message_append_string_set(reply, *s); +} diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h index 7acd105cbbc..869c639aeb4 100644 --- a/src/shared/bus-util.h +++ b/src/shared/bus-util.h @@ -71,3 +71,5 @@ int bus_register_malloc_status(sd_bus *bus, const char *destination); extern const struct hash_ops bus_message_hash_ops; int bus_message_append_string_set(sd_bus_message *m, Set *s); + +int bus_property_get_string_set(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);