Static: Unlock IGP tables on cleanup to avoid problems with hostentry unlocking

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 424e7fc78fc6900cdf246d647744285f3f64ad42..e37c8005b311b6fd0fbccb76623f92afcf291329 100644 (file)
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -4476,10 +4476,7 @@ hostentry_tmp_unlock(resource *r)
 {
   struct hostentry_tmp_lock *l = SKIP_BACK(struct hostentry_tmp_lock, r, r);
   RT_LOCKED(l->tab, tab)
-  {
     l->he->uc--;
-    rt_unlock_table(tab);
-  }
 }
 
 static void
@@ -4524,7 +4521,6 @@ rt_get_hostentry(struct rtable_private *tab, ip_addr a, ip_addr ll, rtable *dep)
   l->he = he;
   l->tab = RT_PUB(tab);
   l->he->uc++;
-  rt_lock_table(tab);
 
   return he;
 }

diff --git a/proto/static/static.c b/proto/static/static.c
index bba868a6e41f4afcc40df16a61e788f1c069f057..aa3f7bac530c70a2da528c8cc11b7b21fff62196 100644 (file)
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -564,13 +564,19 @@ static_shutdown(struct proto *P)
   WALK_LIST(r, cf->routes)
     static_reset_rte(p, r);
 
+  return PS_DOWN;
+}
+
+static void
+static_cleanup(struct proto *P)
+{
+  struct static_proto *p = (void *) P;
+
   if (p->igp_table_ip4)
     rt_unlock_table(p->igp_table_ip4);
 
   if (p->igp_table_ip6)
     rt_unlock_table(p->igp_table_ip6);
-
-  return PS_DOWN;
 }
 
 static void
@@ -835,6 +841,7 @@ struct protocol proto_static = {
   .dump =              static_dump,
   .start =             static_start,
   .shutdown =          static_shutdown,
+  .cleanup =           static_cleanup,
   .reconfigure =       static_reconfigure,
   .copy_config =       static_copy_config,
 };