diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/command.c | 2 | ||||
| -rw-r--r-- | lib/command.h | 1 | ||||
| -rw-r--r-- | lib/distribute.c | 5 | ||||
| -rw-r--r-- | lib/log.c | 5 | ||||
| -rw-r--r-- | lib/log.h | 1 | ||||
| -rw-r--r-- | lib/memtypes.c | 7 | ||||
| -rw-r--r-- | lib/route_types.txt | 2 | ||||
| -rw-r--r-- | lib/routemap.h | 1 | ||||
| -rw-r--r-- | lib/vty.c | 2 |
9 files changed, 2 insertions, 24 deletions
diff --git a/lib/command.c b/lib/command.c index 4d4a72a03a..a1809f514c 100644 --- a/lib/command.c +++ b/lib/command.c @@ -2935,7 +2935,6 @@ DEFUN (config_exit, case BGP_NODE: case RIP_NODE: case RIPNG_NODE: - case BABEL_NODE: case OSPF_NODE: case OSPF6_NODE: case ISIS_NODE: @@ -2986,7 +2985,6 @@ DEFUN (config_end, case ZEBRA_NODE: case RIP_NODE: case RIPNG_NODE: - case BABEL_NODE: case BGP_NODE: case BGP_VPNV4_NODE: case BGP_IPV4_NODE: diff --git a/lib/command.h b/lib/command.h index 1b3c0b45ca..f1d70d7186 100644 --- a/lib/command.h +++ b/lib/command.h @@ -80,7 +80,6 @@ enum node_type TABLE_NODE, /* rtm_table selection node. */ RIP_NODE, /* RIP protocol mode node. */ RIPNG_NODE, /* RIPng protocol mode node. */ - BABEL_NODE, /* Babel protocol mode node. */ BGP_NODE, /* BGP protocol mode which includes BGP4+ */ BGP_VPNV4_NODE, /* BGP MPLS-VPN PE exchange. */ BGP_IPV4_NODE, /* BGP IPv4 unicast address family. */ diff --git a/lib/distribute.c b/lib/distribute.c index fdd028d813..757525fd71 100644 --- a/lib/distribute.c +++ b/lib/distribute.c @@ -775,10 +775,9 @@ distribute_list_init (int node) install_element (node, &no_distribute_list_prefix_all_cmd); install_element (node, &distribute_list_prefix_cmd); install_element (node, &no_distribute_list_prefix_cmd); - } else if (node == RIPNG_NODE || node == BABEL_NODE) { + } else if (node == RIPNG_NODE) { /* WARNING: two identical commands installed do a crash, so be worry with - aliases. For this reason, and because all these commands are aliases, Babel - is not set with RIP. */ + * aliases */ install_element (node, &ipv6_distribute_list_all_cmd); install_element (node, &no_ipv6_distribute_list_all_cmd); install_element (node, &ipv6_distribute_list_cmd); @@ -48,7 +48,6 @@ const char *zlog_proto_names[] = "BGP", "OSPF", "RIPNG", - "BABEL", "OSPF6", "ISIS", "MASC", @@ -963,8 +962,6 @@ proto_redistnum(int afi, const char *s) else if (strncmp (s, "bg", 2) == 0) return ZEBRA_ROUTE_BGP; else if (strncmp (s, "ba", 2) == 0) - return ZEBRA_ROUTE_BABEL; - else if (strncmp (s, "t", 1) == 0) return ZEBRA_ROUTE_TABLE; } if (afi == AFI_IP6) @@ -984,8 +981,6 @@ proto_redistnum(int afi, const char *s) else if (strncmp (s, "bg", 2) == 0) return ZEBRA_ROUTE_BGP; else if (strncmp (s, "ba", 2) == 0) - return ZEBRA_ROUTE_BABEL; - else if (strncmp (s, "t", 1) == 0) return ZEBRA_ROUTE_TABLE; } return -1; @@ -50,7 +50,6 @@ typedef enum ZLOG_BGP, ZLOG_OSPF, ZLOG_RIPNG, - ZLOG_BABEL, ZLOG_OSPF6, ZLOG_ISIS, ZLOG_MASC diff --git a/lib/memtypes.c b/lib/memtypes.c index 7c6036cab5..cfb969f531 100644 --- a/lib/memtypes.c +++ b/lib/memtypes.c @@ -199,13 +199,6 @@ struct memory_list memory_list_ripng[] = { -1, NULL } }; -struct memory_list memory_list_babel[] = -{ - { MTYPE_BABEL, "Babel structure" }, - { MTYPE_BABEL_IF, "Babel interface" }, - { -1, NULL } -}; - struct memory_list memory_list_ospf[] = { { MTYPE_OSPF_TOP, "OSPF top" }, diff --git a/lib/route_types.txt b/lib/route_types.txt index d6d8670edb..605d4b1346 100644 --- a/lib/route_types.txt +++ b/lib/route_types.txt @@ -58,7 +58,6 @@ ZEBRA_ROUTE_BGP, bgp, bgpd, 'B', 1, 1, "BGP" # possible). ZEBRA_ROUTE_HSLS, hsls, hslsd, 'H', 0, 0, "HSLS" ZEBRA_ROUTE_OLSR, olsr, olsrd, 'o', 0, 0, "OLSR" -ZEBRA_ROUTE_BABEL, babel, babeld, 'A', 1, 1, "Babel" ZEBRA_ROUTE_TABLE, table, zebra, 'T', 1, 1, "Table" ## help strings @@ -74,5 +73,4 @@ ZEBRA_ROUTE_ISIS, "Intermediate System to Intermediate System (IS-IS)" ZEBRA_ROUTE_BGP, "Border Gateway Protocol (BGP)" ZEBRA_ROUTE_HSLS, "Hazy-Sighted Link State Protocol (HSLS)" ZEBRA_ROUTE_OLSR, "Optimised Link State Routing (OLSR)" -ZEBRA_ROUTE_BABEL, "Babel routing protocol (Babel)" ZEBRA_ROUTE_TABLE, "Non-main Kernel Routing Table" diff --git a/lib/routemap.h b/lib/routemap.h index 280601b52b..5c0626bae4 100644 --- a/lib/routemap.h +++ b/lib/routemap.h @@ -45,7 +45,6 @@ typedef enum { RMAP_RIP, RMAP_RIPNG, - RMAP_BABEL, RMAP_OSPF, RMAP_OSPF6, RMAP_BGP, @@ -701,7 +701,6 @@ vty_end_config (struct vty *vty) case ZEBRA_NODE: case RIP_NODE: case RIPNG_NODE: - case BABEL_NODE: case BGP_NODE: case BGP_VPNV4_NODE: case BGP_IPV4_NODE: @@ -1110,7 +1109,6 @@ vty_stop_input (struct vty *vty) case ZEBRA_NODE: case RIP_NODE: case RIPNG_NODE: - case BABEL_NODE: case BGP_NODE: case RMAP_NODE: case OSPF_NODE: |