matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib, mgmtd: fix wrong mgmtd socket paths

Browse source 
These paths were ignoring the `-N` namespacing option.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2024-01-24 21:17:13 +01:00
parent 42eeea090e
commit 0d5a2497ca
6 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -2740,8 +2740,6 @@ AC_DEFINE_UNQUOTED([LDPD_SOCKET], ["$CFG_STATE%s%s/ldpd.sock"], [ldpd control so
AC_DEFINE_UNQUOTED([ZEBRA_SERV_PATH], ["$CFG_STATE%s%s/zserv.api"], [zebra api socket]) AC_DEFINE_UNQUOTED([ZEBRA_SERV_PATH], ["$CFG_STATE%s%s/zserv.api"], [zebra api socket])
AC_DEFINE_UNQUOTED([BFDD_CONTROL_SOCKET], ["$CFG_STATE%s%s/bfdd.sock"], [bfdd control socket]) AC_DEFINE_UNQUOTED([BFDD_CONTROL_SOCKET], ["$CFG_STATE%s%s/bfdd.sock"], [bfdd control socket])
AC_DEFINE_UNQUOTED([OSPFD_GR_STATE], ["$CFG_STATE%s/ospfd-gr.json"], [ospfd GR state information]) AC_DEFINE_UNQUOTED([OSPFD_GR_STATE], ["$CFG_STATE%s/ospfd-gr.json"], [ospfd GR state information])
AC_DEFINE_UNQUOTED([MGMTD_FE_SERVER_PATH], ["$CFG_STATE/mgmtd_fe.sock"], [mgmtd frontend server socket])
AC_DEFINE_UNQUOTED([MGMTD_BE_SERVER_PATH], ["$CFG_STATE/mgmtd_be.sock"], [mgmtd backend server socket])
AC_DEFINE_UNQUOTED([OSPF6D_GR_STATE], ["$CFG_STATE/ospf6d-gr.json"], [ospf6d GR state information]) AC_DEFINE_UNQUOTED([OSPF6D_GR_STATE], ["$CFG_STATE/ospf6d-gr.json"], [ospf6d GR state information])
AC_DEFINE_UNQUOTED([ISISD_RESTART], ["$CFG_STATE%s/isid-restart.json"], [isisd restart information]) AC_DEFINE_UNQUOTED([ISISD_RESTART], ["$CFG_STATE%s/isid-restart.json"], [isisd restart information])
AC_DEFINE_UNQUOTED([OSPF6_AUTH_SEQ_NUM_FILE], ["$CFG_STATE/ospf6d-at-seq-no.dat"], [ospf6d AT Sequence number information]) AC_DEFINE_UNQUOTED([OSPF6_AUTH_SEQ_NUM_FILE], ["$CFG_STATE/ospf6d-at-seq-no.dat"], [ospf6d AT Sequence number information])

6
lib/mgmt_be_client.c
View file

@ -1055,6 +1055,7 @@ struct mgmt_be_client *mgmt_be_client_create(const char *client_name,
struct event_loop *event_loop) struct event_loop *event_loop)
{ {
struct mgmt_be_client *client; struct mgmt_be_client *client;
char server_path[MAXPATHLEN];
if (__be_client) if (__be_client)
return NULL; return NULL;
@ -1071,7 +1072,10 @@ struct mgmt_be_client *mgmt_be_client_create(const char *client_name,
if (cbs) if (cbs)
client->cbs = *cbs; client->cbs = *cbs;
mgmt_be_txns_init(&client->txn_head); mgmt_be_txns_init(&client->txn_head);
msg_client_init(&client->client, event_loop, MGMTD_BE_SERVER_PATH,
snprintf(server_path, sizeof(server_path), MGMTD_BE_SOCK_NAME);
msg_client_init(&client->client, event_loop, server_path,
mgmt_be_client_notify_conenct, mgmt_be_client_notify_conenct,
mgmt_be_client_notify_disconenct, mgmt_be_client_notify_disconenct,
mgmt_be_client_process_msg, MGMTD_BE_MAX_NUM_MSG_PROC, mgmt_be_client_process_msg, MGMTD_BE_MAX_NUM_MSG_PROC,

3
lib/mgmt_defines.h
View file

@ -11,6 +11,9 @@
#include "yang.h" #include "yang.h"
#define MGMTD_FE_SOCK_NAME "%s/mgmtd_fe.sock", frr_runstatedir
#define MGMTD_BE_SOCK_NAME "%s/mgmtd_be.sock", frr_runstatedir
#define MGMTD_CLIENT_NAME_MAX_LEN 32 #define MGMTD_CLIENT_NAME_MAX_LEN 32
#define MGMTD_MAX_XPATH_LEN XPATH_MAXLEN #define MGMTD_MAX_XPATH_LEN XPATH_MAXLEN

5
lib/mgmt_fe_client.c
View file

@ -712,6 +712,7 @@ struct mgmt_fe_client *mgmt_fe_client_create(const char *client_name,
struct event_loop *event_loop) struct event_loop *event_loop)
{ {
struct mgmt_fe_client *client; struct mgmt_fe_client *client;
char server_path[MAXPATHLEN];
if (__fe_client) if (__fe_client)
return NULL; return NULL;
@ -726,7 +727,9 @@ struct mgmt_fe_client *mgmt_fe_client_create(const char *client_name,
mgmt_sessions_init(&client->sessions); mgmt_sessions_init(&client->sessions);
msg_client_init(&client->client, event_loop, MGMTD_FE_SERVER_PATH, snprintf(server_path, sizeof(server_path), MGMTD_FE_SOCK_NAME);
msg_client_init(&client->client, event_loop, server_path,
mgmt_fe_client_notify_connect, mgmt_fe_client_notify_connect,
mgmt_fe_client_notify_disconnect, mgmt_fe_client_notify_disconnect,
mgmt_fe_client_process_msg, MGMTD_FE_MAX_NUM_MSG_PROC, mgmt_fe_client_process_msg, MGMTD_FE_MAX_NUM_MSG_PROC,

9
mgmtd/mgmt_be_adapter.c
View file

@ -706,15 +706,18 @@ extern void mgmt_be_adapter_unlock(struct mgmt_be_client_adapter **adapter)
*/ */
void mgmt_be_adapter_init(struct event_loop *tm) void mgmt_be_adapter_init(struct event_loop *tm)
{ {
char server_path[MAXPATHLEN];
assert(!mgmt_loop); assert(!mgmt_loop);
mgmt_loop = tm; mgmt_loop = tm;
mgmt_be_adapters_init(&mgmt_be_adapters); mgmt_be_adapters_init(&mgmt_be_adapters);
mgmt_be_xpath_map_init(); mgmt_be_xpath_map_init();
if (msg_server_init(&mgmt_be_server, MGMTD_BE_SERVER_PATH, tm, snprintf(server_path, sizeof(server_path), MGMTD_BE_SOCK_NAME);
mgmt_be_create_adapter, "backend",
&mgmt_debug_be)) { if (msg_server_init(&mgmt_be_server, server_path, tm,
mgmt_be_create_adapter, "backend", &mgmt_debug_be)) {
zlog_err("cannot initialize backend server"); zlog_err("cannot initialize backend server");
exit(1); exit(1);
} }

9
mgmtd/mgmt_fe_adapter.c
View file

@ -1309,6 +1309,8 @@ extern void mgmt_fe_adapter_unlock(struct mgmt_fe_client_adapter **adapter)
*/ */
void mgmt_fe_adapter_init(struct event_loop *tm) void mgmt_fe_adapter_init(struct event_loop *tm)
{ {
char server_path[MAXPATHLEN];
assert(!mgmt_loop); assert(!mgmt_loop);
mgmt_loop = tm; mgmt_loop = tm;
@ -1319,9 +1321,10 @@ void mgmt_fe_adapter_init(struct event_loop *tm)
hash_create(mgmt_fe_session_hash_key, mgmt_fe_session_hash_cmp, hash_create(mgmt_fe_session_hash_key, mgmt_fe_session_hash_cmp,
"MGMT Frontend Sessions"); "MGMT Frontend Sessions");
if (msg_server_init(&mgmt_fe_server, MGMTD_FE_SERVER_PATH, tm, snprintf(server_path, sizeof(server_path), MGMTD_FE_SOCK_NAME);
mgmt_fe_create_adapter, "frontend",
&mgmt_debug_fe)) { if (msg_server_init(&mgmt_fe_server, server_path, tm,
mgmt_fe_create_adapter, "frontend", &mgmt_debug_fe)) {
zlog_err("cannot initialize frontend server"); zlog_err("cannot initialize frontend server");
exit(1); exit(1);
} }