diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-27 11:44:42 -0500 | 
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-27 11:44:42 -0500 | 
| commit | c016b6c796fe3a8520fdd0f30ef377cbb73e0037 (patch) | |
| tree | 78c3b29b41860c367390bba20a4a4d16fbaf3469 /bgpd/bgp_mplsvpn.h | |
| parent | 75688c44d98af271ca4eb4f3133ede9e7ae709bb (diff) | |
| parent | aceb2285dad63dca7bba7177012aabdb63e1cca5 (diff) | |
Merge remote-tracking branch 'origin/master' into pr/111
Diffstat (limited to 'bgpd/bgp_mplsvpn.h')
| -rw-r--r-- | bgpd/bgp_mplsvpn.h | 13 | 
1 files changed, 9 insertions, 4 deletions
diff --git a/bgpd/bgp_mplsvpn.h b/bgpd/bgp_mplsvpn.h index 97eed3c35a..ea6cbcd272 100644 --- a/bgpd/bgp_mplsvpn.h +++ b/bgpd/bgp_mplsvpn.h @@ -30,6 +30,10 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  #define RD_ADDRSTRLEN  28 +#ifdef MPLS_LABEL_MAX +# undef MPLS_LABEL_MAX +#endif +  typedef enum {      MPLS_LABEL_IPV4_EXPLICIT_NULL = 0,  /* [RFC3032] */      MPLS_LABEL_ROUTER_ALERT       = 1,  /* [RFC3032] */ @@ -45,7 +49,9 @@ typedef enum {      MPLS_LABEL_UNASSIGNED11       = 11,      MPLS_LABEL_GAL                = 13, /* [RFC5586] */      MPLS_LABEL_OAM_ALERT          = 14, /* [RFC3429] */ -    MPLS_LABEL_EXTENSION          = 15  /* [RFC7274] */ +    MPLS_LABEL_EXTENSION          = 15,  /* [RFC7274] */ +    MPLS_LABEL_MAX                = 1048575, +    MPLS_LABEL_ILLEGAL            = 0xFFFFFFFF /* for internal use only */  } mpls_special_label_t;  #define MPLS_LABEL_IS_SPECIAL(label)             \ @@ -100,8 +106,7 @@ extern char *prefix_rd2str (struct prefix_rd *, char *, size_t);  extern int  argv_find_and_parse_vpnvx(struct cmd_token **argv, int argc, int *index, afi_t *afi); -int -bgp_show_mpls_vpn (struct vty *vty, afi_t afi, struct prefix_rd *prd, -		   enum bgp_show_type type, void *output_arg, int tags, u_char use_json); +extern int bgp_show_mpls_vpn (struct vty *vty, afi_t afi, struct prefix_rd *prd, +                              enum bgp_show_type type, void *output_arg, int tags, u_char use_json);  #endif /* _QUAGGA_BGP_MPLSVPN_H */  | 
