proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-25 22:00:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mgmtd: convert MGMT_BE_ADAPTER_DBG() to __dbg()

Browse Source 
Signed-off-by: Christian Hopps <chopps@labn.net>
This commit is contained in:
Christian Hopps 2024-01-31 19:50:23 -05:00
parent ef305e8993
commit fb8dc955b1
1 changed files with 64 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
mgmtd/mgmt_be_adapter.c
View File

@ -22,9 +22,9 @@
#include "mgmt_be_client.h" #include "mgmt_be_client.h"
#include "mgmtd/mgmt_be_adapter.h" #include "mgmtd/mgmt_be_adapter.h"
#define MGMTD_BE_ADAPTER_DBG(fmt, ...) \ #define __dbg(fmt, ...) \
DEBUGD(&mgmt_debug_be, "BE-ADAPTER: %s: " fmt, __func__, ##__VA_ARGS__) DEBUGD(&mgmt_debug_be, "BE-ADAPTER: %s: " fmt, __func__, ##__VA_ARGS__)
#define MGMTD_BE_ADAPTER_ERR(fmt, ...) \ #define __log_err(fmt, ...) \
zlog_err("BE-ADAPTER: %s: ERROR: " fmt, __func__, ##__VA_ARGS__) zlog_err("BE-ADAPTER: %s: ERROR: " fmt, __func__, ##__VA_ARGS__)
#define FOREACH_ADAPTER_IN_LIST(adapter) \ #define FOREACH_ADAPTER_IN_LIST(adapter) \
@ -252,26 +252,24 @@ static void mgmt_be_xpath_map_init(void)
enum mgmt_be_client_id id; enum mgmt_be_client_id id;
const char *const *init; const char *const *init;
MGMTD_BE_ADAPTER_DBG("Init XPath Maps"); __dbg("Init XPath Maps");
FOREACH_MGMTD_BE_CLIENT_ID (id) { FOREACH_MGMTD_BE_CLIENT_ID (id) {
/* Initialize the common config init map */ /* Initialize the common config init map */
for (init = be_client_config_xpaths[id]; init && *init; init++) { for (init = be_client_config_xpaths[id]; init && *init; init++) {
MGMTD_BE_ADAPTER_DBG(" - CFG XPATH: '%s'", *init); __dbg(" - CFG XPATH: '%s'", *init);
mgmt_register_client_xpath(id, *init, true, false); mgmt_register_client_xpath(id, *init, true, false);
} }
/* Initialize the common oper init map */ /* Initialize the common oper init map */
for (init = be_client_oper_xpaths[id]; init && *init; init++) { for (init = be_client_oper_xpaths[id]; init && *init; init++) {
MGMTD_BE_ADAPTER_DBG(" - OPER XPATH: '%s'", *init); __dbg(" - OPER XPATH: '%s'", *init);
mgmt_register_client_xpath(id, *init, false, true); mgmt_register_client_xpath(id, *init, false, true);
} }
} }
MGMTD_BE_ADAPTER_DBG("Total Cfg XPath Maps: %u", __dbg("Total Cfg XPath Maps: %u", darr_len(be_cfg_xpath_map));
darr_len(be_cfg_xpath_map)); __dbg("Total Oper XPath Maps: %u", darr_len(be_oper_xpath_map));
MGMTD_BE_ADAPTER_DBG("Total Oper XPath Maps: %u",
darr_len(be_oper_xpath_map));
} }
static void mgmt_be_xpath_map_cleanup(void) static void mgmt_be_xpath_map_cleanup(void)
@ -319,7 +317,7 @@ static bool mgmt_be_xpath_prefix(const char *path, const char *xpath)
static void mgmt_be_adapter_delete(struct mgmt_be_client_adapter *adapter) static void mgmt_be_adapter_delete(struct mgmt_be_client_adapter *adapter)
{ {
MGMTD_BE_ADAPTER_DBG("deleting client adapter '%s'", adapter->name); __dbg("deleting client adapter '%s'", adapter->name);
/* /*
* Notify about disconnect for appropriate cleanup * Notify about disconnect for appropriate cleanup
@ -338,8 +336,7 @@ static int mgmt_be_adapter_notify_disconnect(struct msg_conn *conn)
{ {
struct mgmt_be_client_adapter *adapter = conn->user; struct mgmt_be_client_adapter *adapter = conn->user;
MGMTD_BE_ADAPTER_DBG("notify disconnect for client adapter '%s'", __dbg("notify disconnect for client adapter '%s'", adapter->name);
adapter->name);
mgmt_be_adapter_delete(adapter); mgmt_be_adapter_delete(adapter);
@ -357,10 +354,8 @@ mgmt_be_adapter_cleanup_old_conn(struct mgmt_be_client_adapter *adapter)
/* /*
* We have a Zombie lingering around * We have a Zombie lingering around
*/ */
MGMTD_BE_ADAPTER_DBG( __dbg("Client '%s' (FD:%d) seems to have reconnected. Removing old connection (FD:%d)!",
"Client '%s' (FD:%d) seems to have reconnected. Removing old connection (FD:%d)!", adapter->name, adapter->conn->fd, old->conn->fd);
adapter->name, adapter->conn->fd,
old->conn->fd);
/* this will/should delete old */ /* this will/should delete old */
msg_conn_disconnect(old->conn, false); msg_conn_disconnect(old->conn, false);
} }
@ -389,8 +384,8 @@ static int mgmt_be_send_subscr_reply(struct mgmt_be_client_adapter *adapter,
be_msg.message_case = MGMTD__BE_MESSAGE__MESSAGE_SUBSCR_REPLY; be_msg.message_case = MGMTD__BE_MESSAGE__MESSAGE_SUBSCR_REPLY;
be_msg.subscr_reply = &reply; be_msg.subscr_reply = &reply;
MGMTD_BE_CLIENT_DBG("Sending SUBSCR_REPLY client: %s sucess: %u", __dbg("Sending SUBSCR_REPLY client: %s sucess: %u", adapter->name,
adapter->name, success); success);
return mgmt_be_adapter_send_msg(adapter, &be_msg); return mgmt_be_adapter_send_msg(adapter, &be_msg);
} }
@ -408,20 +403,19 @@ mgmt_be_adapter_handle_msg(struct mgmt_be_client_adapter *adapter,
*/ */
switch ((int)be_msg->message_case) { switch ((int)be_msg->message_case) {
case MGMTD__BE_MESSAGE__MESSAGE_SUBSCR_REQ: case MGMTD__BE_MESSAGE__MESSAGE_SUBSCR_REQ:
MGMTD_BE_ADAPTER_DBG("Got SUBSCR_REQ from '%s' to register xpaths config: %zu oper: %zu notif: %zu", __dbg("Got SUBSCR_REQ from '%s' to register xpaths config: %zu oper: %zu notif: %zu",
be_msg->subscr_req->client_name, be_msg->subscr_req->client_name,
be_msg->subscr_req->n_config_xpaths, be_msg->subscr_req->n_config_xpaths,
be_msg->subscr_req->n_oper_xpaths, be_msg->subscr_req->n_oper_xpaths,
be_msg->subscr_req->n_notif_xpaths); be_msg->subscr_req->n_notif_xpaths);
if (strlen(be_msg->subscr_req->client_name)) { if (strlen(be_msg->subscr_req->client_name)) {
strlcpy(adapter->name, be_msg->subscr_req->client_name, strlcpy(adapter->name, be_msg->subscr_req->client_name,
sizeof(adapter->name)); sizeof(adapter->name));
adapter->id = mgmt_be_client_name2id(adapter->name); adapter->id = mgmt_be_client_name2id(adapter->name);
if (adapter->id >= MGMTD_BE_CLIENT_ID_MAX) { if (adapter->id >= MGMTD_BE_CLIENT_ID_MAX) {
MGMTD_BE_ADAPTER_ERR( __log_err("Unable to resolve adapter '%s' to a valid ID. Disconnecting!",
"Unable to resolve adapter '%s' to a valid ID. Disconnecting!", adapter->name);
adapter->name);
/* this will/should delete old */ /* this will/should delete old */
msg_conn_disconnect(adapter->conn, false); msg_conn_disconnect(adapter->conn, false);
break; break;
@ -457,12 +451,10 @@ mgmt_be_adapter_handle_msg(struct mgmt_be_client_adapter *adapter,
mgmt_be_send_subscr_reply(adapter, true); mgmt_be_send_subscr_reply(adapter, true);
break; break;
case MGMTD__BE_MESSAGE__MESSAGE_TXN_REPLY: case MGMTD__BE_MESSAGE__MESSAGE_TXN_REPLY:
MGMTD_BE_ADAPTER_DBG( __dbg("Got %s TXN_REPLY from '%s' txn-id %" PRIx64 " with '%s'",
"Got %s TXN_REPLY from '%s' txn-id %" PRIx64 be_msg->txn_reply->create ? "Create" : "Delete",
" with '%s'", adapter->name, be_msg->txn_reply->txn_id,
be_msg->txn_reply->create ? "Create" : "Delete", be_msg->txn_reply->success ? "success" : "failure");
adapter->name, be_msg->txn_reply->txn_id,
be_msg->txn_reply->success ? "success" : "failure");
/* /*
* Forward the TXN_REPLY to txn module. * Forward the TXN_REPLY to txn module.
*/ */
@ -472,13 +464,11 @@ mgmt_be_adapter_handle_msg(struct mgmt_be_client_adapter *adapter,
be_msg->txn_reply->success, adapter); be_msg->txn_reply->success, adapter);
break; break;
case MGMTD__BE_MESSAGE__MESSAGE_CFG_DATA_REPLY: case MGMTD__BE_MESSAGE__MESSAGE_CFG_DATA_REPLY:
MGMTD_BE_ADAPTER_DBG( __dbg("Got CFGDATA_REPLY from '%s' txn-id %" PRIx64 " err:'%s'",
"Got CFGDATA_REPLY from '%s' txn-id %" PRIx64 adapter->name, be_msg->cfg_data_reply->txn_id,
" err:'%s'", adapter->name, be_msg->cfg_data_reply->error_if_any
be_msg->cfg_data_reply->txn_id, ? be_msg->cfg_data_reply->error_if_any
be_msg->cfg_data_reply->error_if_any : "None");
? be_msg->cfg_data_reply->error_if_any
: "None");
/* /*
* Forward the CGFData-create reply to txn module. * Forward the CGFData-create reply to txn module.
*/ */
@ -488,15 +478,13 @@ mgmt_be_adapter_handle_msg(struct mgmt_be_client_adapter *adapter,
be_msg->cfg_data_reply->error_if_any, adapter); be_msg->cfg_data_reply->error_if_any, adapter);
break; break;
case MGMTD__BE_MESSAGE__MESSAGE_CFG_APPLY_REPLY: case MGMTD__BE_MESSAGE__MESSAGE_CFG_APPLY_REPLY:
MGMTD_BE_ADAPTER_DBG( __dbg("Got %s CFG_APPLY_REPLY from '%s' txn-id %" PRIx64
"Got %s CFG_APPLY_REPLY from '%s' txn-id %" PRIx64 " err:'%s'",
" err:'%s'", be_msg->cfg_apply_reply->success ? "successful" : "failed",
be_msg->cfg_apply_reply->success ? "successful" adapter->name, be_msg->cfg_apply_reply->txn_id,
: "failed", be_msg->cfg_apply_reply->error_if_any
adapter->name, be_msg->cfg_apply_reply->txn_id, ? be_msg->cfg_apply_reply->error_if_any
be_msg->cfg_apply_reply->error_if_any : "None");
? be_msg->cfg_apply_reply->error_if_any
: "None");
/* /*
* Forward the CGFData-apply reply to txn module. * Forward the CGFData-apply reply to txn module.
*/ */
@ -541,8 +529,7 @@ int mgmt_be_send_txn_req(struct mgmt_be_client_adapter *adapter,
be_msg.message_case = MGMTD__BE_MESSAGE__MESSAGE_TXN_REQ; be_msg.message_case = MGMTD__BE_MESSAGE__MESSAGE_TXN_REQ;
be_msg.txn_req = &txn_req; be_msg.txn_req = &txn_req;
MGMTD_BE_ADAPTER_DBG("Sending TXN_REQ to '%s' txn-id: %" PRIu64, __dbg("Sending TXN_REQ to '%s' txn-id: %" PRIu64, adapter->name, txn_id);
adapter->name, txn_id);
return mgmt_be_adapter_send_msg(adapter, &be_msg); return mgmt_be_adapter_send_msg(adapter, &be_msg);
} }
@ -565,10 +552,8 @@ int mgmt_be_send_cfgdata_req(struct mgmt_be_client_adapter *adapter,
be_msg.message_case = MGMTD__BE_MESSAGE__MESSAGE_CFG_DATA_REQ; be_msg.message_case = MGMTD__BE_MESSAGE__MESSAGE_CFG_DATA_REQ;
be_msg.cfg_data_req = &cfgdata_req; be_msg.cfg_data_req = &cfgdata_req;
MGMTD_BE_ADAPTER_DBG( __dbg("Sending CFGDATA_CREATE_REQ to '%s' txn-id: %" PRIu64 " last: %s",
"Sending CFGDATA_CREATE_REQ to '%s' txn-id: %" PRIu64 adapter->name, txn_id, end_of_data ? "yes" : "no");
" last: %s",
adapter->name, txn_id, end_of_data ? "yes" : "no");
return mgmt_be_adapter_send_msg(adapter, &be_msg); return mgmt_be_adapter_send_msg(adapter, &be_msg);
} }
@ -586,8 +571,8 @@ int mgmt_be_send_cfgapply_req(struct mgmt_be_client_adapter *adapter,
be_msg.message_case = MGMTD__BE_MESSAGE__MESSAGE_CFG_APPLY_REQ; be_msg.message_case = MGMTD__BE_MESSAGE__MESSAGE_CFG_APPLY_REQ;
be_msg.cfg_apply_req = &apply_req; be_msg.cfg_apply_req = &apply_req;
MGMTD_BE_ADAPTER_DBG("Sending CFG_APPLY_REQ to '%s' txn-id: %" PRIu64, __dbg("Sending CFG_APPLY_REQ to '%s' txn-id: %" PRIu64, adapter->name,
adapter->name, txn_id); txn_id);
return mgmt_be_adapter_send_msg(adapter, &be_msg); return mgmt_be_adapter_send_msg(adapter, &be_msg);
} }
@ -646,8 +631,8 @@ static void be_adapter_handle_native_msg(struct mgmt_be_client_adapter *adapter,
switch (msg->code) { switch (msg->code) {
case MGMT_MSG_CODE_ERROR: case MGMT_MSG_CODE_ERROR:
error_msg = (typeof(error_msg))msg; error_msg = (typeof(error_msg))msg;
MGMTD_BE_ADAPTER_DBG("Got ERROR from '%s' txn-id %" PRIx64, __dbg("Got ERROR from '%s' txn-id %" PRIx64, adapter->name,
adapter->name, msg->refer_id); msg->refer_id);
/* Forward the reply to the txn module */ /* Forward the reply to the txn module */
mgmt_txn_notify_error(adapter, msg->refer_id, msg->req_id, mgmt_txn_notify_error(adapter, msg->refer_id, msg->req_id,
@ -657,24 +642,23 @@ static void be_adapter_handle_native_msg(struct mgmt_be_client_adapter *adapter,
case MGMT_MSG_CODE_TREE_DATA: case MGMT_MSG_CODE_TREE_DATA:
/* tree data from a backend client */ /* tree data from a backend client */
tree_msg = (typeof(tree_msg))msg; tree_msg = (typeof(tree_msg))msg;
MGMTD_BE_ADAPTER_DBG("Got TREE_DATA from '%s' txn-id %" PRIx64, __dbg("Got TREE_DATA from '%s' txn-id %" PRIx64, adapter->name,
adapter->name, msg->refer_id); msg->refer_id);
/* Forward the reply to the txn module */ /* Forward the reply to the txn module */
mgmt_txn_notify_tree_data_reply(adapter, tree_msg, msg_len); mgmt_txn_notify_tree_data_reply(adapter, tree_msg, msg_len);
break; break;
case MGMT_MSG_CODE_NOTIFY: case MGMT_MSG_CODE_NOTIFY:
notify_msg = (typeof(notify_msg))msg; notify_msg = (typeof(notify_msg))msg;
MGMTD_BE_ADAPTER_DBG("Got NOTIFY from '%s'", adapter->name); __dbg("Got NOTIFY from '%s'", adapter->name);
mgmt_be_adapter_send_notify(notify_msg, msg_len); mgmt_be_adapter_send_notify(notify_msg, msg_len);
mgmt_fe_adapter_send_notify(notify_msg, msg_len); mgmt_fe_adapter_send_notify(notify_msg, msg_len);
break; break;
default: default:
MGMTD_BE_ADAPTER_ERR("unknown native message txn-id %" PRIu64 __log_err("unknown native message txn-id %" PRIu64
" req-id %" PRIu64 " req-id %" PRIu64
" code %u from BE client for adapter %s", " code %u from BE client for adapter %s",
msg->refer_id, msg->req_id, msg->code, msg->refer_id, msg->req_id, msg->code, adapter->name);
adapter->name);
break; break;
} }
} }
@ -692,20 +676,19 @@ static void mgmt_be_adapter_process_msg(uint8_t version, uint8_t *data,
if (len >= sizeof(*msg)) if (len >= sizeof(*msg))
be_adapter_handle_native_msg(adapter, msg, len); be_adapter_handle_native_msg(adapter, msg, len);
else else
MGMTD_BE_ADAPTER_ERR("native message to adapter %s too short %zu", __log_err("native message to adapter %s too short %zu",
adapter->name, len); adapter->name, len);
return; return;
} }
be_msg = mgmtd__be_message__unpack(NULL, len, data); be_msg = mgmtd__be_message__unpack(NULL, len, data);
if (!be_msg) { if (!be_msg) {
MGMTD_BE_ADAPTER_DBG( __dbg("Failed to decode %zu bytes for adapter: %s", len,
"Failed to decode %zu bytes for adapter: %s", len, adapter->name);
adapter->name);
return; return;
} }
MGMTD_BE_ADAPTER_DBG("Decoded %zu bytes of message: %u for adapter: %s", __dbg("Decoded %zu bytes of message: %u for adapter: %s", len,
len, be_msg->message_case, adapter->name); be_msg->message_case, adapter->name);
(void)mgmt_be_adapter_handle_msg(adapter, be_msg); (void)mgmt_be_adapter_handle_msg(adapter, be_msg);
mgmtd__be_message__free_unpacked(be_msg, NULL); mgmtd__be_message__free_unpacked(be_msg, NULL);
} }
@ -839,8 +822,7 @@ struct msg_conn *mgmt_be_create_adapter(int conn_fd, union sockunion *from)
adapter->conn->debug = DEBUG_MODE_CHECK(&mgmt_debug_be, DEBUG_MODE_ALL); adapter->conn->debug = DEBUG_MODE_CHECK(&mgmt_debug_be, DEBUG_MODE_ALL);
MGMTD_BE_ADAPTER_DBG("Added new MGMTD Backend adapter '%s'", __dbg("Added new MGMTD Backend adapter '%s'", adapter->name);
adapter->name);
return adapter->conn; return adapter->conn;
} }
@ -907,15 +889,15 @@ uint64_t mgmt_be_interested_clients(const char *xpath, bool config)
clients = 0; clients = 0;
MGMTD_BE_ADAPTER_DBG("XPATH: '%s'", xpath); __dbg("XPATH: '%s'", xpath);
darr_foreach_p (maps, map) darr_foreach_p (maps, map)
if (mgmt_be_xpath_prefix(map->xpath_prefix, xpath)) if (mgmt_be_xpath_prefix(map->xpath_prefix, xpath))
clients |= map->clients; clients |= map->clients;
if (DEBUG_MODE_CHECK(&mgmt_debug_be, DEBUG_MODE_ALL)) { if (DEBUG_MODE_CHECK(&mgmt_debug_be, DEBUG_MODE_ALL)) {
FOREACH_BE_CLIENT_BITS (id, clients) FOREACH_BE_CLIENT_BITS (id, clients)
MGMTD_BE_ADAPTER_DBG("Cient: %s: subscribed", __dbg("Cient: %s: subscribed",
mgmt_be_client_id2name(id)); mgmt_be_client_id2name(id));
} }
return clients; return clients;
} }
@ -939,23 +921,21 @@ static bool be_is_client_interested(const char *xpath,
assert(id < MGMTD_BE_CLIENT_ID_MAX); assert(id < MGMTD_BE_CLIENT_ID_MAX);
MGMTD_BE_ADAPTER_DBG("Checking client: %s for xpath: '%s'", __dbg("Checking client: %s for xpath: '%s'", mgmt_be_client_id2name(id),
mgmt_be_client_id2name(id), xpath); xpath);
xpaths = config ? be_client_config_xpaths[id] xpaths = config ? be_client_config_xpaths[id]
: be_client_oper_xpaths[id]; : be_client_oper_xpaths[id];
if (xpaths) { if (xpaths) {
for (; *xpaths; xpaths++) { for (; *xpaths; xpaths++) {
if (mgmt_be_xpath_prefix(*xpaths, xpath)) { if (mgmt_be_xpath_prefix(*xpaths, xpath)) {
MGMTD_BE_ADAPTER_DBG("xpath: %s: matched: %s", __dbg("xpath: %s: matched: %s", *xpaths, xpath);
*xpaths, xpath);
return true; return true;
} }
} }
} }
MGMTD_BE_ADAPTER_DBG("client: %s: not interested", __dbg("client: %s: not interested", mgmt_be_client_id2name(id));
mgmt_be_client_id2name(id));
return false; return false;
} }