diff options
| author | Olivier Dugeon <olivier.dugeon@orange.com> | 2018-02-03 19:30:33 +0100 |
|---|---|---|
| committer | Olivier Dugeon <olivier.dugeon@orange.com> | 2018-02-03 19:30:33 +0100 |
| commit | bcf4475ec3f3946a5b9b25d67077bc4cac504954 (patch) | |
| tree | 802b43e50fcf74414cb906f9977f12e6ef6744e3 /ospfd/ospf_ext.c | |
| parent | OSPFd: Correct Extended Prefix LSA refresh (diff) | |
| download | frr-bcf4475ec3f3946a5b9b25d67077bc4cac504954.tar.xz frr-bcf4475ec3f3946a5b9b25d67077bc4cac504954.zip | |
OSPFd: Fix ospfd crash during CI
When preforming CI test, CLI command 'no router ospf' followed by a
'router ospf' is performed to clean up the previous configuration.
Ospfd crash when configuring 'netwoark area'.
This is due to opsf_opaque_term() introduce in previous commit that cause this
crash. It remove not only Opaque LSA but also the list through the call to
'list_delete_and_null()' function. Same take place in 'ospf_mpls_te_term()',
'ospf_router_info_term()' and 'ospf_ext_term()' function.
New set of 'ospf_XXX_finish()' has been introduced to solve this issue while
keeping the possiblity to terminate properly the Opaque LSA and remove MPLS
LFIB entries set by Segment Routing.
Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
Diffstat (limited to 'ospfd/ospf_ext.c')
| -rw-r--r-- | ospfd/ospf_ext.c | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/ospfd/ospf_ext.c b/ospfd/ospf_ext.c index afa70c0f1..819a695e0 100644 --- a/ospfd/ospf_ext.c +++ b/ospfd/ospf_ext.c @@ -168,17 +168,41 @@ int ospf_ext_init(void) /* * Extended Link/Prefix termination function * - * @param - node - * + * @param - none * @return - none */ void ospf_ext_term(void) { + if ((OspfEXT.scope != OSPF_OPAQUE_AREA_LSA) + || (OspfEXT.scope != OSPF_OPAQUE_AS_LSA)) + zlog_warn( + "EXT: Unable to unregister Extended Prefix " + "Opaque LSA functions: Wrong scope!"); + else + ospf_delete_opaque_functab(OspfEXT.scope, + OPAQUE_TYPE_EXTENDED_PREFIX_LSA); + + ospf_delete_opaque_functab(OSPF_OPAQUE_AREA_LSA, + OPAQUE_TYPE_EXTENDED_LINK_LSA); + list_delete_and_null(&OspfEXT.iflist); OspfEXT.scope = 0; OspfEXT.enabled = false; + return; +} + +/* + * Extended Link/Prefix finish function + * + * @param - none + * @return - none + */ +void ospf_ext_finish(void) +{ + // list_delete_all_node(OspfEXT.iflist); + OspfEXT.enabled = false; } /* |