]> git.puffer.fish Git - matthieu/frr.git/commitdiff
bgpd: Make sure network/aggregate-address commands lay down under labeled safi
authorDonatas Abraitis <donatas.abraitis@gmail.com>
Thu, 30 Apr 2020 14:01:10 +0000 (17:01 +0300)
committerDonatas Abraitis <donatas.abraitis@gmail.com>
Wed, 10 Jun 2020 20:18:30 +0000 (23:18 +0300)
unicast and labeled-unicast share the same table, but configuration should
be visible for both independently. Without this fix it confuses a bit
because when you enter `network 10.0.0.0/24` under labeled-unicast it's
written in unicast family block.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
bgpd/bgp_route.c

index 2fe35d0b014813781137446a5e802e766bce798d..379fca035175720db5e7ca5cc5bcded10e42d14c 100644 (file)
@@ -12680,6 +12680,12 @@ void bgp_route_init(void)
        install_element(BGP_IPV4M_NODE, &no_aggregate_address_mask_cmd);
 
        /* IPv4 labeled-unicast configuration.  */
+       install_element(BGP_IPV4L_NODE, &bgp_network_cmd);
+       install_element(BGP_IPV4L_NODE, &aggregate_address_cmd);
+       install_element(BGP_IPV4L_NODE, &aggregate_address_mask_cmd);
+       install_element(BGP_IPV4L_NODE, &no_aggregate_address_cmd);
+       install_element(BGP_IPV4L_NODE, &no_aggregate_address_mask_cmd);
+
        install_element(VIEW_NODE, &show_ip_bgp_instance_all_cmd);
        install_element(VIEW_NODE, &show_ip_bgp_cmd);
        install_element(VIEW_NODE, &show_ip_bgp_json_cmd);
@@ -12723,6 +12729,11 @@ void bgp_route_init(void)
 
        install_element(BGP_IPV6M_NODE, &ipv6_bgp_network_cmd);
 
+       /* IPv6 labeled unicast address family. */
+       install_element(BGP_IPV6L_NODE, &ipv6_bgp_network_cmd);
+       install_element(BGP_IPV6L_NODE, &ipv6_aggregate_address_cmd);
+       install_element(BGP_IPV6L_NODE, &no_ipv6_aggregate_address_cmd);
+
        install_element(BGP_NODE, &bgp_distance_cmd);
        install_element(BGP_NODE, &no_bgp_distance_cmd);
        install_element(BGP_NODE, &bgp_distance_source_cmd);