diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2017-08-31 20:36:14 -0300 |
|---|---|---|
| committer | Renato Westphal <renato@opensourcerouting.org> | 2017-08-31 21:17:11 -0300 |
| commit | cc54cfee3a67aa0192c62736cd567b562bb5597b (patch) | |
| tree | 35ec303f46d8e65a8e6a11703052c2747b2c7981 | |
| parent | be65e7dcde092618d59d5babb643e8e7a4c0239b (diff) | |
zebra: remove refcnt from the route_entry structure
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>
| -rw-r--r-- | zebra/rib.h | 3 | ||||
| -rw-r--r-- | zebra/zebra_rib.c | 14 | ||||
| -rw-r--r-- | zebra/zebra_vty.c | 2 |
3 files changed, 3 insertions, 16 deletions
diff --git a/zebra/rib.h b/zebra/rib.h index 9b1ce23b08..4cc69377d8 100644 --- a/zebra/rib.h +++ b/zebra/rib.h @@ -45,9 +45,6 @@ struct route_entry { /* Nexthop structure */ struct nexthop *nexthop; - /* Refrence count. */ - unsigned long refcnt; - /* Tag */ route_tag_t tag; diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index bcf21783ae..c9e770e204 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -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; } } diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 98ce985344..95ba19b1f6 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -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 |