From: David Lamparter <equinox@opensourcerouting.org>
Date: Thu, 8 Dec 2016 12:21:21 +0000 (+0100)
Subject: Merge branch 'stable/2.0'
X-Git-Tag: frr-3.0-branchpoint~127
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d5bd3e0a6f857af84c247ddea52369352c7c97ac;p=matthieu%2Ffrr.git

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>
---

d5bd3e0a6f857af84c247ddea52369352c7c97ac
diff --cc bgpd/rfapi/bgp_rfapi_cfg.c
index fa62f7051b,b27febbbeb..52c5267bf5
--- a/bgpd/rfapi/bgp_rfapi_cfg.c
+++ b/bgpd/rfapi/bgp_rfapi_cfg.c
@@@ -1881,9 -1882,9 +1882,9 @@@ DEFUN (vnc_no_export_nvegroup
                                node, nnode, rfgn))
          {
  
 -          if (rfgn->name && !strcmp (rfgn->name, argv[1]))
 +          if (rfgn->name && !strcmp (rfgn->name, argv[6]->arg))
              {
-               zlog_debug ("%s: matched \"%s\"", __func__, rfgn->name);
+               vnc_zlog_debug_verbose ("%s: matched \"%s\"", __func__, rfgn->name);
                if (rfgn->rfg)
                  vnc_direct_bgp_del_group (bgp, rfgn->rfg);
                free (rfgn->name);
@@@ -1900,8 -1901,8 +1901,8 @@@
                                node, nnode, rfgn))
          {
  
-           zlog_debug ("does rfg \"%s\" match?", rfgn->name);
+           vnc_zlog_debug_verbose ("does rfg \"%s\" match?", rfgn->name);
 -          if (rfgn->name && !strcmp (rfgn->name, argv[1]))
 +          if (rfgn->name && !strcmp (rfgn->name, argv[6]->arg))
              {
                if (rfgn->rfg)
                  vnc_zebra_del_group (bgp, rfgn->rfg);
diff --cc bgpd/rfapi/vnc_debug.c
index f66be85c25,4d91f38dcb..bf7a898f58
--- a/bgpd/rfapi/vnc_debug.c
+++ b/bgpd/rfapi/vnc_debug.c
@@@ -35,18 -35,19 +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_VERBOSE,         	"verbose"},
++	{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,7 -57,7 +57,7 @@@
   ***********************************************************************/
  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 bgp vnc <rfapi-query|import-bi-attach|import-del-remote|verbose>",
         DEBUG_STR
         BGP_STR
         VNC_STR
@@@ -90,7 -92,7 +92,7 @@@
  
  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 bgp vnc (rfapi-query|import-bi-attach|import-del-remote|verbose)",
++       "<no debug|undebug> bgp vnc <rfapi-query|import-bi-attach|import-del-remote|verbose>",
         NO_STR
         DEBUG_STR
         BGP_STR