diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-06 09:58:21 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-06 09:58:21 -0500 |
| commit | 3b14d86eed3c042db718c7e006ca5299f473c88e (patch) | |
| tree | 4efde6b2d77f5229ace3375da3471b0db1daa695 /lib/log.c | |
| parent | 0b0038b8bcf84beda44fb69a60b2620b0387d8e8 (diff) | |
| parent | 7d53a49360ddceb16db34bc8a84039cb2ecab22c (diff) | |
Merge remote-tracking branch 'origin/stable/2.0'
Diffstat (limited to 'lib/log.c')
| -rw-r--r-- | lib/log.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -20,7 +20,7 @@ * 02111-1307, USA. */ -#define QUAGGA_DEFINE_DESC_TABLE +#define FRR_DEFINE_DESC_TABLE #include <zebra.h> @@ -59,7 +59,7 @@ const char *zlog_proto_names[] = "ISIS", "PIM", "RFP", - "WATCHQUAGGA", + "WATCHFRR", NULL, }; @@ -1077,10 +1077,10 @@ proto_redistnum(int afi, const char *s) return ZEBRA_ROUTE_BGP; else if (strncmp (s, "ta", 2) == 0) return ZEBRA_ROUTE_TABLE; - else if (strncmp (s, "v", 1) == 0) - return ZEBRA_ROUTE_VNC; - else if (strncmp (s, "vd", 1) == 0) + else if (strcmp (s, "vnc-direct") == 0) return ZEBRA_ROUTE_VNC_DIRECT; + else if (strcmp (s, "vnc") == 0) + return ZEBRA_ROUTE_VNC; } if (afi == AFI_IP6) { @@ -1100,10 +1100,10 @@ proto_redistnum(int afi, const char *s) return ZEBRA_ROUTE_BGP; else if (strncmp (s, "ta", 2) == 0) return ZEBRA_ROUTE_TABLE; - else if (strncmp (s, "v", 1) == 0) - return ZEBRA_ROUTE_VNC; - else if (strncmp (s, "vd", 1) == 0) + else if (strcmp (s, "vnc-direct") == 0) return ZEBRA_ROUTE_VNC_DIRECT; + else if (strcmp (s, "vnc") == 0) + return ZEBRA_ROUTE_VNC; } return -1; } |