diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-15 16:01:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-15 16:01:39 +0200 |
| commit | 6a72763d738c7c4132fbc4af03a688a7cc0e49e3 (patch) | |
| tree | 5b6569f0d4aa2e504721b3b4c9aaa4d217e3f844 /lib | |
| parent | Merge pull request #527 from LabNConsulting/working/master/patch-set/issue471... (diff) | |
| parent | bgpd: remove unused bgp_attr_default_intern() function (diff) | |
| download | frr-6a72763d738c7c4132fbc4af03a688a7cc0e49e3.tar.xz frr-6a72763d738c7c4132fbc4af03a688a7cc0e49e3.zip | |
Merge pull request #520 from opensourcerouting/bgpd-fixes-master
bgpd: assorted fixes (master)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/prefix.c | 6 | ||||
| -rw-r--r-- | lib/zebra.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/prefix.c b/lib/prefix.c index 0cc759bb7..28af2833e 100644 --- a/lib/prefix.c +++ b/lib/prefix.c @@ -252,12 +252,14 @@ safi2str(safi_t safi) return "unicast"; case SAFI_MULTICAST: return "multicast"; - case SAFI_ENCAP: - return "encap"; case SAFI_MPLS_VPN: return "vpn"; + case SAFI_ENCAP: + return "encap"; case SAFI_EVPN: return "evpn"; + case SAFI_LABELED_UNICAST: + return "labeled-unicast"; } return NULL; } diff --git a/lib/zebra.h b/lib/zebra.h index cd72dc67f..0cc81bdb7 100644 --- a/lib/zebra.h +++ b/lib/zebra.h @@ -404,8 +404,8 @@ extern const char *zserv_command_string (unsigned int command); typedef enum { AFI_IP = 1, AFI_IP6 = 2, - AFI_L2VPN = 4, - AFI_MAX = 5 + AFI_L2VPN = 3, + AFI_MAX = 4 } afi_t; /* Subsequent Address Family Identifier. */ |