Changeset 1077 for TI05-delivery/trunk/src

Timestamp:

01/06/06 15:18:02 (13 years ago)

Author:

spascoe

Message:

Implemented full client-server handshake. A version message is now
exchanged client->server then server->client. These messages are logged
in debug mode. Message passing is implemented in Python on the server (at the
moment this is only implemented within test/test_embedded.py).

Location:

TI05-delivery/trunk/src

Files:

• Makefile (modified) (1 diff)
• bbftp-client-3.2.0/bbftpc/bbftp_private_user.c (modified) (3 diffs)
• bbftp-client-3.2.0/includes/bbftp_private_user.h (modified) (2 diffs)
• bbftp-server-3.2.0/bbftpd/bbftpd_private_user.c (modified) (3 diffs)
• bbftp-server-3.2.0/includes/bbftp_private_user.h (modified) (1 diff)
• bbftp-server-3.2.0/includes/bbftpd_private_user.h (modified) (2 diffs)

TI05-delivery/trunk/src/Makefile

@@ -1 +1 @@
 #
-# Top level makefile for the DeliveryService source code.
+# Makefile for building bbftp client & server stand alone (without Python API)
+#
 
 PREFIX=$(HOME)/opt/bbftp
+# Grab the DeliveryService version from the parent directory.
+VERSION:=$(shell cat ../VERSION)
+
+DEFS="-DNDG_AUTH -DLOCAL_SYSLOG_FACILITY -DNDG_DELIVERY_VERSION=$(VERSION)"
 CONFIG_OPTS=--prefix=$(PREFIX) --without-gzip --without-rfio --enable-authentication=private \
-                CPPFLAGS="-DNDG_AUTH -DLOCAL_SYSLOG_FACILITY"
+                CFLAGS=$(DEFS)
 
 BBFTPD=bbftp-server-3.2.0/bbftpd

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

@@ -30 +30 @@
 
 #include <bbftp_private_user.h>
+#include <client.h>
 
 /*
@@ -39 +40 @@
 */
 extern char *privatestr ;
+
+extern int debug;
+
+/* From bbftp_util.c */
+void printmessage(FILE *strm , int flag, int errcode, int tok, char *fmt, ...);
+
 
 /*******************************************************************************
@@ -118 +125 @@
 int bbftp_private_auth(char *logmessage) 
 {
+  char msg[NDG_MESSAGE_LEN];
+
   /* Send version verification message.  */
-  if (bbftp_private_send(NDG_FTP_PROTOCOL, NDG_MESSAGE_LEN, logmessage) == -1) {
+  sprintf(msg, "%.*s", NDG_MESSAGE_LEN - 1, NDG_HANDSHAKE);
+  if (bbftp_private_send(msg, NDG_MESSAGE_LEN, logmessage) == -1) {
     return -1;
+  }
+
+  /* Receive response */
+  if (bbftp_private_recv(msg, NDG_MESSAGE_LEN, logmessage) == -1) {
+    return -1;
+  }
+
+  if (debug) {
+    printmessage(stdout,CASE_NORMAL,0,0,"Received Auth handshake: %s\n", msg) ;
   }
 

TI05-delivery/trunk/src/bbftp-client-3.2.0/includes/bbftp_private_user.h

@@ -43 +43 @@
  */
 
-#define NDG_FTP_VERSION "v0.0.1"
-#define NDG_FTP_PROTOCOL ("NDG-bbFTP" NDG_FTP_VERSION)
+// Define this in the makefile
+// #define NDG_DELIVERY_VERSION "v0.0.1"
+#define NDG_STR(s) #s
+#define NDG_XSTR(s) NDG_STR(s)
+#define NDG_HANDSHAKE ("NDG-Delivery-client " NDG_XSTR(NDG_DELIVERY_VERSION))
 
 #define NDG_MESSAGE_LEN 256
@@ -52 +55 @@
 */
 #define NDG_MAX_LOGMESSAGE 1024
+

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

@@ -37 +37 @@
 #include <bbftpd_private_user.h>
 
+#ifdef NDG_PYTHON_EMBED
+#include <Python.h>
+#endif
+
 extern char currentusername[MAXLEN] ;
 
@@ -112 +116 @@
 
   char msg[NDG_MESSAGE_LEN];
-  /* Send version verification message.  */
+  /* Receive version verification message.  */
   if (bbftpd_private_recv(msg, NDG_MESSAGE_LEN, logmessage) == -1) {
     return -1;
@@ -118 +122 @@
   else {
     syslog(LOG_DEBUG, "Received auth message: %s", msg);
+  }
+
+  /* Send response */
+  sprintf(msg, "%.*s", NDG_MESSAGE_LEN - 1, NDG_HANDSHAKE);
+  if (bbftpd_private_send(msg, NDG_MESSAGE_LEN, logmessage) == -1) {
+    return -1;
   }
 

TI05-delivery/trunk/src/bbftp-server-3.2.0/includes/bbftp_private_user.h

@@ -38 +38 @@
 
 **/
+
+#ifdef NDG_AUTH
+#define NDG_STR(s) #s
+#define NDG_XSTR(s) NDG_STR(s)
+#define NDG_HANDSHAKE ("NDG-Delivery-server " NDG_XSTR(NDG_DELIVERY_VERSION))
+#endif

TI05-delivery/trunk/src/bbftp-server-3.2.0/includes/bbftpd_private_user.h

@@ -28 +28 @@
 *****************************************************************************/
 
-#include <Python.h>
-
 /*
 ** This include must contain all global variable to be used for private
@@ -49 +47 @@
 #define NDG_MAX_LOGMESSAGE 1024
 #define NDG_MESSAGE_LEN 256
+
+#define NDG_STR(s) #s
+#define NDG_XSTR(s) NDG_STR(s)
+#define NDG_HANDSHAKE ("NDG-Delivery-server " NDG_XSTR(NDG_DELIVERY_VERSION))