matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

zebra: Make admin distance a uint8_t

Browse source 
While u_char is technically a uint8_t in size I would
like to treat and think about the admin distance
as an actual integer value from 0-255, instead
of a char.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-09-25 08:41:33 -04:00
parent 25715c7e50
commit fd289fc83e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
zebra/rib.h
View file

@ -71,7 +71,7 @@ struct route_entry {
u_int32_t nexthop_mtu; u_int32_t nexthop_mtu;
/* Distance. */ /* Distance. */
u_char distance; uint8_t distance;
/* Flags of this route. /* Flags of this route.
* This flag's definition is in lib/zebra.h ZEBRA_FLAG_* and is exposed * This flag's definition is in lib/zebra.h ZEBRA_FLAG_* and is exposed
@ -294,7 +294,7 @@ extern int rib_add(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type,
u_short instance, int flags, struct prefix *p, u_short instance, int flags, struct prefix *p,
struct prefix_ipv6 *src_p, const struct nexthop *nh, struct prefix_ipv6 *src_p, const struct nexthop *nh,
u_int32_t table_id, u_int32_t metric, u_int32_t mtu, u_int32_t table_id, u_int32_t metric, u_int32_t mtu,
u_char distance); uint8_t distance);
extern int rib_add_multipath(afi_t afi, safi_t safi, struct prefix *, extern int rib_add_multipath(afi_t afi, safi_t safi, struct prefix *,
struct prefix_ipv6 *src_p, struct route_entry *); struct prefix_ipv6 *src_p, struct route_entry *);
@ -328,7 +328,7 @@ extern void rib_unlink(struct route_node *, struct route_entry *);
extern int rib_gc_dest(struct route_node *rn); extern int rib_gc_dest(struct route_node *rn);
extern struct route_table *rib_tables_iter_next(rib_tables_iter_t *iter); extern struct route_table *rib_tables_iter_next(rib_tables_iter_t *iter);
extern u_char route_distance(int type); extern uint8_t route_distance(int type);
/* /*
* Inline functions. * Inline functions.

6
zebra/zebra_rib.c
View file

@ -129,9 +129,9 @@ _rnode_zlog(const char *_func, vrf_id_t vrf_id, struct route_node *rn,
#define rnode_info(node, ...) \ #define rnode_info(node, ...) \
_rnode_zlog(__func__, vrf_id, node, LOG_INFO, __VA_ARGS__) _rnode_zlog(__func__, vrf_id, node, LOG_INFO, __VA_ARGS__)
u_char route_distance(int type) uint8_t route_distance(int type)
{ {
u_char distance; uint8_t distance;
if ((unsigned)type >= array_size(route_info)) if ((unsigned)type >= array_size(route_info))
distance = 150; distance = 150;
@ -2434,7 +2434,7 @@ void rib_delete(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type,
int rib_add(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type, u_short instance, int rib_add(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type, u_short instance,
int flags, struct prefix *p, struct prefix_ipv6 *src_p, int flags, struct prefix *p, struct prefix_ipv6 *src_p,
const struct nexthop *nh, u_int32_t table_id, u_int32_t metric, const struct nexthop *nh, u_int32_t table_id, u_int32_t metric,
u_int32_t mtu, u_char distance) u_int32_t mtu, uint8_t distance)
{ {
struct route_entry *re; struct route_entry *re;
struct route_entry *same = NULL; struct route_entry *same = NULL;