Merge branch 'volatile/balajig'

opensourcerouting · Oct 1, 2017 · e3adc64 · e3adc64
2 parents 44b486f + d3cd3f0
commit e3adc64
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
@@ -903,7 +903,7 @@ aspath_put (struct stream *s, struct aspath *as, int use32bit )
               assegment_header_put (s, seg->type, AS_SEGMENT_MAX);
               assegment_data_put (s, seg->as, AS_SEGMENT_MAX, use32bit);
               written += AS_SEGMENT_MAX;
-              bytes += ASSEGMENT_SIZE (written, use32bit);
+              bytes += ASSEGMENT_SIZE (AS_SEGMENT_MAX, use32bit);
             }
 
           /* write the final segment, probably is also the first */

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
@@ -5293,7 +5293,6 @@ zebra_vty_init (void)
   install_element (VIEW_NODE, &show_ip_protocol_cmd);
   install_element (CONFIG_NODE, &ip_route_cmd);
   install_element (CONFIG_NODE, &ip_route_tag_cmd);
-  install_element (CONFIG_NODE, &ip_route_tag_vrf_cmd);
   install_element (CONFIG_NODE, &ip_route_flags_cmd);
   install_element (CONFIG_NODE, &ip_route_flags_tag_cmd);
   install_element (CONFIG_NODE, &ip_route_flags_tag_vrf_cmd);
@@ -5311,7 +5310,6 @@ zebra_vty_init (void)
   install_element (CONFIG_NODE, &ip_route_mask_flags2_tag_vrf_cmd);
   install_element (CONFIG_NODE, &no_ip_route_cmd);
   install_element (CONFIG_NODE, &no_ip_route_tag_cmd);
-  install_element (CONFIG_NODE, &no_ip_route_tag_vrf_cmd);
   install_element (CONFIG_NODE, &no_ip_route_flags_cmd);
   install_element (CONFIG_NODE, &no_ip_route_flags_tag_cmd);
   install_element (CONFIG_NODE, &no_ip_route_flags2_cmd);
@@ -5326,7 +5324,6 @@ zebra_vty_init (void)
   install_element (CONFIG_NODE, &no_ip_route_mask_flags2_tag_vrf_cmd);
   install_element (CONFIG_NODE, &ip_route_distance_cmd);
   install_element (CONFIG_NODE, &ip_route_tag_distance_cmd);
-  install_element (CONFIG_NODE, &ip_route_tag_distance_vrf_cmd);
   install_element (CONFIG_NODE, &ip_route_flags_distance_cmd);
   install_element (CONFIG_NODE, &ip_route_flags_tag_distance_cmd);
   install_element (CONFIG_NODE, &ip_route_flags_tag_distance_vrf_cmd);
@@ -5344,7 +5341,6 @@ zebra_vty_init (void)
   install_element (CONFIG_NODE, &ip_route_mask_flags_tag_distance2_vrf_cmd);
   install_element (CONFIG_NODE, &no_ip_route_distance_cmd);
   install_element (CONFIG_NODE, &no_ip_route_tag_distance_cmd);
-  install_element (CONFIG_NODE, &no_ip_route_tag_distance_vrf_cmd);
   install_element (CONFIG_NODE, &no_ip_route_flags_distance_cmd);
   install_element (CONFIG_NODE, &no_ip_route_flags_tag_distance_cmd);
   install_element (CONFIG_NODE, &no_ip_route_flags_tag_distance_vrf_cmd);