diff options
| author | Paul Jakma <paul@quagga.net> | 2012-03-25 17:10:22 +0100 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2012-03-25 17:10:22 +0100 |
| commit | 81c3e5006e5d29e305cbc0ab482617d7e570e8c0 (patch) | |
| tree | 7408dfdeff638ce16273cd7c8c4d9c35a99cfe87 /lib/log.c | |
| parent | fe67e668881b8b8d71b1570575c913cd287fafcf (diff) | |
| parent | 6881f2698279f3c47a55e8969860eeac59e8c3d7 (diff) | |
| download | quagga-81c3e5006e5d29e305cbc0ab482617d7e570e8c0.tar.bz2 quagga-81c3e5006e5d29e305cbc0ab482617d7e570e8c0.tar.xz | |
Merge branch 'babeld-merge' into master-copy
Diffstat (limited to 'lib/log.c')
| -rw-r--r-- | lib/log.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -48,6 +48,7 @@ const char *zlog_proto_names[] = "BGP", "OSPF", "RIPNG", + "BABEL", "OSPF6", "ISIS", "MASC", @@ -932,8 +933,10 @@ proto_redistnum(int afi, const char *s) return ZEBRA_ROUTE_OSPF; else if (strncmp (s, "i", 1) == 0) return ZEBRA_ROUTE_ISIS; - else if (strncmp (s, "b", 1) == 0) + else if (strncmp (s, "bg", 2) == 0) return ZEBRA_ROUTE_BGP; + else if (strncmp (s, "ba", 2) == 0) + return ZEBRA_ROUTE_BABEL; } if (afi == AFI_IP6) { @@ -949,8 +952,10 @@ proto_redistnum(int afi, const char *s) return ZEBRA_ROUTE_OSPF6; else if (strncmp (s, "i", 1) == 0) return ZEBRA_ROUTE_ISIS; - else if (strncmp (s, "b", 1) == 0) + else if (strncmp (s, "bg", 2) == 0) return ZEBRA_ROUTE_BGP; + else if (strncmp (s, "ba", 2) == 0) + return ZEBRA_ROUTE_BABEL; } return -1; } |