Changeset 13413

Timestamp:

12/08/09 17:49:00 (3 years ago)

Author:

BrainSlayer

Message:

alternate kill method

File:

• src/router/services/services/routing.c (modified) (1 diff)

src/router/services/services/routing.c

@@ -604 +604 @@
                 killall("ospfd", SIGTERM);
                 killall("bgpd", SIGTERM);
-
-                while (!(killall("zebra", SIGTERM) && killall("ripd", SIGTERM)
-                         && killall("ospfd", SIGTERM)
-                         && killall("bgpd", SIGTERM)))
+                int maxcount = 5;
+                if ((pidof("zebra") > 0 || pidof("ripd") > 0
+                     || pidof("ospfd") > 0 || pidof("bgpd") > 0)
+                    && (maxcount--) > 0) {
                         sleep(1);
-
+                }
+                if (!maxcount) {
+                        //okay. strange, now we must kill them
+                        killall("zebra", SIGKILL);
+                        killall("ripd", SIGKILL);
+                        killall("ospfd", SIGKILL);
+                        killall("bgpd", SIGKILL);
+                }
                 cprintf("done\n");
         }