From 7250273a5d1b2cfa3bb715171dc03bde366ea333 Mon Sep 17 00:00:00 2001 From: Jakob Olsson <jakob.olsson@iopsys.eu> Date: Thu, 24 Feb 2022 16:46:28 +0100 Subject: [PATCH] publish events under map.agent obj --- src/agent.c | 5 ++++- src/agent_map.c | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/agent.c b/src/agent.c index af95060e0..df3d6e7e1 100644 --- a/src/agent.c +++ b/src/agent.c @@ -263,6 +263,7 @@ static void wifiagent_log_steer(struct agent *a, info("steer: %s\n", ev); wifiagent_notify_event(a, "wifi.sta", ev); + wifiagent_notify_event(a, "map.agent", ev); } static void wifiagent_log_stainfo(struct agent *a, struct sta *s) @@ -298,7 +299,7 @@ static void wifiagent_log_stainfo(struct agent *a, struct sta *s) s->tx_fail_pkts, s->rx_fail_pkts); //trace("stainfo: %s\n", ev); - wifiagent_notify_event(a, "wifi.sta", ev); + wifiagent_notify_event(a, "map.agent", ev); } void wifiagent_log_cntlrinfo(struct agent *a) @@ -322,6 +323,7 @@ void wifiagent_log_cntlrinfo(struct agent *a) trace("cntlrinfo: %s\n", ev); wifiagent_notify_event(a, "wifi.agent", ev); + wifiagent_notify_event(a, "map.agent", ev); } // static @@ -1527,6 +1529,7 @@ static int cond_refresh_sta_neighbor_list(struct agent *a, struct sta *s) MAC2STR(s->macaddr), vif->name, s->rssi[0]); wifiagent_notify_event(a, "wifi.sta", ev); + wifiagent_notify_event(a, "map.agent", ev); /* s->inform_leaving = (s->inform_leaving + 1) % 3; */ s->wait_for_cntlr_nbr = true; diff --git a/src/agent_map.c b/src/agent_map.c index f910d652b..9e0212c14 100644 --- a/src/agent_map.c +++ b/src/agent_map.c @@ -1317,6 +1317,15 @@ void agent_autoconfig_event(struct agent *a, char *radio, char *status, agent_notify_event(a, "wifi.radio", data); + snprintf(data, sizeof(data), "{"\ + "\"radio\":\"%s\","\ + "\"event\":\"ap-autoconfiguration\","\ + "\"data\": {"\ + "\"status\":\"%s\","\ + "\"reason\":\"%s\""\ + "}"\ + "}", radio, status, reason); + agent_notify_event(a, "map.agent", data); } /* TODO: vlan bridge and logical ethernet interface names hardcoded for now */ -- GitLab