diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2016-12-08 13:21:21 +0100 | 
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2016-12-08 13:21:21 +0100 | 
| commit | d5bd3e0a6f857af84c247ddea52369352c7c97ac (patch) | |
| tree | fa5eb06d42f33bbadb78e70669a0e5569e61407b /bgpd/rfapi/vnc_debug.c | |
| parent | 0276dd5d4bc6a9fdf27ae67558be6d921042405e (diff) | |
| parent | d987f2339d25d32b654dabfe98a40677029575fe (diff) | |
Merge branch 'stable/2.0'
Conflicts:
	bgpd/rfapi/bgp_rfapi_cfg.c
	bgpd/rfapi/vnc_debug.c
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'bgpd/rfapi/vnc_debug.c')
| -rw-r--r-- | bgpd/rfapi/vnc_debug.c | 27 | 
1 files changed, 15 insertions, 12 deletions
diff --git a/bgpd/rfapi/vnc_debug.c b/bgpd/rfapi/vnc_debug.c index f66be85c25..bf7a898f58 100644 --- a/bgpd/rfapi/vnc_debug.c +++ b/bgpd/rfapi/vnc_debug.c @@ -35,18 +35,19 @@ unsigned long conf_vnc_debug;  unsigned long term_vnc_debug;  struct vnc_debug { -    unsigned long	bit; -    const char		*name; +	unsigned long	bit; +	const char		*name;  };  struct vnc_debug	vncdebug[] =  { -    {VNC_DEBUG_RFAPI_QUERY,		"rfapi-query"}, -    {VNC_DEBUG_IMPORT_BI_ATTACH,	"import-bi-attach"}, -    {VNC_DEBUG_IMPORT_DEL_REMOTE,	"import-del-remote"}, -    {VNC_DEBUG_EXPORT_BGP_GETCE,	"export-bgp-getce"}, -    {VNC_DEBUG_EXPORT_BGP_DIRECT_ADD,	"export-bgp-direct-add"}, -    {VNC_DEBUG_IMPORT_BGP_ADD_ROUTE,	"import-bgp-add-route"}, +	{VNC_DEBUG_RFAPI_QUERY,		"rfapi-query"}, +	{VNC_DEBUG_IMPORT_BI_ATTACH,	"import-bi-attach"}, +	{VNC_DEBUG_IMPORT_DEL_REMOTE,	"import-del-remote"}, +	{VNC_DEBUG_EXPORT_BGP_GETCE,	"export-bgp-getce"}, +	{VNC_DEBUG_EXPORT_BGP_DIRECT_ADD,	"export-bgp-direct-add"}, +	{VNC_DEBUG_IMPORT_BGP_ADD_ROUTE,	"import-bgp-add-route"}, +	{VNC_DEBUG_VERBOSE,         	"verbose"},  };  #define VNC_STR "VNC information\n" @@ -56,13 +57,14 @@ struct vnc_debug	vncdebug[] =   ***********************************************************************/  DEFUN (debug_bgp_vnc,         debug_bgp_vnc_cmd, -       "debug bgp vnc <rfapi-query|import-bi-attach|import-del-remote>", +       "debug bgp vnc <rfapi-query|import-bi-attach|import-del-remote|verbose>",         DEBUG_STR         BGP_STR         VNC_STR         "rfapi query handling\n"         "import BI atachment\n" -       "import delete remote routes\n") +       "import delete remote routes\n" +       "verbose logging\n")  {    size_t	i; @@ -90,14 +92,15 @@ DEFUN (debug_bgp_vnc,  DEFUN (no_debug_bgp_vnc,         no_debug_bgp_vnc_cmd, -       "<no debug|undebug> bgp vnc <rfapi-query|import-bi-attach|import-del-remote>", +       "<no debug|undebug> bgp vnc <rfapi-query|import-bi-attach|import-del-remote|verbose>",         NO_STR         DEBUG_STR         BGP_STR         VNC_STR         "rfapi query handling\n"         "import BI atachment\n" -       "import delete remote routes\n") +       "import delete remote routes\n" +       "verbose logging\n")  {    size_t	i;  | 
