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

Merge pull request #1278 from chiragshah6/ospf_vrf_dev

Browse Source 
ospfd: Fix maxage_lsa lookup key
This commit is contained in:
Jafar Al-Gharaibeh 2017-10-03 10:41:00 -05:00 committed by GitHub
commit cb64dec0d6
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ospfd/ospf_lsa.c
View File

@ -2844,11 +2844,12 @@ static int ospf_maxage_lsa_remover(struct thread *thread)
void ospf_lsa_maxage_delete(struct ospf *ospf, struct ospf_lsa *lsa) void ospf_lsa_maxage_delete(struct ospf *ospf, struct ospf_lsa *lsa)
{ {
struct route_node *rn; struct route_node *rn;
struct prefix_ptr lsa_prefix; struct prefix lsa_prefix;
memset(&lsa_prefix, 0, sizeof(struct prefix));
lsa_prefix.family = 0; lsa_prefix.family = 0;
lsa_prefix.prefixlen = sizeof(lsa_prefix.prefix) * CHAR_BIT; lsa_prefix.prefixlen = sizeof(lsa_prefix.u.ptr) * CHAR_BIT;
lsa_prefix.prefix = (uintptr_t)lsa; lsa_prefix.u.ptr = (uintptr_t)lsa;
if ((rn = route_node_lookup(ospf->maxage_lsa, if ((rn = route_node_lookup(ospf->maxage_lsa,
(struct prefix *)&lsa_prefix))) { (struct prefix *)&lsa_prefix))) {
@ -2860,6 +2861,10 @@ void ospf_lsa_maxage_delete(struct ospf *ospf, struct ospf_lsa *lsa)
rn); /* unlock node because lsa is deleted */ rn); /* unlock node because lsa is deleted */
} }
route_unlock_node(rn); /* route_node_lookup */ route_unlock_node(rn); /* route_node_lookup */
} else {
if (IS_DEBUG_OSPF_EVENT)
zlog_debug("%s: lsa %s is not found in maxage db.",
__PRETTY_FUNCTION__, dump_lsa_key(lsa));
} }
} }
@ -2870,7 +2875,7 @@ void ospf_lsa_maxage_delete(struct ospf *ospf, struct ospf_lsa *lsa)
*/ */
void ospf_lsa_maxage(struct ospf *ospf, struct ospf_lsa *lsa) void ospf_lsa_maxage(struct ospf *ospf, struct ospf_lsa *lsa)
{ {
struct prefix_ptr lsa_prefix; struct prefix lsa_prefix;
struct route_node *rn; struct route_node *rn;
/* When we saw a MaxAge LSA flooded to us, we put it on the list /* When we saw a MaxAge LSA flooded to us, we put it on the list
@ -2884,9 +2889,10 @@ void ospf_lsa_maxage(struct ospf *ospf, struct ospf_lsa *lsa)
return; return;
} }
memset(&lsa_prefix, 0, sizeof(struct prefix));
lsa_prefix.family = 0; lsa_prefix.family = 0;
lsa_prefix.prefixlen = sizeof(lsa_prefix.prefix) * CHAR_BIT; lsa_prefix.prefixlen = sizeof(lsa_prefix.u.ptr) * CHAR_BIT;
lsa_prefix.prefix = (uintptr_t)lsa; lsa_prefix.u.ptr = (uintptr_t)lsa;
if ((rn = route_node_get(ospf->maxage_lsa, if ((rn = route_node_get(ospf->maxage_lsa,
(struct prefix *)&lsa_prefix)) (struct prefix *)&lsa_prefix))
@ -2903,7 +2909,8 @@ void ospf_lsa_maxage(struct ospf *ospf, struct ospf_lsa *lsa)
SET_FLAG(lsa->flags, OSPF_LSA_IN_MAXAGE); SET_FLAG(lsa->flags, OSPF_LSA_IN_MAXAGE);
} }
} else { } else {
zlog_err("Unable to allocate memory for maxage lsa\n"); zlog_err("Unable to allocate memory for maxage lsa %s\n",
dump_lsa_key(lsa));
assert(0); assert(0);
} }