From: Russ White <russ@riw.us>
Date: Wed, 24 Jan 2018 00:05:05 +0000 (-0500)
Subject: Merge pull request #1667 from Orange-OpenSource/master
X-Git-Tag: frr-4.0-dev~29
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c7cbd53a16c375fc8cc7f258cbe6509830948eaf;p=mirror%2Ffrr.git

Merge pull request #1667 from Orange-OpenSource/master

OSPFD: Solve Issue #1652
---

c7cbd53a16c375fc8cc7f258cbe6509830948eaf
diff --cc ospfd/ospfd.c
index 6d583e9b4a,d3ad7772f9..89b08552a8
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@@ -829,22 -830,21 +829,21 @@@ static void ospf_area_free(struct ospf_
  
  	/* Free LSDBs. */
  	LSDB_LOOP(ROUTER_LSDB(area), rn, lsa)
 -	ospf_discard_from_db(area->ospf, area->lsdb, lsa);
 +		ospf_discard_from_db(area->ospf, area->lsdb, lsa);
  	LSDB_LOOP(NETWORK_LSDB(area), rn, lsa)
 -	ospf_discard_from_db(area->ospf, area->lsdb, lsa);
 +		ospf_discard_from_db(area->ospf, area->lsdb, lsa);
  	LSDB_LOOP(SUMMARY_LSDB(area), rn, lsa)
 -	ospf_discard_from_db(area->ospf, area->lsdb, lsa);
 +		ospf_discard_from_db(area->ospf, area->lsdb, lsa);
  	LSDB_LOOP(ASBR_SUMMARY_LSDB(area), rn, lsa)
 -	ospf_discard_from_db(area->ospf, area->lsdb, lsa);
 +		ospf_discard_from_db(area->ospf, area->lsdb, lsa);
  
  	LSDB_LOOP(NSSA_LSDB(area), rn, lsa)
 -	ospf_discard_from_db(area->ospf, area->lsdb, lsa);
 +		ospf_discard_from_db(area->ospf, area->lsdb, lsa);
  	LSDB_LOOP(OPAQUE_AREA_LSDB(area), rn, lsa)
 -	ospf_discard_from_db(area->ospf, area->lsdb, lsa);
 +		ospf_discard_from_db(area->ospf, area->lsdb, lsa);
  	LSDB_LOOP(OPAQUE_LINK_LSDB(area), rn, lsa)
 -	ospf_discard_from_db(area->ospf, area->lsdb, 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);