Changeset 1264 for TI05-delivery/trunk

Timestamp:

03/07/06 10:19:20 (15 years ago)

Author:

spascoe

Message:

Client-side python API now works on all test cases.

Location:

TI05-delivery/trunk

Files:

• src/bbftp-client-3.2.0/bbftpc/bbftp_private_user.c (modified) (2 diffs)
• src/bbftp-server-3.2.0/bbftpd/ndg.c (modified) (3 diffs)
• src/python_ext/bbftpc.c (modified) (1 diff)
• test/runclient.py (modified) (3 diffs)
• test/test_embedded.py (modified) (2 diffs)

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

@@ -143 +143 @@
 
   /* Send version verification message.  */
-  if (ndg_message_send(NDG_HANDSHAKE, strlen(NDG_HANDSHAKE) + 1, logmessage) == -1) {
+  if (ndg_message_send(NDG_HANDSHAKE, strlen(NDG_HANDSHAKE), logmessage) == -1) {
     return -1;
   }
@@ -163 +163 @@
   }
 
-  if (ndg_message_send(privatestr, strlen(privatestr) + 1, logmessage) == -1) {
+  if (ndg_message_send(privatestr, strlen(privatestr), logmessage) == -1) {
     return -1;
   }

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

@@ -50 +50 @@
 
   /* Send response */
-  if (ndg_message_send(NDG_HANDSHAKE, strlen(NDG_HANDSHAKE) + 1, logmessage) == -1) {
+  if (ndg_message_send(NDG_HANDSHAKE, strlen(NDG_HANDSHAKE), logmessage) == -1) {
     return -1;
   }
@@ -204 +204 @@
  *
  * The message length is sent in a separate header.
+ * The message is guaranteed to be NULL terminated.  This is done by
+ * allocating length+1 bytes and filling them with \0.
  *
  * @param buffer is set to newly allocated message buffer.
@@ -221 +223 @@
   }
 
-  if ((*buffer = (char *)malloc(*length * sizeof(char))) == NULL) {
+  if ((*buffer = (char *)calloc(*length+1, sizeof(char))) == NULL) {
     sprintf(logmessage, "ngd_message_recv malloc error");
     return -1;

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

@@ -229 +229 @@
   }
 
-  if (ndg_client_message_send(buffer, len+1, logmessage) == -1) {
+  if (ndg_client_message_send(buffer, len, logmessage) == -1) {
     PyErr_SetString(PyExc_IOError, logmessage);
     return NULL;

TI05-delivery/trunk/test/runclient.py

@@ -14 +14 @@
 NDG_MESSAGE_LEN = 256
 
-NDG_HANDSHAKE = "NDG-Delivery-server %s" % VERSION
+NDG_HANDSHAKE = "NDG-Delivery-client %s" % VERSION
 
 
@@ -23 +23 @@
 
 class AuthClientHandler(object):
-    def __init__(self, privatestr=""):
+    def __init__(self, privatestr="none"):
         self.privatestr = privatestr
 
     def authenticate(self):
-        print >>sys.stderr, "Waiting 20s for gdb connect: pid=%d" % os.getpid(),
-        time.sleep(20)
-        print >>sys.stderr, "continueing"
+        #print >>sys.stderr, "Waiting 20s for gdb connect: pid=%d" % os.getpid(),
+        #time.sleep(20)
+        #print >>sys.stderr, "continueing"
 
         BC.send(NDG_HANDSHAKE)
         resp = BC.recv()
+
+        print "Received Auth handshake: %s" % resp
 
         BC.send(self.privatestr)
@@ -55 +57 @@
     i = args.index('-P')
 except ValueError:
-    privatestr = ""
+    privatestr = "none"
     pass
 else:

TI05-delivery/trunk/test/test_embedded.py

@@ -24 +24 @@
 
 import delivery.server as server
+import traceback
 
 
@@ -34 +35 @@
         #fh.close()
         #time.sleep(20)
+
+        msg = self.recv()
+        syslog.syslog(syslog.LOG_DEBUG, 'AuthContext received Auth message: %s' % msg)
+                
+        self.send(NDG_HANDSHAKE)
+
+        privatestr = self.recv()
+        syslog.syslog(syslog.LOG_DEBUG, "AuthContext received privatestr: %s" % privatestr)
         
-        msg = self.recvCStr()
-
-        syslog.syslog(syslog.LOG_DEBUG, 'AuthContext received Auth message: %s' % msg)
-
-        self.send(NDG_HANDSHAKE)
-
-        privatestr = self.recvCStr()
-        syslog.syslog(syslog.LOG_DEBUG, "AuthContext received privatestr: %s" % privatestr)
-
         return self.makeAuthzHandler(msg, "TestCaseUser")