From ea43234c868e4136d900f35a19aaedcfd9f96c70 Mon Sep 17 00:00:00 2001 From: Etan Kissling Date: Tue, 10 Aug 2021 21:15:09 +0100 Subject: [PATCH] There was a `notify` variable to keep track whether a subscriber is observing our UBus object. However, it was not properly cleaned up in `ubus_destroy`, potentially becoming stale over UBus reconnections. The variable was removed and the current state is examined when sending notifications, similarly as is done in other existing OpenWrt code. Signed-off-by: Etan Kissling --- src/ubus.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ubus.c b/src/ubus.c index 4d63006..eb44eb4 100644 --- a/src/ubus.c +++ b/src/ubus.c @@ -21,7 +21,6 @@ #include static struct blob_buf b; -static int notify; static int error_logged = 0; static int ubus_handle_metrics(struct ubus_context *ctx, struct ubus_object *obj, @@ -78,7 +77,6 @@ static void ubus_subscribe_cb(struct ubus_context *ctx, struct ubus_object *obj) (void)ctx; my_syslog(LOG_DEBUG, _("UBus subscription callback: %s subscriber(s)"), obj->has_subscribers ? "1" : "0"); - notify = obj->has_subscribers; } static void ubus_destroy(struct ubus_context *ubus) @@ -312,7 +310,7 @@ void ubus_event_bcast(const char *type, const char *mac, const char *ip, const c struct ubus_context *ubus = (struct ubus_context *)daemon->ubus; int ret; - if (!ubus || !notify) + if (!ubus || !ubus_object.has_subscribers) return; blob_buf_init(&b, BLOBMSG_TYPE_TABLE); @@ -336,7 +334,7 @@ void ubus_event_bcast_connmark_allowlist_refused(u32 mark, const char *name) struct ubus_context *ubus = (struct ubus_context *)daemon->ubus; int ret; - if (!ubus || !notify) + if (!ubus || !ubus_object.has_subscribers) return; blob_buf_init(&b, 0); @@ -353,7 +351,7 @@ void ubus_event_bcast_connmark_allowlist_resolved(u32 mark, const char *name, co struct ubus_context *ubus = (struct ubus_context *)daemon->ubus; int ret; - if (!ubus || !notify) + if (!ubus || !ubus_object.has_subscribers) return; blob_buf_init(&b, 0);