Changeset 1078 for TI05-delivery/trunk/src/bbftp-client-3.2.0

Timestamp:

01/06/06 16:50:32 (15 years ago)

Author:

spascoe

Message:

Implemented higher level auth message passing (the receiver doesn't
need to know the message length). The client will use this mechanism to
send the private string. This is working with stand alone bbftp client/server.

Embedded bbftpd is broken until I make corresponding
changes to the python API.

File:

• TI05-delivery/trunk/src/bbftp-client-3.2.0/bbftpc/bbftp_private_user.c (modified) (3 diffs)

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

@@ -46 +46 @@
 void printmessage(FILE *strm , int flag, int errcode, int tok, char *fmt, ...);
 
+
+/* prototypes */
+static int ndg_message_recv(char **buffer, int *length, char *logmessage);
+static int ndg_message_send(char *buffer, int length, char *logmessage);
 
 /*******************************************************************************
@@ -126 +130 @@
 {
   char msg[NDG_MESSAGE_LEN];
-
+  char default_privatestr[] = "none";
+  
   /* Send version verification message.  */
   sprintf(msg, "%.*s", NDG_MESSAGE_LEN - 1, NDG_HANDSHAKE);
@@ -142 +147 @@
   }
 
+  /* Send the privatestr */
+  // If there is no private string, send default
+  if (privatestr == NULL) {
+    privatestr = default_privatestr;
+  }
+
+  if (ndg_message_send(privatestr, strlen(privatestr) + 1, logmessage) == -1) {
+    return -1;
+  }
+
   return  0 ;
 }
+
+/*
+ * Higher level message transfer functions.
+ *
+ */
+
+/**
+ * Send a message, declaring it's length to the client.
+ *
+ * @param buffer a pointer to the message buffer
+ * @param length the number of bytes to send
+ * @param[out] loggmessage is filled with the error message on error
+ * @return 0 if OK, -1 if error
+ */
+static int ndg_message_send(char *buffer, int length, char *logmessage) {
+  char ctrl[NDG_MESSAGE_LEN];
+
+  sprintf(ctrl, "NDG-msg: %i", length);
+  if (bbftp_private_send(ctrl, NDG_MESSAGE_LEN, logmessage) == -1) {
+    return -1;
+  }
+
+  if (bbftp_private_send(buffer, length, logmessage) == -1) {
+    return -1;
+  }
+
+  return 0;
+}
+
+/**
+ * Receive a message of variable length
+ *
+ * @param[out] buffer is set to newly allocated message buffer
+ * @param[out] length is set to the length of the message
+ * @param[out] logmessage is filled with the logmessage on error
+ * @return 0 if OK, -1 if error
+ */
+static int ndg_message_recv(char **buffer, int *length, char *logmessage) {
+  char ctrl[NDG_MESSAGE_LEN];
+
+  if (bbftp_private_recv(ctrl, NDG_MESSAGE_LEN, logmessage) == -1) {
+    return -1;
+  }
+  if (sscanf(ctrl, "NDG-msg: %i", length) != 1) {
+    sprintf(logmessage, "ndg_message_recv ctrl error: %40s", ctrl);
+    return -1;
+  }
+
+  if ((*buffer = (char *)malloc(*length * sizeof(char))) == NULL) {
+    sprintf(logmessage, "ngd_message_recv malloc error");
+    return -1;
+  }
+
+  if (bbftp_private_recv(buffer, *length, logmessage) == -1) {
+    free(*buffer); *buffer = NULL;
+    return -1;
+  }
+
+  return 0;
+}
+