From: Lou Berger <lberger@labn.net>
Date: Thu, 26 Jan 2017 14:59:03 +0000 (-0500)
Subject: Merge branch 'master' into working/master/patch-set/4-misc-fixes
X-Git-Tag: frr-3.0-branchpoint~70^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1c404af8b58696b70313c728a39edc2983ed9827;p=matthieu%2Ffrr.git

Merge branch 'master' into working/master/patch-set/4-misc-fixes

Merged pull request with master

Conflicts:
	bgpd/bgp_mplsvpn.c
	bgpd/bgp_route.c
	bgpd/rfapi/rfapi_vty.c
---

1c404af8b58696b70313c728a39edc2983ed9827
diff --cc bgpd/bgp_route.h
index 21ca64091c,3c7aa83a0e..83954beaea
--- a/bgpd/bgp_route.h
+++ b/bgpd/bgp_route.h
@@@ -241,27 -241,6 +241,30 @@@ bgp_bump_version (struct bgp_node *node
    node->version = bgp_table_next_version(bgp_node_table(node));
  }
  
 +enum bgp_show_type
 +{
 +  bgp_show_type_normal,
 +  bgp_show_type_regexp,
 +  bgp_show_type_prefix_list,
 +  bgp_show_type_filter_list,
 +  bgp_show_type_route_map,
 +  bgp_show_type_neighbor,
 +  bgp_show_type_cidr_only,
 +  bgp_show_type_prefix_longer,
 +  bgp_show_type_community_all,
 +  bgp_show_type_community,
 +  bgp_show_type_community_exact,
 +  bgp_show_type_community_list,
 +  bgp_show_type_community_list_exact,
++  bgp_show_type_lcommunity_all,
++  bgp_show_type_lcommunity,
++  bgp_show_type_lcommunity_list,
 +  bgp_show_type_flap_statistics,
 +  bgp_show_type_flap_neighbor,
 +  bgp_show_type_dampend_paths,
 +  bgp_show_type_damp_neighbor
 +};
 +
  /* Prototypes. */
  extern void bgp_process_queue_init (void);
  extern void bgp_route_init (void);