Changeset 1157 for TI05-delivery/trunk

Timestamp:

12/06/06 17:03:47 (14 years ago)

Author:

spascoe

Message:

Client-side python embedding is being implemented but doesn't pass the
test cases yet.

I've uncovered a bug (see #343) which needs fixing before the embedded client
can be fully debugged.

Location:

TI05-delivery/trunk

Files:

• setup.py (modified) (4 diffs)
• src/bbftp-client-3.2.0/bbftpc/bbftp.c (modified) (8 diffs)
• src/python_ext/bbftpc.c (added)
• src/python_ext/bbftpd.c (modified) (1 diff)
• test/test_embedded.py (modified) (3 diffs)

TI05-delivery/trunk/setup.py

@@ -5 +5 @@
 
 bbftpd_home = './src/bbftp-server-3.2.0'
+bbftpc_home = './src/bbftp-client-3.2.0'
 # Get the version from ./VERSION
 version = open('./VERSION').read()
@@ -41 +42 @@
     ]
 
-sources = ['%s/bbftpd/%s' % (bbftpd_home, x) for x in bbftpd_src] + ['./src/python_ext/bbftpd.c']
+server_sources = ['%s/bbftpd/%s' % (bbftpd_home, x) for x in bbftpd_src] + ['./src/python_ext/bbftpd.c']
+
+bbftpc_src = [  'bbftp.c',
+                'bbftp_cd.c',
+                'bbftp_get.c',
+                'bbftp_lcd.c',
+                'bbftp_list.c',
+                'bbftp_mget.c',
+                'bbftp_mkdir.c',
+                'bbftp_mput.c',
+                'bbftp_put.c',
+                'bbftp_rm.c',
+                'bbftp_stat.c',
+                'bbftp_statfs.c',
+                'bbftp_dir.c',
+                'bbftp_retr.c',
+                'bbftp_setremotecos.c',
+                'bbftp_setremoteumask.c',
+                'bbftp_store.c',
+                'bbftp_socket.c',
+                'bbftp_utils.c',
+                'connecttoserver.c',
+                'getdatasock.c',
+                'readmessage.c',
+                'sendproto.c',
+                'treatcommand.c',
+                'bbftp_turl.c',
+                'writemessage.c',
+                'setsignals.c',
+                'bbftp_private.c',
+                'bbftp_private_user.c'
+                ]
+
+client_sources = ['%s/bbftpc/%s' % (bbftpc_home, x) for x in bbftpc_src] + ['./src/python_ext/bbftpc.c']
 
 bbftpd = Extension('delivery.bbftpd',
@@ -50 +84 @@
                    include_dirs = [bbftpd_home+'/includes', bbftpd_home+'/bbftpd'],
                    libraries = ['crypt', 'crypto'],
-                   sources = sources)
+                   sources = server_sources)
+
+bbftpc = Extension('delivery.bbftpc',
+                   define_macros = [('NDG_AUTH', 1), ('LOCAL_SYSLOG_FACILITY', 1),
+                                    ('_LARGEFILE64_SOURCE', 1),
+                                    ('NDG_PYTHON_EMBED', 1),
+                                    ('NDG_DELIVERY_VERSION', '"%s"' % version)],
+                   include_dirs = [bbftpc_home+'/includes', bbftpc_home+'/bbftpc'],
+                   libraries = ['crypt', 'crypto'],
+                   sources = client_sources)
 
 setup(name = 'bbftp-python',
@@ -59 +102 @@
       package_dir = {'': 'lib/python'},
       packages = ['delivery'],
-      ext_modules = [bbftpd])
+      ext_modules = [
+                     bbftpd,
+                     bbftpc])
       

TI05-delivery/trunk/src/bbftp-client-3.2.0/bbftpc/bbftp.c

@@ -368 +368 @@
 }
 
+
+#ifdef NDG_PYTHON_EMBED
+bbftpc_main(int argc, char **argv, char **envp) {
+#else
 main(argc, argv, envp)
     int argc;
@@ -373 +377 @@
     char **envp;
 {
+#endif
     extern char *optarg;
     extern int optind, opterr, optopt;
@@ -485 +490 @@
 # endif
 #endif
+#ifdef NDG_PYTHON_EMBED
+                printmessage(stdout,CASE_NORMAL,0,timestamp,"                   Embedded in Python interpreter\n") ;
+#endif // NDG_PYTHON_EMBED
+
                 printmessage(stdout,CASE_NORMAL,0,timestamp,"                   default number of tries = %d  \n",NBTRYMAX) ;
                 printmessage(stdout,CASE_NORMAL,0,timestamp,"                   default sendwinsize = %d Kbytes\n",sendwinsize) ;
@@ -494 +503 @@
     }
 
+#ifndef NDG_PYTHON_EMBED
 /*
 ** Check for stderr replacement
@@ -551 +561 @@
 */
     blockallsignals() ;
+
+#endif // NDG_PYTHON_EMBED
 
 /*
@@ -787 +799 @@
         }
     }
+
+#ifndef NDG_PYTHON_EMBED
 /*
 ** Check for the local user in order to find the .bbftprc file
@@ -1031 +1045 @@
         }
     }
+#endif // NDG_PYTHON_EMBED
+
 /*
 ** Check for input file or command line
@@ -1420 +1436 @@
     sleep(1) ;
     bbftp_close_control() ;
+#ifndef NDG_PYTHON_EMBED
     exit(myexitcode) ;
+#endif
 }

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

@@ -314 +314 @@
   for (i=0; i<argc; i++) {
     if ((item = PySequence_GetItem(daemon_args, i)) == NULL) {
+      free(argv);
       Py_DECREF(authHandler);
       Py_DECREF(daemon_args);

TI05-delivery/trunk/test/test_embedded.py

@@ -10 +10 @@
 import sys, os, signal, time, syslog, stat
 from glob import glob
-import re, tempfile
+import re, tempfile, getopt
 
 HOME = os.path.abspath(os.getenv('NDG_DELIVERY_HOME', os.curdir))
@@ -215 +215 @@
         output = fh.read()
 
+        print output
+
         self.assertLines(['Received Auth handshake: NDG-Delivery-server %s' % VERSION], output)
 
@@ -329 +331 @@
 
 
-if __name__ == '__main__':
-    unittest.main()
+
+import delivery.bbftpc
+
+class PythonClientAuthOK(AuthOK):
+    """Repeat AuthOK tests with a python-embedded client.
+    """
+
+    def _runClient(self, cmd, debug=False, user="testcase", privatestr=None):
+        """Run the client.
+        """
+
+        if debug:
+            f = "-d"
+        else:
+            f = "-m"
+
+        # Tell bbftp to dump output to a file which is then opened for reading.
+        tmp = tempfile.mktemp('test_bbftpd')
+        args = ['-e', cmd, f, '-u', user, '-o', tmp, '-f', tmp, '-r', '1']
+
+        if privatestr != None:
+            args += ['-P', privatestr]
+
+        delivery.bbftpc.run(args + ['localhost'])
+
+        fh.open(tmp)
+        os.remove(tmp)
+
+        return fh
+
+#if __name__ == '__main__':
+#    unittest.main()