proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-12-26 07:46:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: remove refcnt from the route_entry structure

Browse Source 
This reference counter was introduced in 2001, apparently to solve a
problem with connected routes being added/removed multiple times. The RIB
code changed a lot since then, and giving the current callers of rib_add()
and rib_delete() it's safe to assume that we don't need this anymore.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2017-08-31 20:36:14 -03:00
parent be65e7dcde
commit cc54cfee3a
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zebra/rib.h
View File

@ -45,9 +45,6 @@ struct route_entry {
/* Nexthop structure */
struct nexthop *nexthop;
/* Refrence count. */
unsigned long refcnt;
/* Tag */
route_tag_t tag;

14
zebra/zebra_rib.c
View File

@ -2061,10 +2061,9 @@ void _route_entry_dump(const char *func, union prefixconstptr pp,
is_srcdst ? prefix2str(src_pp, srcaddr, sizeof(srcaddr))
: "",
re->vrf_id);
zlog_debug(
"%s: refcnt == %lu, uptime == %lu, type == %u, instance == %d, table == %d",
func, re->refcnt, (unsigned long)re->uptime, re->type,
re->instance, re->table);
zlog_debug("%s: uptime == %lu, type == %u, instance == %d, table == %d",
func, (unsigned long)re->uptime, re->type, re->instance,
re->table);
zlog_debug(
"%s: metric == %u, mtu == %u, distance == %u, flags == %u, status == %u",
func, re->metric, re->mtu, re->distance, re->flags, re->status);
@ -2335,12 +2334,6 @@ void rib_delete(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type,
&& rtnh->type == NEXTHOP_TYPE_IFINDEX && nh) {
if (rtnh->ifindex != nh->ifindex)
continue;
if (re->refcnt) {
re->refcnt--;
route_unlock_node(rn);
route_unlock_node(rn);
return;
}
same = re;
break;
}
@ -2480,7 +2473,6 @@ int rib_add(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type, u_short instance,
&& rtnh->type == NEXTHOP_TYPE_IFINDEX
&& rtnh->ifindex == nh->ifindex
&& !CHECK_FLAG(re->status, ROUTE_ENTRY_REMOVED)) {
re->refcnt++;
return 0;
}
}

2
zebra/zebra_vty.c
View File

@ -402,8 +402,6 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
}
if (CHECK_FLAG(re->flags, ZEBRA_FLAG_SELECTED))
vty_out(vty, ", best");
if (re->refcnt)
vty_out(vty, ", refcnt %ld", re->refcnt);
vty_out(vty, "\n");
if (re->type == ZEBRA_ROUTE_RIP || re->type == ZEBRA_ROUTE_OSPF