proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 18:42:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Remove nexthop_active_num from route entry

Browse Source 
The nexthop_active_num data structure is a property of the
nexthop group.  Move the keeping of this data to that.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2019-02-15 11:39:12 -05:00 committed by Stephen Worley
parent eecacedc3b
commit 9a0d4dd39b
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zebra/rib.h
View File

@ -135,9 +135,6 @@ struct route_entry {
/* Route has Failed installation into the Data Plane in some manner */ /* Route has Failed installation into the Data Plane in some manner */
#define ROUTE_ENTRY_FAILED 0x20 #define ROUTE_ENTRY_FAILED 0x20
/* Nexthop information. */
uint8_t nexthop_active_num;
/* Sequence value incremented for each dataplane operation */ /* Sequence value incremented for each dataplane operation */
uint32_t dplane_sequence; uint32_t dplane_sequence;

13
zebra/zapi_msg.c
View File

@ -522,7 +522,7 @@ int zsend_redistribute_route(int cmd, struct zserv *client,
struct zapi_route api; struct zapi_route api;
struct zapi_nexthop *api_nh; struct zapi_nexthop *api_nh;
struct nexthop *nexthop; struct nexthop *nexthop;
int count = 0; uint8_t count = 0;
afi_t afi; afi_t afi;
size_t stream_size = size_t stream_size =
MAX(ZEBRA_MAX_PACKET_SIZ, sizeof(struct zapi_route)); MAX(ZEBRA_MAX_PACKET_SIZ, sizeof(struct zapi_route));
@ -559,11 +559,6 @@ int zsend_redistribute_route(int cmd, struct zserv *client,
memcpy(&api.src_prefix, src_p, sizeof(api.src_prefix)); memcpy(&api.src_prefix, src_p, sizeof(api.src_prefix));
} }
/* Nexthops. */
if (re->nexthop_active_num) {
SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
api.nexthop_num = re->nexthop_active_num;
}
for (nexthop = re->ng->nexthop; nexthop; nexthop = nexthop->next) { for (nexthop = re->ng->nexthop; nexthop; nexthop = nexthop->next) {
if (!CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE)) if (!CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
continue; continue;
@ -595,6 +590,12 @@ int zsend_redistribute_route(int cmd, struct zserv *client,
count++; count++;
} }
/* Nexthops. */
if (count) {
SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
api.nexthop_num = count;
}
/* Attributes. */ /* Attributes. */
SET_FLAG(api.message, ZAPI_MESSAGE_DISTANCE); SET_FLAG(api.message, ZAPI_MESSAGE_DISTANCE);
api.distance = re->distance; api.distance = re->distance;

2
zebra/zebra_fpm_dt.c
View File

@ -90,7 +90,7 @@ static int zfpm_dt_find_route(rib_dest_t **dest_p, struct route_entry **re_p)
if (!re) if (!re)
continue; continue;
if (re->nexthop_active_num <= 0) if (nexthop_group_active_nexthop_num(re->ng) == 0)
continue; continue;
*dest_p = dest; *dest_p = dest;

16
zebra/zebra_nhg.c
View File

@ -644,9 +644,8 @@ static unsigned nexthop_active_check(struct route_node *rn,
/* /*
* Iterate over all nexthops of the given RIB entry and refresh their * Iterate over all nexthops of the given RIB entry and refresh their
* ACTIVE flag. re->nexthop_active_num is updated accordingly. If any * ACTIVE flag. If any nexthop is found to toggle the ACTIVE flag,
* nexthop is found to toggle the ACTIVE flag, the whole re structure * the whole re structure is flagged with ROUTE_ENTRY_CHANGED.
* is flagged with ROUTE_ENTRY_CHANGED.
* *
* Return value is the new number of active nexthops. * Return value is the new number of active nexthops.
*/ */
@ -656,8 +655,8 @@ int nexthop_active_update(struct route_node *rn, struct route_entry *re)
union g_addr prev_src; union g_addr prev_src;
unsigned int prev_active, new_active; unsigned int prev_active, new_active;
ifindex_t prev_index; ifindex_t prev_index;
uint8_t curr_active = 0;
re->nexthop_active_num = 0;
UNSET_FLAG(re->status, ROUTE_ENTRY_CHANGED); UNSET_FLAG(re->status, ROUTE_ENTRY_CHANGED);
for (nexthop = re->ng->nexthop; nexthop; nexthop = nexthop->next) { for (nexthop = re->ng->nexthop; nexthop; nexthop = nexthop->next) {
@ -674,12 +673,15 @@ int nexthop_active_update(struct route_node *rn, struct route_entry *re)
*/ */
new_active = nexthop_active_check(rn, re, nexthop); new_active = nexthop_active_check(rn, re, nexthop);
if (new_active if (new_active
&& re->nexthop_active_num >= zrouter.multipath_num) { && nexthop_group_active_nexthop_num(re->ng)
>= zrouter.multipath_num) {
UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE); UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE);
new_active = 0; new_active = 0;
} }
if (new_active) if (new_active)
re->nexthop_active_num++; curr_active++;
/* Don't allow src setting on IPv6 addr for now */ /* Don't allow src setting on IPv6 addr for now */
if (prev_active != new_active || prev_index != nexthop->ifindex if (prev_active != new_active || prev_index != nexthop->ifindex
|| ((nexthop->type >= NEXTHOP_TYPE_IFINDEX || ((nexthop->type >= NEXTHOP_TYPE_IFINDEX
@ -694,5 +696,5 @@ int nexthop_active_update(struct route_node *rn, struct route_entry *re)
SET_FLAG(re->status, ROUTE_ENTRY_CHANGED); SET_FLAG(re->status, ROUTE_ENTRY_CHANGED);
} }
return re->nexthop_active_num; return curr_active;
} }

3
zebra/zebra_rib.c
View File

@ -2481,7 +2481,8 @@ void _route_entry_dump(const char *func, union prefixconstptr pp,
"%s: metric == %u, mtu == %u, distance == %u, flags == %u, status == %u", "%s: metric == %u, mtu == %u, distance == %u, flags == %u, status == %u",
straddr, re->metric, re->mtu, re->distance, re->flags, re->status); straddr, re->metric, re->mtu, re->distance, re->flags, re->status);
zlog_debug("%s: nexthop_num == %u, nexthop_active_num == %u", straddr, zlog_debug("%s: nexthop_num == %u, nexthop_active_num == %u", straddr,
nexthop_group_nexthop_num(re->ng), re->nexthop_active_num); nexthop_group_nexthop_num(re->ng),
nexthop_group_active_nexthop_num(re->ng));
for (ALL_NEXTHOPS_PTR(re->ng, nexthop)) { for (ALL_NEXTHOPS_PTR(re->ng, nexthop)) {
struct interface *ifp; struct interface *ifp;