lib: add BGP VPN route type

Signed-off-by: G. Paul Ziemba <paulz@labn.net>

diff --git a/lib/log.c b/lib/log.c
index 9e33ef91021c020d464d29f7ec4f7066871ae933..49335e119bd57339f180e6d2930cacb00aeecc54 100644 (file)
--- a/lib/log.c
+++ b/lib/log.c
@@ -1055,6 +1055,8 @@ int proto_redistnum(int afi, const char *s)
                        return ZEBRA_ROUTE_BABEL;
                else if (strmatch(s, "sharp"))
                        return ZEBRA_ROUTE_SHARP;
+               else if (strmatch(s, "vpn"))
+                       return ZEBRA_ROUTE_BGP_VPN;
        }
        if (afi == AFI_IP6) {
                if (strmatch(s, "kernel"))
@@ -1083,6 +1085,8 @@ int proto_redistnum(int afi, const char *s)
                        return ZEBRA_ROUTE_BABEL;
                else if (strmatch(s, "sharp"))
                        return ZEBRA_ROUTE_SHARP;
+               else if (strmatch(s, "vpn"))
+                       return ZEBRA_ROUTE_BGP_VPN;
        }
        return -1;
 }

diff --git a/lib/route_types.txt b/lib/route_types.txt
index 4e764a14c139ab898bbd9717542c99545662b30a..98cada8f89887ecdf7fa035de51434a8761e9b86 100644 (file)
--- a/lib/route_types.txt
+++ b/lib/route_types.txt
@@ -40,7 +40,7 @@
 # Long description:     Full description, but should try fit on a line.
 ####
 #
-# If you add a new routing protocol here, make sure you go update
+# If you add a new routing protocol here, make sure you also update
 # meta_queue_map in zebra_rib.c
 #
 ##  type                cname      daemon  C    4  6  short help
@@ -76,6 +76,7 @@ ZEBRA_ROUTE_VNC_DIRECT_RH, vnc-rn, NULL,   'V', 0, 0, "VNC-RN"
 ZEBRA_ROUTE_BGP_DIRECT, bgp-direct, NULL,  'b', 0, 0, "BGP-Direct"
 #  bgp unicast -> vnc 
 ZEBRA_ROUTE_BGP_DIRECT_EXT, bgp-direct-to-nve-groups, NULL, 'e', 0, 0, "BGP2VNC"
+ZEBRA_ROUTE_BGP_VPN,    vpn,       NULL,   'c', 1, 1, "VPN", bgpd
 ZEBRA_ROUTE_BABEL,      babel,     babeld, 'A', 1, 1, "Babel"
 ZEBRA_ROUTE_SHARP,    sharp,     sharpd, 'D', 1, 1, "SHARP"
 ZEBRA_ROUTE_ALL,        wildcard,  none,   '-', 0, 0, "-"
@@ -101,5 +102,6 @@ ZEBRA_ROUTE_OLSR,   "Optimised Link State Routing (OLSR)"
 ZEBRA_ROUTE_TABLE,  "Non-main Kernel Routing Table"
 ZEBRA_ROUTE_LDP,    "Label Distribution Protocol (LDP)"
 ZEBRA_ROUTE_VNC_DIRECT,    "VNC direct (not via zebra) routes"
+ZEBRA_ROUTE_BGP_VPN, "BGP VPN routes"
 ZEBRA_ROUTE_BABEL,  "Babel routing protocol (Babel)"
 ZEBRA_ROUTE_SHARP, "Super Happy Advanced Routing Protocol (sharpd)"