Changeset 975 for TI05-delivery

Timestamp:

22/05/06 16:20:12 (14 years ago)

Author:

spascoe

Message:

Got bbftpd_private_finalise working by setting a SIGTERM signal handler.
This is confirmed by running the test suite and examining /var/log/messages.

Location:

TI05-delivery/trunk/src/bbftp-server-3.2.0

Files:

• bbftpd/bbftpd_private.c (modified) (2 diffs)
• includes/daemon_proto.h (modified) (1 diff)

TI05-delivery/trunk/src/bbftp-server-3.2.0/bbftpd/bbftpd_private.c

@@ -55 +55 @@
 #include <version.h>
 
+#ifdef NDG_AUTH
+#include <signal.h>
+#endif // NDG_AUTH
+
 extern  int     incontrolsock ;
 extern  int     outcontrolsock ;
@@ -358 +362 @@
 */
 int bbftpd_private_initialise(char *logmessage) {
-
-    if (atexit(bbftpd_private_atexit) != 0) {
-      sprintf(logmessage, "atexit failure");
-      return -1;
-    }
-    ndg_atexit_status = NDG_INFATHER;
-    return bbftpd_private_init(logmessage);
-}
+  struct sigaction sga;
+
+  /* Set signal handlers for the daemon.
+   */
+  sga.sa_handler = bbftpd_private_sigaction ;
+  sigemptyset(&(sga.sa_mask));
+  sga.sa_flags = 0  ;
+  if ( sigaction(SIGTERM,&sga,0) < 0 ) {
+    syslog(BBFTPD_ERR,"Error sigaction SIGCTERM : %s",strerror(errno)) ;
+    return -1;
+  }
+
+
+  if (atexit(bbftpd_private_atexit) != 0) {
+    sprintf(logmessage, "atexit failure");
+    return -1;
+  }
+  ndg_atexit_status = NDG_INFATHER;
+  return bbftpd_private_init(logmessage);
+}
+
+/*
+** bbftpd_private_sigaction(int sig)
+**
+**      Routine to exit gracefully if SIGTERM is sent.  The daemon process
+**      will not call any atexit() functions on receipt of SIGTERM by default.
+**      This function is a signal handler to change this behaviour.
+*/
+void bbftpd_private_sigaction(int sig)
+{
+  // Hopefully calling atexit() handlers.
+  exit(0);
+}
+
 
 /*

TI05-delivery/trunk/src/bbftp-server-3.2.0/includes/daemon_proto.h

@@ -65 +65 @@
 #ifdef NDG_AUTH
 int bbftpd_private_initialise(char *logmessage);
+void bbftpd_private_sigaction(int sig);
 void bbftpd_private_atexit(void);
 #endif // NDG_AUTH