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

watchfrr: Allow an integrated config to work within a namespace

Browse source 
Since watchfrr invokes vtysh to gather the show run output and
write the data, if we are operating inside of a namespace FRR
must also pass this in.

Yes. This seems hacky.  I don't fully understand why vtysh
is invoked this way.

New output:

sharpd@eva:~/frr3$ sudo vtysh -N one

Hello, this is FRRouting (version 8.1-dev).
Copyright 1996-2005 Kunihiro Ishiguro, et al.

eva# wr mem
Note: this version of vtysh never writes vtysh.conf
% Can't open configuration file /etc/frr/one/vtysh.conf due to 'No such file or directory'.
Building Configuration...
Integrated configuration saved to /etc/frr/one/frr.conf
[OK]
eva#

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2021-10-04 20:32:25 -04:00
parent 11ed589224
commit a91f5417d8
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
watchfrr/watchfrr.c
View file

@ -68,6 +68,7 @@ DEFINE_MTYPE_STATIC(WATCHFRR, WATCHFRR_DAEMON, "watchfrr daemon entry");
struct thread_master *master; struct thread_master *master;
static bool watch_only = false; static bool watch_only = false;
const char *pathspace;
typedef enum { typedef enum {
PHASE_NONE = 0, PHASE_NONE = 0,
@ -1513,8 +1514,15 @@ int main(int argc, char **argv)
else else
unsetenv("FRR_PATHSPACE"); unsetenv("FRR_PATHSPACE");
/*
* when watchfrr_di.pathspace is read, if it is not specified
* pathspace is NULL as expected
*/
pathspace = watchfrr_di.pathspace;
if (netns_en && !netns) if (netns_en && !netns)
netns = watchfrr_di.pathspace; netns = watchfrr_di.pathspace;
if (netns_en && netns && netns[0]) if (netns_en && netns && netns[0])
netns_setup(netns); netns_setup(netns);

6
watchfrr/watchfrr.h
View file

@ -25,6 +25,12 @@
DECLARE_MGROUP(WATCHFRR); DECLARE_MGROUP(WATCHFRR);
/*
* This is the name of the pathspace we are in `-N XXX`
* If the default then this is NULL
*/
extern const char *pathspace;
extern void watchfrr_vty_init(void); extern void watchfrr_vty_init(void);
extern pid_t integrated_write_pid; extern pid_t integrated_write_pid;

5
watchfrr/watchfrr_vty.c
View file

@ -105,7 +105,10 @@ DEFUN(config_write_integrated,
/* don't allow the user to pass parameters, we're root here! /* don't allow the user to pass parameters, we're root here!
* should probably harden vtysh at some point too... */ * should probably harden vtysh at some point too... */
execl(VTYSH_BIN_PATH, "vtysh", "-w", NULL); if (pathspace)
execl(VTYSH_BIN_PATH, "vtysh", "-N", pathspace, "-w", NULL);
else
execl(VTYSH_BIN_PATH, "vtysh", "-w", NULL);
/* unbuffered write; we just messed with stdout... */ /* unbuffered write; we just messed with stdout... */
char msg[512]; char msg[512];