Changeset 1238

Timestamp:

26/06/06 16:16:23 (13 years ago)

Author:

spascoe

Message:

Fixed the client API testcase problem. The client and server modules
cannot be linked into the same python interpreter, presumably because of
symbol conflicts. This should only be an issue during testing so I've created
the runclient.py script to circumvent it. There are now a set of test cases that wrap both client and server in python.

bbftp.c has been ammended to ensure all global variables are reset on each
invocation of bbftpc_main().

Location:

TI05-delivery/trunk

Files:

• lib/python/delivery/server.py (modified) (1 diff)
• setup.py (modified) (2 diffs)
• src/bbftp-client-3.2.0/bbftpc/bbftp.c (modified) (1 diff)
• src/python_ext/bbftpc.c (modified) (1 diff)
• test/runclient.py (added)
• test/test_embedded.py (modified) (2 diffs)

TI05-delivery/trunk/lib/python/delivery/server.py

@@ -9 +9 @@
 @author Stephen Pascoe
 """
+
+#!NOTE: Importing bbftpd and bbftpc together is dangerous and will cause stange errors.
+import sys
+if sys.modules.has_key('delivery.bbftpc'):
+    raise ImportError, "delivery.bbftpc extension already loaded.  You cannot use both client and server extensions together"
+
 
 import bbftpd

TI05-delivery/trunk/setup.py

@@ -117 +117 @@
                                     ('_LARGEFILE64_SOURCE', 1),
                                     ('NDG_PYTHON_EMBED', 1),
-                                    ('NDG_DELIVERY_VERSION', '"%s"' % version)],
+                                    ('NDG_DELIVERY_VERSION', version)],
                    include_dirs = [bbftpd_home+'/includes', bbftpd_home+'/bbftpd'],
                    libraries = ['crypt', 'crypto'],
@@ -126 +126 @@
                                     ('_LARGEFILE64_SOURCE', 1),
                                     ('NDG_PYTHON_EMBED', 1),
-                                    ('NDG_DELIVERY_VERSION', '"%s"' % version)],
+                                    ('NDG_DELIVERY_VERSION', version)],
                    include_dirs = [bbftpc_home+'/includes', bbftpc_home+'/bbftpc'],
                    libraries = ['crypt', 'crypto'],

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

@@ -370 +370 @@
 
 #ifdef NDG_PYTHON_EMBED
+/** Reset all global variables to how they were first initialised.
+ */
+void bbftpc_reset_globals(void) {
+
+  state   = SETTOZERO ;
+  timestamp = SETTOZERO ;
+  
+  protocolmin = 2 ; 
+  protocolmax = 3 ; 
+  //int     protocol ;
+  debug = SETTOZERO ;
+  verbose = SETTOZERO ;
+  warning = SETTOZERO ;
+  statoutput = SETTOZERO ;
+  globaltrymax = NBTRYMAX ;
+  newcontrolport = CONTROLPORT ;
+  usessh = SETTOZERO ;
+  sshbatchmode  = SETTOZERO ;
+  sshchildpid   = SETTOZERO ;
+  sshidentityfile = NULL ;
+  sshremotecmd = NULL ;
+  sshcmd = NULL ;
+  
+  usecert = SETTOZERO ;
+  useprivate = SETTOZERO ;
+  privatestr = NULL ;
+  
+  //struct sockaddr_in hisctladdr ;
+  //struct sockaddr_in myctladdr ;
+  bbftprc = NULL ;
+  //int     localumask ;
+#if defined(WITH_RFIO) || defined(WITH_RFIO64)
+  localcos  = SETTOZERO ;
+#endif
+  
+  newcmd = NULL;
+  //int remoterfio;
+  //int localrfio;
+  sendwinsize     = 256 ;
+  recvwinsize     = 256 ;
+  nbport = 1 ;
+  ackto                 = ACKTO;
+  recvcontrolto = CONTROLSOCKTO;
+  sendcontrolto = SENDCONTROLTO;
+  datato                        = DATASOCKTO;
+  
+  remoteumask = SETTOZERO ;
+  remotecos   = -1 ;
+  remotedir = NULL ;
+  //int     incontrolsock ;
+  //int     outcontrolsock ;
+  myexitcode = SETTOZERO ;
+  hostname   = NULL ;
+  hp = NULL ;
+  username   = NULL ;
+  password   = NULL ;
+#ifdef CERTIFICATE_AUTH
+  service    = NULL ;
+#endif
+  mychildren = NULL ;
+  //int     nbpidchild ;
+#ifdef CASTOR
+  castfd = -1 ;
+  castfilename = NULL ;
+#endif
+  transferoption = TROPT_TMP | TROPT_DIR | TROPT_MODE | TROPT_ACC; 
+  filemode ;
+  lastaccess[9] ;
+  lastmodif[9] ;
+  buffersizeperstream = 256 ;
+  //int     requestedstreamnumber ;
+  //my64_t  filesize ;
+  curfilename = NULL ;
+  realfilename   = NULL ;
+  myports        = NULL ;
+  mysockets      = NULL ;
+  readbuffer     = NULL ;
+  compbuffer     = NULL ; 
+  resfd = -1 ;
+  simulation_mode = SETTOZERO;
+  
+  connectionisbroken = SETTOZERO ;
+  
+  pasvport_min = 0 ;
+  pasvport_max = 0 ;
+  
+  commandList = NULL;
+  first = NULL;
+  iterator = NULL;
+}
+
+#endif // NDG_PYTHON_EMBED
+
+
+#ifdef NDG_PYTHON_EMBED
 bbftpc_main(int argc, char **argv, char **envp) {
+  bbftpc_reset_globals();
+  
 #else
 main(argc, argv, envp)

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

@@ -73 +73 @@
   Py_DECREF(client_args);
 
-  for (i=0; i<argv_s.argc; i++) {
-    fprintf(stderr, "delivery.bbftpc.run argument: %s\n", argv_s.argv[i]);
-  }
-  
   bbftpc_main(argv_s.argc, argv_s.argv, environ);
   ndg_argv_clear(&argv_s); ndg_argv_free(&argv_s);

TI05-delivery/trunk/test/test_embedded.py

@@ -224 +224 @@
 
         lines = self._readSyslog()
+
         self.assertLines(['.*AuthContext received Auth message: NDG-Delivery-client %s' % VERSION], lines)
 
@@ -339 +340 @@
 # Embedded client test case currently segfaults :-(
 #
-## import delivery.bbftpc
-## import StringIO
-
-## class PythonClientAuthOK(AuthOK):
-##     """Repeat AuthOK tests with a python-embedded client.
-##     """
-
-##     def _runClient(self, cmd, debug=False, user="testcase", privatestr=None):
-##         """Run the client.
-##         """
-
-##         #print "Waiting for gdb connect, pid = %d" % os.getpid()
-##         #time.sleep(15)
-
-##         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]
-
-##         args.append('localhost')
-##         print "Running client with args: %s" % (args,)
-
-##         delivery.bbftpc.run(args)
-
-##         #fh = open(tmp)
-##         #os.remove(tmp)
-##         fh = StringIO.StringIO('')
-
-##         return fh
+
+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"
+
+        args = ['-e', repr(cmd), f, '-u', user,
+                '-r', '1']
+
+        if privatestr != None:
+            args += ['-P', privatestr]
+
+        args.append('localhost')
+
+        fh = os.popen('%s/test/runclient.py %s' % (HOME, ' '.join(args)))
+
+        return fh
 
 if __name__ == '__main__':