commit 4056a544eb0b7ea513bca0d70808e671c3f2c25b
author Andrew J. Schorr <ajschorr@alumni.princeton.edu> Tue Feb 27 13:55:46 2007 +0000
committer Andrew J. Schorr <ajschorr@alumni.princeton.edu> Tue Feb 27 13:55:46 2007 +0000
tree d5e3ecf637a6ac20215a33e100b63c41eb6c53df
parent bd34fb346db5bb1f0bc8eeeef1868e296d889053

[ospfd] Fix bug: should exit immediately on SIGTERM if OSPF not actually running

2007-02-27 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* ospfd.c: (ospf_terminate) Exit immediately if ospf is not
	  actually running (e.g. the config file was empty).  Fixes
	  bug where SIGTERM would not kill ospfd.

ospfd/ospfd.c

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index f72295d..159422b 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -355,6 +355,10 @@
   
   SET_FLAG (om->options, OSPF_MASTER_SHUTDOWN);
 
+  /* exit immediately if OSPF not actually running */
+  if (listcount(om->ospf) == 0)
+    exit(0);
+
   for (ALL_LIST_ELEMENTS (om->ospf, node, nnode, ospf))
     ospf_finish (ospf);