Readded SIGTERM handling into sigevent stuff. Fixes bugzilla #85.

diff --git a/ChangeLog b/ChangeLog
index 075da2d1d6bc3424fa063b90276819f02587f761..143df370e2cceee5d1f8f8b91c8c09bc51a56c62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-22 Hasso Tepper <hasso@estpak.ee>
+
+       * Readded SIGTERM handling so daemons can clean up their stuff if they
+         are killed (not murdered).
+
 2004-03-20 Michael Bruening <mike@vailsys.com>
 
        * ospfd/ospf_vty.c: Completed array distribute_str of route types with

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 0ba19c2ff7c52254d88e8e4d45b36eca2baf7e8c..54086e5b2bb0d48bb4444f00362c6c4d5b6bb989 100644 (file)
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -72,6 +72,10 @@ struct quagga_signal_t bgp_signals[] =
     .signal = SIGINT,
     .handler = &sigint,
   },
+  {
+    .signal = SIGTERM,
+    .handler = &sigint,
+  },
 };
 
 /* Configuration file and directory. */

diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 43aa5a4fd1832620cc985b03814d75688a261fff..d80aa26c3404b720669c8eb368e232fc82908b24 100644 (file)
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -163,6 +163,10 @@ struct quagga_signal_t ospf_signals[] =
     .signal = SIGINT,
     .handler = &sigint,
   },
+  {
+    .signal = SIGTERM,
+    .handler = &sigint,
+  },
 };
 \f
 /* OSPFd main routine. */

diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index abe6106725bfc1c74c57a9bb1dccc07b86967eff..530b13c95965466ac8516a524d8429082b0a925a 100644 (file)
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -172,6 +172,10 @@ struct quagga_signal_t ripd_signals[] =
     .signal = SIGINT,
     .handler = &sigint,
   },
+  {
+    .signal = SIGTERM,
+    .handler = &sigint,
+  },
 };  
 \f
 /* Main routine of ripd. */

diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index d21ca307a8609b2259816c3450aaf37e5bf05c35..eea47566bc364c63799888fbe2f274136ca546a1 100644 (file)
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -175,6 +175,10 @@ struct quagga_signal_t ripng_signals[] =
     .signal = SIGINT,
     .handler = &sigint,
   },
+  {
+    .signal = SIGTERM,
+    .handler = &sigint,
+  },
 };
 \f
 /* RIPngd main routine. */

diff --git a/zebra/main.c b/zebra/main.c
index 9966c1728f2e241cd3b6a6da0f712d054c4c500e..efc956433f47223fcd7228b4417fbbfb8be4f6a6 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -176,6 +176,10 @@ struct quagga_signal_t zebra_signals[] =
     .signal = SIGINT,
     .handler = &sigint,
   },
+  {
+    .signal = SIGTERM,
+    .handler = &sigint,
+  },
 };
 \f
 /* Main startup routine. */