diff options
| author | Russ White <russ@riw.us> | 2018-01-23 19:05:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-23 19:05:05 -0500 |
| commit | c7cbd53a16c375fc8cc7f258cbe6509830948eaf (patch) | |
| tree | e84d0b09649c6cafc12645c240cb17f59bb84c8e | |
| parent | d6fed381094ba34c04166b08cd16af01f6c263ea (diff) | |
| parent | 139a482cf0fad8056dcd53b554f467079d0b7e68 (diff) | |
Merge pull request #1667 from Orange-OpenSource/master
OSPFD: Solve Issue #1652
| -rw-r--r-- | ospfd/ospf_opaque.c | 24 | ||||
| -rw-r--r-- | ospfd/ospfd.c | 1 |
2 files changed, 0 insertions, 25 deletions
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c index 6f9da92542..1bd6bf8d4c 100644 --- a/ospfd/ospf_opaque.c +++ b/ospfd/ospf_opaque.c @@ -589,30 +589,6 @@ static void free_opaque_info_per_type(void *val) ospf_opaque_lsa_flush_schedule(lsa); } - /* Remove "oipt" from its owner's self-originated LSA list. */ - switch (oipt->lsa_type) { - case OSPF_OPAQUE_LINK_LSA: { - struct ospf_interface *oi = - (struct ospf_interface *)(oipt->owner); - listnode_delete(oi->opaque_lsa_self, oipt); - break; - } - case OSPF_OPAQUE_AREA_LSA: { - struct ospf_area *area = (struct ospf_area *)(oipt->owner); - listnode_delete(area->opaque_lsa_self, oipt); - break; - } - case OSPF_OPAQUE_AS_LSA: { - struct ospf *top = (struct ospf *)(oipt->owner); - listnode_delete(top->opaque_lsa_self, oipt); - break; - } - default: - zlog_warn("free_opaque_info_per_type: Unexpected LSA-type(%u)", - oipt->lsa_type); - break; /* This case may not exist. */ - } - OSPF_TIMER_OFF(oipt->t_opaque_lsa_self); list_delete_and_null(&oipt->id_list); XFREE(MTYPE_OPAQUE_INFO_PER_TYPE, oipt); diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index 6d583e9b4a..89b08552a8 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -844,7 +844,6 @@ static void ospf_area_free(struct ospf_area *area) LSDB_LOOP(OPAQUE_LINK_LSDB(area), rn, lsa) ospf_discard_from_db(area->ospf, area->lsdb, lsa); - ospf_opaque_type10_lsa_term(area); ospf_lsdb_delete_all(area->lsdb); ospf_lsdb_free(area->lsdb); |