proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 07:30:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vtysh: add watchquagga to target list

Browse Source 
Also tag some commands as VTYSH_REALLYALL; these are absolutely
neccessary for correct vtysh operation and will cause "interesting"
breakage if not present on all daemons.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2016-11-08 19:41:48 +01:00
parent 95c4aff294
commit 4a96e94474
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -1735,6 +1735,7 @@ AC_DEFINE_UNQUOTED(OSPF6_VTYSH_PATH, "$quagga_statedir/ospf6d.vty",ospf6d vty so
AC_DEFINE_UNQUOTED(LDP_VTYSH_PATH, "$quagga_statedir/ldpd.vty",ldpd vty socket) AC_DEFINE_UNQUOTED(LDP_VTYSH_PATH, "$quagga_statedir/ldpd.vty",ldpd vty socket)
AC_DEFINE_UNQUOTED(ISIS_VTYSH_PATH, "$quagga_statedir/isisd.vty",isisd vty socket) AC_DEFINE_UNQUOTED(ISIS_VTYSH_PATH, "$quagga_statedir/isisd.vty",isisd vty socket)
AC_DEFINE_UNQUOTED(PIM_VTYSH_PATH, "$quagga_statedir/pimd.vty",pimd vty socket) AC_DEFINE_UNQUOTED(PIM_VTYSH_PATH, "$quagga_statedir/pimd.vty",pimd vty socket)
AC_DEFINE_UNQUOTED(WATCHQUAGGA_VTYSH_PATH, "$quagga_statedir/watchquagga.vty",watchquagga vty socket)
AC_DEFINE_UNQUOTED(DAEMON_VTY_DIR, "$quagga_statedir",daemon vty directory) AC_DEFINE_UNQUOTED(DAEMON_VTY_DIR, "$quagga_statedir",daemon vty directory)
dnl autoconf does this, but it does it too late... dnl autoconf does this, but it does it too late...

11
vtysh/vtysh.c
View File

@ -73,6 +73,7 @@ struct vtysh_client vtysh_client[] =
{ .fd = -1, .name = "bgpd", .flag = VTYSH_BGPD, .path = BGP_VTYSH_PATH, .next = NULL}, { .fd = -1, .name = "bgpd", .flag = VTYSH_BGPD, .path = BGP_VTYSH_PATH, .next = NULL},
{ .fd = -1, .name = "isisd", .flag = VTYSH_ISISD, .path = ISIS_VTYSH_PATH, .next = NULL}, { .fd = -1, .name = "isisd", .flag = VTYSH_ISISD, .path = ISIS_VTYSH_PATH, .next = NULL},
{ .fd = -1, .name = "pimd", .flag = VTYSH_PIMD, .path = PIM_VTYSH_PATH, .next = NULL}, { .fd = -1, .name = "pimd", .flag = VTYSH_PIMD, .path = PIM_VTYSH_PATH, .next = NULL},
{ .fd = -1, .name = "watchquagga", .flag = VTYSH_WATCHQUAGGA, .path = WATCHQUAGGA_VTYSH_PATH, .next = NULL},
}; };
enum vtysh_write_integrated vtysh_write_integrated = WRITE_INTEGRATED_UNSPECIFIED; enum vtysh_write_integrated vtysh_write_integrated = WRITE_INTEGRATED_UNSPECIFIED;
@ -1073,7 +1074,7 @@ vtysh_end (void)
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUNSH (VTYSH_ALL, DEFUNSH (VTYSH_REALLYALL,
vtysh_end_all, vtysh_end_all,
vtysh_end_all_cmd, vtysh_end_all_cmd,
"end", "end",
@ -1480,7 +1481,7 @@ DEFUNSH (VTYSH_ALL,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUNSH (VTYSH_ALL, DEFUNSH (VTYSH_REALLYALL,
vtysh_enable, vtysh_enable,
vtysh_enable_cmd, vtysh_enable_cmd,
"enable", "enable",
@ -1490,7 +1491,7 @@ DEFUNSH (VTYSH_ALL,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUNSH (VTYSH_ALL, DEFUNSH (VTYSH_REALLYALL,
vtysh_disable, vtysh_disable,
vtysh_disable_cmd, vtysh_disable_cmd,
"disable", "disable",
@ -1501,7 +1502,7 @@ DEFUNSH (VTYSH_ALL,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUNSH (VTYSH_ALL, DEFUNSH (VTYSH_REALLYALL,
vtysh_config_terminal, vtysh_config_terminal,
vtysh_config_terminal_cmd, vtysh_config_terminal_cmd,
"configure terminal", "configure terminal",
@ -1582,7 +1583,7 @@ vtysh_exit (struct vty *vty)
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUNSH (VTYSH_ALL, DEFUNSH (VTYSH_REALLYALL,
vtysh_exit_all, vtysh_exit_all,
vtysh_exit_all_cmd, vtysh_exit_all_cmd,
"exit", "exit",

6
vtysh/vtysh.h
View File

@ -34,7 +34,13 @@ DECLARE_MGROUP(MVTYSH)
#define VTYSH_ISISD 0x40 #define VTYSH_ISISD 0x40
#define VTYSH_PIMD 0x100 #define VTYSH_PIMD 0x100
#define VTYSH_LDPD 0x200 #define VTYSH_LDPD 0x200
#define VTYSH_WATCHQUAGGA 0x400
/* commands in REALLYALL are crucial to correct vtysh operation */
#define VTYSH_REALLYALL ~0U
/* watchquagga is not in ALL since library CLI functions should not be
* run on it (logging & co. should stay in a fixed/frozen config, and
* things like prefix lists are not even initialised) */
#define VTYSH_ALL VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_LDPD|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD #define VTYSH_ALL VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_LDPD|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD
#define VTYSH_RMAP VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_PIMD #define VTYSH_RMAP VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_PIMD
#define VTYSH_INTERFACE VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_LDPD|VTYSH_ISISD|VTYSH_PIMD #define VTYSH_INTERFACE VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_LDPD|VTYSH_ISISD|VTYSH_PIMD