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

Timestamp:

01/06/06 16:50:32 (14 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-server-3.2.0/bbftpd/bbftpd_private_user.c (modified) (4 diffs)

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

@@ -45 +45 @@
 #ifdef NDG_PYTHON_EMBED
 int bbftpd_private_auth_callback(char *logmessage);
+
 #endif
+
+/* prototypes */
+static int ndg_message_recv(char **buffer, int *length, char *logmessage);
+static int ndg_message_send(char *buffer, int length, char *logmessage);
+
+
 
 /*******************************************************************************
@@ -114 +121 @@
   sprintf(currentusername, "%.*s", MAXLEN, username);
 #else
+  char *privatestr;
+  int privatestr_len;
 
   char msg[NDG_MESSAGE_LEN];
@@ -129 +138 @@
     return -1;
   }
+
+  /* Receive the privatestr */
+  if (ndg_message_recv(&privatestr, &privatestr_len, logmessage) == -1) {
+    return -1;
+  }
+
+  syslog(LOG_INFO, "Private string: %s", privatestr);
 
 #endif
@@ -232 +248 @@
   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 (bbftpd_private_send(ctrl, NDG_MESSAGE_LEN, logmessage) == -1) {
+    return -1;
+  }
+
+  if (bbftpd_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 (bbftpd_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 (bbftpd_private_recv(*buffer, *length, logmessage) == -1) {
+    free(*buffer); *buffer = NULL;
+    return -1;
+  }
+
+  return 0;
+}
+  
+
+
+
 #endif // NDG_AUTH