Changeset 1065 for TI05-delivery/trunk

Timestamp:

30/05/06 17:22:44 (13 years ago)

Author:

spascoe

Message:

bbftpd.run() now returns to python in the calling process. This allows
the original process to monitor the daemon.

Location:

TI05-delivery/trunk/src

Files:

• Makefile (modified) (1 diff)
• bbftp-server-3.2.0/bbftpd/bbftpd.c (modified) (3 diffs)
• bbftp-server-3.2.0/bbftpd/bbftpd_daemon.c (modified) (3 diffs)

TI05-delivery/trunk/src/Makefile

@@ -26 +26 @@
         make -C $(BBFTPD) install
 
-clean:
+clean: clean_server clean_client
+
+clean_server:
         -rm $(BBFTPD)/*.o $(BBFTPD)/bbftpd
+
+clean_client:
         -rm $(BBFTPC)/*.o $(BBFTPC)/bbftp

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

@@ -805 +805 @@
         ** Run as a daemon 
         */
+#ifdef NDG_PYTHON_EMBED
+      if ((fatherpid = do_daemon(argc, argv, envp)) > 0) return fatherpid;
+#else
         do_daemon(argc, argv, envp);
+#endif
         /*
         ** Check for debug
@@ -1413 +1417 @@
   int argc, i;
   char **argv, **arg_p;
+  int pid;
 
   /*
@@ -1432 +1437 @@
   }
 
-  bbftpd_main(argc, argv, environ);
-
-  // I'm not sure we ever get here.
+  pid = bbftpd_main(argc, argv, environ);
+
   free(argv);
-  Py_RETURN_NONE;
+  return Py_BuildValue("i", pid);
 }
 
 static PyMethodDef BbftpdMethods[] = {
-  {"run", bbftpd_run, METH_VARARGS, "Execute the bbftpd server"},
+  {"run", bbftpd_run, METH_VARARGS, "Execute the bbftpd server.  Returns the PID of the server process"},
   {NULL, NULL, 0, NULL}
 };

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

@@ -87 +87 @@
 extern int outcontrolsock ;
 
+#ifdef NDG_PYTHON_EMBED
+int do_daemon(int argc, char **argv, char **envp)
+#else
 void do_daemon(int argc,char **argv,char **envp)
+#endif
 {
 
@@ -133 +137 @@
         exit(1);
     }
+#ifdef NDG_PYTHON_EMBED
+    /* Return the daemon's PID */
+    if (retcode > 0) return retcode;
+#else
     /* No need for the parent any more */
     if (retcode > 0) _exit(0);
-
+#endif
     prpg = 0 ;
     prpg = setsid () ;     /* disassoiciate from control terminal */
@@ -214 +222 @@
                 incontrolsock = msgsock ;
                 outcontrolsock = msgsock ;
-                   return;
+#ifdef NDG_PYTHON_EMBED
+                return 0;
+#else
+                return;
+#endif
+           
                 }