diff options
author | Lennart Poettering <lennart@poettering.net> | 2022-09-27 14:28:32 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2022-09-30 14:19:50 +0200 |
commit | 227e127943c477d9771f2c10a25cbc949a79d7ab (patch) | |
tree | 13180cdb1e9fc6daa4010843c944afed2c122537 | |
parent | sd-event: add helper for exiting event loop on SIGTERM/SIGINT (diff) | |
download | systemd-227e127943c477d9771f2c10a25cbc949a79d7ab.tar.xz systemd-227e127943c477d9771f2c10a25cbc949a79d7ab.zip |
resolved: rename 'notification' → 'monitor'
We expose this externally already as "monitor", name it internally the
same way. (Which is nice since it mirrors busctl monitor)
-rw-r--r-- | src/resolve/resolved-dns-query.c | 2 | ||||
-rw-r--r-- | src/resolve/resolved-manager.c | 2 | ||||
-rw-r--r-- | src/resolve/resolved-manager.h | 4 | ||||
-rw-r--r-- | src/resolve/resolved-varlink.c | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c index 50c0e05ca61..edd62fa0687 100644 --- a/src/resolve/resolved-dns-query.c +++ b/src/resolve/resolved-dns-query.c @@ -586,7 +586,7 @@ void dns_query_complete(DnsQuery *q, DnsTransactionState state) { q->state = state; if (q->question_utf8 && state == DNS_TRANSACTION_SUCCESS && set_size(q->manager->varlink_subscription) > 0) - (void) send_dns_notification(q->manager, q->answer, dns_question_first_name(q->question_utf8)); + (void) manager_monitor_send(q->manager, q->answer, dns_question_first_name(q->question_utf8)); dns_query_stop(q); if (q->complete) diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index dba75bda628..df3a3fff047 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -1043,7 +1043,7 @@ static int manager_ipv6_send( return sendmsg_loop(fd, &mh, 0); } -int send_dns_notification(Manager *m, DnsAnswer *answer, const char *query_name) { +int manager_monitor_send(Manager *m, DnsAnswer *answer, const char *query_name) { _cleanup_free_ char *normalized = NULL; DnsResourceRecord *rr; int ifindex, r; diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h index a55ac90b8ee..75cd4327242 100644 --- a/src/resolve/resolved-manager.h +++ b/src/resolve/resolved-manager.h @@ -148,7 +148,7 @@ struct Manager { Hashmap *polkit_registry; VarlinkServer *varlink_server; - VarlinkServer *varlink_notification_server; + VarlinkServer *varlink_monitor_server; Set *varlink_subscription; @@ -168,7 +168,7 @@ int manager_start(Manager *m); uint32_t manager_find_mtu(Manager *m); -int send_dns_notification(Manager *m, DnsAnswer *answer, const char *query_name); +int manager_monitor_send(Manager *m, DnsAnswer *answer, const char *query_name); int manager_write(Manager *m, int fd, DnsPacket *p); int manager_send(Manager *m, int fd, int ifindex, int family, const union in_addr_union *destination, uint16_t port, const union in_addr_union *source, DnsPacket *p); diff --git a/src/resolve/resolved-varlink.c b/src/resolve/resolved-varlink.c index 4d56e6b018f..1389737960c 100644 --- a/src/resolve/resolved-varlink.c +++ b/src/resolve/resolved-varlink.c @@ -556,13 +556,13 @@ static int vl_method_subscribe_dns_resolves(Varlink *link, JsonVariant *paramete return 1; } -static int varlink_notification_server_init(Manager *m) { +static int varlink_monitor_server_init(Manager *m) { _cleanup_(varlink_server_unrefp) VarlinkServer *server = NULL; int r; assert(m); - if (!m->enable_varlink_notifications || m->varlink_notification_server) + if (!m->enable_varlink_notifications || m->varlink_monitor_server) return 0; r = varlink_server_new(&server, VARLINK_SERVER_ROOT_ONLY); @@ -590,7 +590,7 @@ static int varlink_notification_server_init(Manager *m) { if (r < 0) return log_error_errno(r, "Failed to attach varlink connection to event loop: %m"); - m->varlink_notification_server = TAKE_PTR(server); + m->varlink_monitor_server = TAKE_PTR(server); return 0; } @@ -631,7 +631,7 @@ int manager_varlink_init(Manager *m) { m->varlink_server = TAKE_PTR(s); - r = varlink_notification_server_init(m); + r = varlink_monitor_server_init(m); if (r < 0) return r; @@ -642,5 +642,5 @@ void manager_varlink_done(Manager *m) { assert(m); m->varlink_server = varlink_server_unref(m->varlink_server); - m->varlink_notification_server = varlink_server_unref(m->varlink_notification_server); + m->varlink_monitor_server = varlink_server_unref(m->varlink_monitor_server); } |