Changeset 1289
- Timestamp:
- 10/07/06 14:54:57 (15 years ago)
- Location:
- TI05-delivery/trunk
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
TI05-delivery/trunk/examples/deliveryclient.py
r1280 r1289 17 17 sys.path.append(BUILDDIR) 18 18 19 import delivery.client as DC19 import pybbftp.client as DC 20 20 21 21 class AuthClientHandler(DC.AuthClientHandler): -
TI05-delivery/trunk/examples/deliveryd.py
r1269 r1289 11 11 HOME = os.path.abspath(os.getenv('NDG_DELIVERY_HOME', os.curdir)) 12 12 BUILDDIR = glob('%s/build/lib.*' % HOME)[0] 13 BBFTP = glob('%s/src/bbftp-client*/bbftpc/bbftp' % HOME)[0]14 13 DATADIR = '%s/test/data' % HOME 15 14 VERSION = open('%s/VERSION' % HOME).read() … … 20 19 sys.path.append(BUILDDIR) 21 20 22 import delivery.server as server21 import pybbftp.server as server 23 22 24 23 -
TI05-delivery/trunk/lib/python/pybbftp/client.py
r1288 r1289 9 9 10 10 import sys 11 if sys.modules.has_key(' delivery.bbftpd') and not sys.modules.has_key('epydoc'):12 raise ImportError, " delivery.bbftpd extension already loaded. You cannot use both client and server extensions together"11 if sys.modules.has_key('pybbftp.bbftpd') and not sys.modules.has_key('epydoc'): 12 raise ImportError, "pybbftp.bbftpd extension already loaded. You cannot use both client and server extensions together" 13 13 14 14 import bbftpc -
TI05-delivery/trunk/lib/python/pybbftp/server.py
r1288 r1289 13 13 # However if the module is being scanned by epydoc allow the import (This is a hack!) 14 14 import sys 15 if sys.modules.has_key(' delivery.bbftpc') and not sys.modules.has_key('epydoc'):16 raise ImportError, " delivery.bbftpc extension already loaded. You cannot use both client and server extensions together"15 if sys.modules.has_key('pybbftp.bbftpc') and not sys.modules.has_key('epydoc'): 16 raise ImportError, "pybbftp.bbftpc extension already loaded. You cannot use both client and server extensions together" 17 17 18 18 import bbftpd -
TI05-delivery/trunk/setup.py
r1281 r1289 97 97 98 98 def run(self): 99 cmd = 'epydoc -o doc/epydoc -v --docformat javadoc --name "NDG Delivery Service" build/lib*/delivery/' 99 cmd = ('epydoc -o doc/epydoc -v --docformat javadoc ' 100 '--name "NDG Delivery Service" build/lib*/pybbftp/') 100 101 self.execute(os.system, (cmd,)) 101 102 self.execute(os.system, ('doxygen',)) … … 117 118 118 119 119 bbftpd = Extension(' delivery.bbftpd',120 bbftpd = Extension('pybbftp.bbftpd', 120 121 define_macros = [('NDG_AUTH', 1), ('LOCAL_SYSLOG_FACILITY', 1), 121 122 ('_LARGEFILE64_SOURCE', 1), … … 124 125 include_dirs = [bbftpd_home+'/includes', bbftpd_home+'/bbftpd'], 125 126 libraries = ['crypt', 'crypto'], 126 extra_compile_args = ["-O1" ],127 extra_compile_args = ["-O1", "-Wno-strict-prototypes"], 127 128 sources = server_sources) 128 129 129 bbftpc = Extension(' delivery.bbftpc',130 bbftpc = Extension('pybbftp.bbftpc', 130 131 define_macros = [('NDG_AUTH', 1), ('LOCAL_SYSLOG_FACILITY', 1), 131 132 ('_LARGEFILE64_SOURCE', 1), … … 134 135 include_dirs = [bbftpc_home+'/includes', bbftpc_home+'/bbftpc'], 135 136 libraries = ['crypt', 'crypto'], 136 extra_compile_args = ["-O1" ],137 extra_compile_args = ["-O1", "-Wno-strict-prototypes"], 137 138 sources = client_sources) 138 139 … … 143 144 author_email = 'S.Pascoe@rl.ac.uk', 144 145 package_dir = {'': 'lib/python'}, 145 packages = [' delivery'],146 packages = ['pybbftp'], 146 147 ext_modules = [ 147 148 bbftpd, -
TI05-delivery/trunk/src/bbftp-client-3.2.0/bbftpc/bbftp_private_user.c
r1265 r1289 28 28 *****************************************************************************/ 29 29 #include <stdio.h> 30 #include <stdlib.h> 30 31 31 32 #include <bbftp_private_user.h> 32 33 #include <client.h> 33 34 34 #ifdef NDG_ PRIVATE_AUTH35 #ifdef NDG_AUTH 35 36 int ndg_client_auth(char *logmessage); 36 37 #endif // NDG_PRIVATE_AUTH … … 51 52 void PRINTMESSAGE(FILE *strm , int flag, int errcode, int tok, char *fmt, ...); 52 53 53 54 #ifndef NDG_PYTHON_EMBED 54 55 /* prototypes */ 55 56 static int ndg_message_recv(char **buffer, int *length, char *logmessage); 56 57 static int ndg_message_send(char *buffer, int length, char *logmessage); 58 #endif 57 59 58 60 /******************************************************************************* … … 134 136 int bbftp_private_auth(char *logmessage) 135 137 { 138 139 #ifdef NDG_PYTHON_EMBED 140 return ndg_client_auth(logmessage); 141 #else 136 142 char *msg; 137 143 char default_privatestr[] = "none"; 138 144 int len; 139 140 #ifdef NDG_PYTHON_EMBED141 return ndg_client_auth(logmessage);142 #else143 145 144 146 /* Send version verification message. */ … … 171 173 } 172 174 175 176 177 #ifndef NDG_PYTHON_EMBED 173 178 /* 174 179 * Higher level message transfer functions. … … 230 235 return 0; 231 236 } 232 237 238 #endif // !NDG_PYTHON_EMBED -
TI05-delivery/trunk/src/bbftp-client-3.2.0/includes/ndg_client.h
r1271 r1289 16 16 #define NDG_MESSAGE_LEN 256 17 17 18 /* From bbftp_private.c */ 19 int bbftp_private_recv(char *buffertorecv, int lengthtorecv, char *logmessage); 20 int bbftp_private_send(char *buffertosend, int buffertosendlength, char *logmessage); 18 21 19 22 int ndg_client_message_send(char *buffer, int length, char *logmessage); -
TI05-delivery/trunk/src/bbftp-server-3.2.0/bbftpd/bbftpd.c
r1117 r1289 389 389 390 390 #ifdef NDG_PYTHON_EMBED 391 int bbftpd_main ( argc, argv,envp)391 int bbftpd_main (int argc, char **argv, char **envp) 392 392 #else 393 393 main (argc,argv,envp) 394 #endif //NDG_PYTHON_EMBED395 394 int argc ; 396 395 char **argv ; 397 396 char **envp ; 397 #endif //NDG_PYTHON_EMBED 398 398 { 399 399 extern char *optarg; -
TI05-delivery/trunk/src/bbftp-server-3.2.0/bbftpd/ndg.c
r1264 r1289 10 10 */ 11 11 12 #include <Python.h> 12 13 #include <ndg.h> 13 14 -
TI05-delivery/trunk/src/bbftp-server-3.2.0/includes/ndg.h
r1259 r1289 25 25 26 26 #ifdef NDG_PYTHON_EMBED 27 #include <Python.h>28 27 29 28 int bbftpd_private_authz_control(int msgcode, int transferoption, char *path, char *logmessage); -
TI05-delivery/trunk/src/python_ext/util.c
r1259 r1289 12 12 #include <stdlib.h> 13 13 #include <string.h> 14 #include <Python.h> 15 14 16 #include "util.h" 15 17 -
TI05-delivery/trunk/src/python_ext/util.h
r1259 r1289 9 9 * 10 10 */ 11 12 #include <Python.h>13 11 14 12 #define NDG_MAX_LOGMESSAGE 1024 -
TI05-delivery/trunk/test/runclient.py
r1268 r1289 19 19 sys.path.append(BUILDDIR) 20 20 21 import delivery.client as DC21 import pybbftp.client as DC 22 22 23 23 class AuthClientHandler(DC.AuthClientHandler): -
TI05-delivery/trunk/test/test_embedded.py
r1281 r1289 23 23 sys.path.append(BUILDDIR) 24 24 25 import delivery.server as server25 import pybbftp.server as server 26 26 import traceback 27 27
Note: See TracChangeset
for help on using the changeset viewer.