Changeset 1353 for TI05-delivery/trunk

Timestamp:

03/08/06 10:35:04 (14 years ago)

Author:

spascoe

Message:

Added a convenient debugging funtion ndg_debug_sleep(). Also
made the argument passing to bbftpd_main slightly more conservative.

Location:

TI05-delivery/trunk/src

Files:

• bbftp-server-3.2.0/bbftpd/bbftpd_log.c (modified) (1 diff)
• python_ext/bbftpd.c (modified) (6 diffs)
• python_ext/util.c (modified) (1 diff)
• python_ext/util.h (modified) (1 diff)

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

@@ -71 +71 @@
     fprintf(logfh, "\n");
   }
-  
+  fflush(logfh);
+
   va_end(ap);
   

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

@@ -64 +64 @@
    *      failure rather than error.
    */
-  if ((authzHandler = PyObject_CallMethod(authHandler, "authenticate", "")) == NULL) {
+  if ((authzHandler = PyObject_CallMethod(authHandler, "authenticate", NULL)) == NULL) {
     ndg_pyerr_to_logmessage(logmessage, "ndg_auth");
     return -1;
@@ -243 +243 @@
   PyObject *ret;
 
+  ndg_debug_sleep(15);
+
   if (!PyArg_ParseTuple(args, "")) {
     return NULL;
@@ -260 +262 @@
   ret = Py_BuildValue("s#", buffer, len);
   free(buffer);
+
   return ret;
 }
@@ -270 +273 @@
 static PyObject *pybbftpd_run(PyObject *self, PyObject *args) {
   int argc, i;
-  char **argv, **arg_p;
+  char **argv, **arg_p, *p;
   int pid;
   char preargs[2][20] = { "bbftpd_embedded", "-b" };
@@ -303 +306 @@
       return NULL;
     }
-    if ((*arg_p = PyString_AsString(item)) == NULL) {
+    if ((p = PyString_AsString(item)) == NULL) {
       free(argv);
       Py_DECREF(item);
@@ -310 +313 @@
       return NULL;
     }
+    if ((*arg_p = (char *)malloc(strlen(p))) == NULL) {
+      Py_DECREF(item);
+      Py_DECREF(authHandler);
+      Py_DECREF(daemon_args);
+      PyErr_SetString(PyExc_MemoryError, "malloc failed");
+      return NULL;
+    }
+    strcpy(*arg_p, p);
+
     arg_p++;
     Py_DECREF(item);

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

@@ -13 +13 @@
 #include <string.h>
 #include <Python.h>
+#include <unistd.h>
+#include <stdio.h>
 
 #include "util.h"
+
+/**
+ * dump pid to a file and sleep.  For use when debugging.
+ * @param secs number of seconds to sleep
+ */
+void ndg_debug_sleep(int secs) {
+  FILE *fh;
+  fh = fopen("pybbftpd.pid", "w");
+  fprintf(fh, "%d\n", getpid());
+  fclose(fh);
+
+  sleep(secs);
+}
+    
 
 /**

TI05-delivery/trunk/src/python_ext/util.h

@@ -27 +27 @@
 
 void ndg_pyerr_to_logmessage(char *logmessage, char *prefix);
+void ndg_debug_sleep(int secs);