diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2017-08-01 02:06:40 +0200 |
|---|---|---|
| committer | Renato Westphal <renato@opensourcerouting.org> | 2017-08-01 04:44:42 +0200 |
| commit | 5c5255381e5b457e263081455a9677afa6b9e470 (patch) | |
| tree | 12e401fd7bdfcb3cfa95583f33aaa124c0ddc3b8 /lib/zebra.h | |
| parent | lib: remove SAFI_RESERVED_4 and SAFI_RESERVED_5 (diff) | |
| download | frr-5c5255381e5b457e263081455a9677afa6b9e470.tar.xz frr-5c5255381e5b457e263081455a9677afa6b9e470.zip | |
lib/bgpd: introduce the iana_safi_t enum
We had afi_t/iana_afi_t for AFIs but only safi_t for SAFIs. Fix this
inconsistency.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'lib/zebra.h')
| -rw-r--r-- | lib/zebra.h | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/lib/zebra.h b/lib/zebra.h index 7b705bb83..1924675a1 100644 --- a/lib/zebra.h +++ b/lib/zebra.h @@ -416,13 +416,15 @@ extern const char *zserv_command_string(unsigned int command); typedef enum { AFI_IP = 1, AFI_IP6 = 2, AFI_L2VPN = 3, AFI_MAX = 4 } afi_t; /* Subsequent Address Family Identifier. */ -#define SAFI_UNICAST 1 -#define SAFI_MULTICAST 2 -#define SAFI_MPLS_VPN 3 -#define SAFI_ENCAP 4 -#define SAFI_EVPN 5 -#define SAFI_LABELED_UNICAST 6 -#define SAFI_MAX 7 +typedef enum { + SAFI_UNICAST = 1, + SAFI_MULTICAST = 2, + SAFI_MPLS_VPN = 3, + SAFI_ENCAP = 4, + SAFI_EVPN = 5, + SAFI_LABELED_UNICAST = 6, + SAFI_MAX = 7 +} safi_t; /* * The above AFI and SAFI definitions are for internal use. The protocol @@ -442,13 +444,15 @@ typedef enum { IANA_AFI_IP6MR = 129 } iana_afi_t; -#define IANA_SAFI_RESERVED 0 -#define IANA_SAFI_UNICAST 1 -#define IANA_SAFI_MULTICAST 2 -#define IANA_SAFI_LABELED_UNICAST 4 -#define IANA_SAFI_ENCAP 7 -#define IANA_SAFI_EVPN 70 -#define IANA_SAFI_MPLS_VPN 128 +typedef enum { + IANA_SAFI_RESERVED = 0, + IANA_SAFI_UNICAST = 1, + IANA_SAFI_MULTICAST = 2, + IANA_SAFI_LABELED_UNICAST = 4, + IANA_SAFI_ENCAP = 7, + IANA_SAFI_EVPN = 70, + IANA_SAFI_MPLS_VPN = 128 +} iana_safi_t; /* Default Administrative Distance of each protocol. */ #define ZEBRA_KERNEL_DISTANCE_DEFAULT 0 @@ -469,8 +473,6 @@ typedef enum { #define UNSET_FLAG(V,F) (V) &= ~(F) #define RESET_FLAG(V) (V) = 0 -typedef u_int8_t safi_t; - /* Zebra types. Used in Zserv message header. */ typedef u_int16_t zebra_size_t; typedef u_int16_t zebra_command_t; @@ -504,7 +506,7 @@ static inline iana_afi_t afi_int2iana(afi_t afi) return IANA_AFI_RESERVED; } -static inline safi_t safi_iana2int(safi_t safi) +static inline safi_t safi_iana2int(iana_safi_t safi) { if (safi == IANA_SAFI_UNICAST) return SAFI_UNICAST; @@ -521,7 +523,7 @@ static inline safi_t safi_iana2int(safi_t safi) return SAFI_MAX; } -static inline safi_t safi_int2iana(safi_t safi) +static inline iana_safi_t safi_int2iana(safi_t safi) { if (safi == SAFI_UNICAST) return IANA_SAFI_UNICAST; |