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

Merge pull request #17313 from mjstapp/zserv_open_unpriv

Browse source 
zebra: separate zebra ZAPI server open and accept
This commit is contained in:
Jafar Al-Gharaibeh 2024-12-03 14:26:09 -06:00 committed by GitHub
parent e9c9db0122 506097a1b9
commit 71f9899bc4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
zebra/main.c
View file

@ -467,6 +467,9 @@ int main(int argc, char **argv)
zebra_if_init();
zebra_debug_init();
/* Open Zebra API server socket */
zserv_open(zserv_path);
/*
* Initialize NS( and implicitly the VRF module), and make kernel
* routing socket. */

32
zebra/zserv.c
View file

@ -57,6 +57,7 @@ extern struct zebra_privs_t zserv_privs;
/* The listener socket for clients connecting to us */
static int zsock;
static bool started_p;
/* The lock that protects access to zapi client objects */
static pthread_mutex_t client_mutex;
@ -929,9 +930,16 @@ void zserv_close(void)
/* Free client list's mutex */
pthread_mutex_destroy(&client_mutex);
started_p = false;
}
void zserv_start(char *path)
/*
* Open zebra's ZAPI listener socket. This is done early during startup,
* before zebra is ready to listen and accept client connections.
*/
void zserv_open(const char *path)
{
int ret;
mode_t old_mask;
@ -973,6 +981,26 @@ void zserv_start(char *path)
path, safe_strerror(errno));
close(zsock);
zsock = -1;
}
umask(old_mask);
}
/*
* Start listening for ZAPI client connections.
*/
void zserv_start(const char *path)
{
int ret;
/* This may be called more than once during startup - potentially once
* per netns - but only do this work once.
*/
if (started_p)
return;
if (zsock <= 0) {
flog_err_sys(EC_LIB_SOCKET, "Zserv socket open failed");
return;
}
@ -986,7 +1014,7 @@ void zserv_start(char *path)
return;
}
umask(old_mask);
started_p = true;
zserv_event(NULL, ZSERV_ACCEPT);
}

17
zebra/zserv.h
View file

@ -256,15 +256,24 @@ extern void zserv_init(void);
extern void zserv_close(void);
/*
* Start Zebra API server.
* Open Zebra API server socket.
*
* Allocates resources, creates the server socket and begins listening on the
* socket.
* Create and open the server socket.
*
* path
* where to place the Unix domain socket
*/
extern void zserv_start(char *path);
extern void zserv_open(const char *path);
/*
* Start Zebra API server.
*
* Allocates resources and begins listening on the server socket.
*
* path
* where to place the Unix domain socket
*/
extern void zserv_start(const char *path);
/*
* Send a message to a connected Zebra API client.