2004-11-15 Paul Jakma <paul@dishone.st>

	* ospf_{apiserver,te}.c: ospf_lsa_free's should be ospf_lsa_unlock.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 85d9950877a83d57cfd89aa02b083b0e6c9f875a..b8f526e754c3062ec2457f7ab90ad5a528ca50ac 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-15 Paul Jakma <paul@dishone.st>
+
+       * ospf_{apiserver,te}.c: ospf_lsa_free's should be ospf_lsa_unlock.
+
 2004-11-12 Paul Jakma <paul@dishone.st>
 
        * ospf_ia.c: (process_summary_lsa) Only an ABR has any reason to

diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c
index 96fb917939449d530150ce75d247159c856be55e..8bc16dc325d11ff4d63aadbd18e3002ae09c5184 100644 (file)
--- a/ospfd/ospf_apiserver.c
+++ b/ospfd/ospf_apiserver.c
@@ -1529,8 +1529,7 @@ ospf_apiserver_opaque_lsa_new (struct ospf_area *area,
   if ((new->data = ospf_lsa_data_new (length)) == NULL)
     {
       zlog_warn ("ospf_apiserver_opaque_lsa_new: ospf_lsa_data_new() ?");
-      ospf_lsa_free (new);
-      new = NULL;
+      ospf_lsa_unlock (new);
       stream_free (s);
       return NULL;
     }
@@ -1895,7 +1894,7 @@ ospf_apiserver_lsa_refresher (struct ospf_lsa *lsa)
   if (ospf_lsa_install (ospf, new->oi, new) == NULL)
     {
       zlog_warn ("ospf_apiserver_lsa_refresher: ospf_lsa_install failed");
-      ospf_lsa_free (new);
+      ospf_lsa_unlock (new);
       goto out;
     }
 

diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c
index f62f35c46797dfbd6b8f86ab694b1205023d1e58..4a28ae834502627d873535f05b711a1263e5eb35 100644 (file)
--- a/ospfd/ospf_te.c
+++ b/ospfd/ospf_te.c
@@ -903,7 +903,7 @@ ospf_mpls_te_lsa_new (struct ospf_area *area, struct mpls_te_link *lp)
   if ((new->data = ospf_lsa_data_new (length)) == NULL)
     {
       zlog_warn ("ospf_mpls_te_lsa_new: ospf_lsa_data_new() ?");
-      ospf_lsa_free (new);
+      ospf_lsa_unlock (new);
       new = NULL;
       stream_free (s);
       goto out;
@@ -935,7 +935,7 @@ ospf_mpls_te_lsa_originate1 (struct ospf_area *area, struct mpls_te_link *lp)
   if (ospf_lsa_install (area->ospf, NULL/*oi*/, new) == NULL)
     {
       zlog_warn ("ospf_mpls_te_lsa_originate1: ospf_lsa_install() ?");
-      ospf_lsa_free (new);
+      ospf_lsa_unlock (new);
       goto out;
     }
 
@@ -1055,7 +1055,7 @@ ospf_mpls_te_lsa_refresh (struct ospf_lsa *lsa)
   if (ospf_lsa_install (area->ospf, NULL/*oi*/, new) == NULL)
     {
       zlog_warn ("ospf_mpls_te_lsa_refresh: ospf_lsa_install() ?");
-      ospf_lsa_free (new);
+      ospf_lsa_unlock (new);
       goto out;
     }