Changeset 1070 for TI05-delivery

Timestamp:

31/05/06 12:57:18 (13 years ago)

Author:

spascoe

Message:

Slight modifications to bbftpd module and a new test case for testing
the embedded server.

Location:

TI05-delivery/trunk

Files:

• src/bbftp-server-3.2.0/bbftpd/bbftpd.c (modified) (1 diff)
• src/bbftp-server-3.2.0/bbftpd/bbftpd_daemon.c (modified) (1 diff)
• src/python_ext/bbftpd.c (modified) (1 diff)
• test/test_embedded.py (added)

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

@@ -1085 +1085 @@
                 state = S_PROTWAIT ;
                 sprintf(logmessage,"bbftpd version %s : OK",VERSION) ;
-                syslog(BBFTPD_DEBUG, "Lets send the auth reply ...");
                 reply(MSG_OK,logmessage) ;
             } else {

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

@@ -139 +139 @@
 #ifdef NDG_PYTHON_EMBED
     /* Return the daemon's PID */
-    if (retcode > 0) return retcode;
+    if (retcode > 0) {
+      close(controlsock);
+      return retcode;
+    }
 #else
     /* No need for the parent any more */

TI05-delivery/trunk/src/python_ext/bbftpd.c

@@ +1 @@
+/**
+ * NDG python embedded bbftp daemon module.
+ *
+ * @author Stephen Pascoe
+ *
+ * Copyright (C) 2006 CCLRC & NERC
+ *
+ * This software may be distributed under the terms of the Q Public Licence, version 1.0 or later.
+ *
+ */
+
 #include <Python.h>
 
 extern char **environ;
-/* From bbftpd.c */
+/*
+ * variables and prototypes from bbftpd.c
+ */
+
+extern int be_daemon;
+extern int newcontrolport;
+
 int bbftpd_main(int argc, char **argv, char **envp);
 
-/*
-  When embedding in python main is replaced by a simple python function call.
-*/
 static PyObject *bbftpd_run(PyObject *self, PyObject *args) {
   int argc, i;
   char **argv, **arg_p;
   int pid;
+  char preargs[2][20] = { "bbftpd_embedded", "-b" };
+  PyObject *daemon_args, *item;
+
+  if (!PyArg_ParseTuple(args, "O", &daemon_args)) {
+    return NULL;
+  }
+  Py_INCREF(daemon_args);
 
   /*
    * Convert arguments into a standard argv sequence.
    */
-  argc = PyTuple_GET_SIZE(args);
-  if ((argv = (char*)malloc(argc*sizeof(char*))) == NULL) {
+  argc = PySequence_Size(daemon_args);
+  if ((argv = (char**)malloc((argc + 2)*sizeof(char*))) == NULL) {
     PyErr_SetString(PyExc_MemoryError, "malloc failed");
+    Py_DECREF(daemon_args);
     return NULL;
   }
 
+  // Add fixed arguments to daemon's argv
   arg_p = argv;
-  for (i==0; i<argc; i++) {
-    if ((*arg_p = PyString_AsString(PyTuple_GET_ITEM(args, i))) == NULL) {
+  *arg_p = preargs[0]; arg_p++;
+  *arg_p = preargs[1]; arg_p++;
+
+  for (i=0; i<argc; i++) {
+    if ((item = PySequence_GetItem(daemon_args, i)) == NULL) {
+      Py_DECREF(daemon_args);
+      return NULL;
+    }
+    if ((*arg_p = PyString_AsString(item)) == NULL) {
       free(argv);
+      Py_DECREF(item);
+      Py_DECREF(daemon_args);
       return NULL;
     }
     arg_p++;
+    Py_DECREF(item);
   }
 
-  pid = bbftpd_main(argc, argv, environ);
+  /*
+   * We must reset some global variables so that bbftpd_run can be executed multiple times.
+   */
+  be_daemon = 0;
+
+  pid = bbftpd_main(argc+2, argv, environ);
 
   free(argv);
+  Py_DECREF(daemon_args);
   return Py_BuildValue("i", pid);
 }
 
 static PyMethodDef BbftpdMethods[] = {
-  {"run", bbftpd_run, METH_VARARGS, "Execute the bbftpd server.  Returns the PID of the server process"},
+  {
+    "run", bbftpd_run, METH_VARARGS, 
+    "Execute the bbftpd server.\n"
+    "\n"
+    "Forks an embedded bbftpd process as if it were executed\n"
+    "with the command line $ bbftpd -b <args>."
+    "\n"
+    "@param args: command line arguments to pass to the server\n"
+    "@return: the PID of the server process\n"
+  },
   {NULL, NULL, 0, NULL}
 };