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

Merge pull request #1825 from chiragshah6/ospfv3_dev

Browse Source 
ospf6d: Intra-prefix LSA update after frr restart
This commit is contained in:
Jafar Al-Gharaibeh 2018-03-20 13:09:29 -06:00 committed by GitHub
commit 1af416bc25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ospf6d/ospf6_area.h
View File

@ -101,6 +101,7 @@ struct ospf6_area {
struct timeval ts_spf; /* SPF calculation time stamp. */
uint32_t full_nbrs; /* Fully adjacent neighbors. */
uint8_t intra_prefix_originate; /* Force intra_prefix lsa originate */
};
#define OSPF6_AREA_ENABLE 0x01

22
ospf6d/ospf6_flood.c
View File

@ -156,6 +156,28 @@ void ospf6_lsa_purge(struct ospf6_lsa *lsa)
ospf6_lsa_premature_aging(lsa);
}
/* Puring Multi Link-State IDs LSAs:
* Same Advertising Router with Multiple Link-State IDs
* LSAs, purging require to traverse all Link-State IDs
*/
void ospf6_lsa_purge_multi_ls_id(struct ospf6_area *oa, struct ospf6_lsa *lsa)
{
int ls_id = 0;
struct ospf6_lsa *lsa_next;
uint16_t type;
type = lsa->header->type;
ospf6_lsa_purge(lsa);
lsa_next = ospf6_lsdb_lookup(type, htonl(++ls_id),
oa->ospf6->router_id, oa->lsdb);
while (lsa_next) {
ospf6_lsa_purge(lsa_next);
lsa_next = ospf6_lsdb_lookup(type, htonl(++ls_id),
oa->ospf6->router_id, oa->lsdb);
}
}
void ospf6_increment_retrans_count(struct ospf6_lsa *lsa)
{

3
ospf6d/ospf6_flood.h
View File

@ -41,6 +41,9 @@ extern void ospf6_lsa_originate_interface(struct ospf6_lsa *lsa,
struct ospf6_interface *oi);
extern void ospf6_lsa_purge(struct ospf6_lsa *lsa);
extern void ospf6_lsa_purge_multi_ls_id(struct ospf6_area *oa,
struct ospf6_lsa *lsa);
/* access method to retrans_count */
extern void ospf6_increment_retrans_count(struct ospf6_lsa *lsa);
extern void ospf6_decrement_retrans_count(struct ospf6_lsa *lsa);

14
ospf6d/ospf6_intra.c
View File

@ -1015,6 +1015,20 @@ int ospf6_intra_prefix_lsa_originate_stub(struct thread *thread)
return 0;
}
/* Neighbor change to FULL, if INTRA-AREA-PREFIX LSA
* has not change, Flush old LSA and Re-Originate INP,
* as ospf6_flood() checks if LSA is same as DB,
* it won't be updated to neighbor's DB.
*/
if (oa->intra_prefix_originate) {
if (IS_OSPF6_DEBUG_ORIGINATE(INTRA_PREFIX))
zlog_debug("%s: Re-originate intra prefix LSA, Current full nbrs %u",
__PRETTY_FUNCTION__, oa->full_nbrs);
if (old)
ospf6_lsa_purge_multi_ls_id(oa, old);
oa->intra_prefix_originate = 0;
}
/* put prefixes to advertise */
prefix_num = 0;
op = (struct ospf6_prefix *)((caddr_t)intra_prefix_lsa

3
ospf6d/ospf6_neighbor.c
View File

@ -188,6 +188,9 @@ static void ospf6_neighbor_state_change(u_char next_state,
OSPF6_NETWORK_LSA_SCHEDULE(on->ospf6_if);
OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT(on->ospf6_if);
}
if (next_state == OSPF6_NEIGHBOR_FULL)
on->ospf6_if->area->intra_prefix_originate = 1;
OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB(on->ospf6_if->area);
if (prev_state == OSPF6_NEIGHBOR_LOADING