Changeset 90873cc in rtems-libbsd for rtemsbsd/ftpd

Timestamp:

06/28/16 03:32:01 (7 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

4a2b844

Parents:

c2ec5f1

Message:

Add ftpd as a service. Add rtems-bsd-config.h for app libbsd set up.

Location:

rtemsbsd/ftpd

Files:

• ftpd-init.c (added)
• ftpd-service.c (added)
• ftpd.c (modified) (15 diffs)

rtemsbsd/ftpd/ftpd.c

@@ -14 +14 @@
  *                Arnout Vandecappelle <arnout@mind.be> (AV)
  *                Sebastien Bourdeauducq <sebastien@milkymist.org> (MM)
- *                
+ *
  *
  *  Changes:
@@ -21 +21 @@
  *
  *      * Support spaces in filenames
- * 
+ *
  *    2010-04-29        Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
- * 
+ *
  *      * Added USER/PASS authentication.
- * 
+ *
  *    2001-01-31        Sergei Organov <osv@javad.ru>
  *
@@ -245 +245 @@
 
 /* Configuration table */
-extern struct rtems_ftpd_configuration rtems_ftpd_configuration;
+static struct rtems_ftpd_configuration* ftpd_config;
 
 /* this is not prototyped in strict ansi mode */
@@ -954 +954 @@
   }
 
-  if (!null && rtems_ftpd_configuration.hooks != NULL)
+  if (!null && ftpd_config->hooks != NULL)
   {
 
@@ -962 +962 @@
 
     i = 0;
-    hook = &rtems_ftpd_configuration.hooks[i++];
+    hook = &ftpd_config->hooks[i++];
     while (hook->filename != NULL)
     {
@@ -970 +970 @@
         break;
       }
-      hook = &rtems_ftpd_configuration.hooks[i++];
+      hook = &ftpd_config->hooks[i++];
     }
   }
@@ -983 +983 @@
      */
 
-    char                *bigBufr;
-    size_t filesize = rtems_ftpd_configuration.max_hook_filesize + 1;
+    char   *bigBufr;
+    size_t  filesize = ftpd_config->max_hook_filesize + 1;
 
     /*
@@ -1767 +1767 @@
     info->pass = NULL;
     info->user = strdup(fname);
-    if (rtems_ftpd_configuration.login &&
-      !rtems_ftpd_configuration.login(info->user, NULL)) {
+    if (ftpd_config->login &&
+      !ftpd_config->login(info->user, NULL)) {
       info->auth = false;
       send_reply(info, 331, "User name okay, need password.");
@@ -1785 +1785 @@
       send_reply(info, 332, "Need account to log in");
     } else {
-      if (rtems_ftpd_configuration.login &&
-        !rtems_ftpd_configuration.login(info->user, info->pass)) {
+      if (ftpd_config->login &&
+        !ftpd_config->login(info->user, info->pass)) {
         info->auth = false;
         send_reply(info, 530, "Not logged in.");
@@ -1827 +1827 @@
         char *c;
         c = strchr(args, ' ');
-        if((c != NULL) && (sscanf(args, "%o", &mask) == 1) && strncpy(fname, c+1, 254) 
+        if((c != NULL) && (sscanf(args, "%o", &mask) == 1) && strncpy(fname, c+1, 254)
           && (chmod(fname, (mode_t)mask) == 0))
           send_reply(info, 257, "CHMOD successful.");
@@ -2010 +2010 @@
 
   addr.sin_family      = AF_INET;
-  addr.sin_port        = htons(rtems_ftpd_configuration.port);
+  addr.sin_port        = htons(ftpd_config->port);
   addr.sin_addr.s_addr = htonl(INADDR_ANY);
   memset(addr.sin_zero, 0, sizeof(addr.sin_zero));
@@ -2065 +2065 @@
             info->user = NULL;
             info->pass = NULL;
-            if (rtems_ftpd_configuration.login)
+            if (ftpd_config->login)
               info->auth = false;
             else
@@ -2089 +2089 @@
  *
  * Input parameters:
- *
+ *    config: constant initial setup.
  * Output parameters:
  *    returns RTEMS_SUCCESSFUL on successful start of the daemon.
  */
 int
-rtems_initialize_ftpd(void)
+rtems_ftpd_start(const struct rtems_ftpd_configuration* config)
 {
   rtems_status_code   sc;
@@ -2101 +2101 @@
   int count;
 
-  if (rtems_ftpd_configuration.port == 0)
-  {
-    rtems_ftpd_configuration.port = FTPD_CONTROL_PORT;
-  }
-
-  if (rtems_ftpd_configuration.priority == 0)
-  {
-    rtems_ftpd_configuration.priority = 40;
-  }
-  priority = rtems_ftpd_configuration.priority;
-
-  ftpd_timeout = rtems_ftpd_configuration.idle;
+  if (ftpd_config != NULL)
+    return RTEMS_RESOURCE_IN_USE;
+
+  ftpd_config = malloc(sizeof(*ftpd_config));
+  if (ftpd_config == NULL)
+    return RTEMS_NO_MEMORY;
+
+  *ftpd_config = *config;
+
+  if (ftpd_config->port == 0)
+  {
+    ftpd_config->port = FTPD_CONTROL_PORT;
+  }
+
+  if (ftpd_config->priority == 0)
+  {
+    ftpd_config->priority = 40;
+  }
+  priority = ftpd_config->priority;
+
+  ftpd_timeout = ftpd_config->idle;
   if (ftpd_timeout < 0)
     ftpd_timeout = 0;
-  rtems_ftpd_configuration.idle = ftpd_timeout;
-
-  ftpd_access = rtems_ftpd_configuration.access;
+  ftpd_config->idle = ftpd_timeout;
+
+  ftpd_access = ftpd_config->access;
 
   ftpd_root = "/";
-  if ( rtems_ftpd_configuration.root &&
-       rtems_ftpd_configuration.root[0] == '/' )
-    ftpd_root = rtems_ftpd_configuration.root;
-
-  rtems_ftpd_configuration.root = ftpd_root;
-
-  if (rtems_ftpd_configuration.tasks_count <= 0)
-    rtems_ftpd_configuration.tasks_count = 1;
-  count = rtems_ftpd_configuration.tasks_count;
+  if (ftpd_config->root && ftpd_config->root[0] == '/' )
+    ftpd_root = ftpd_config->root;
+
+  ftpd_config->root = ftpd_root;
+
+  if (ftpd_config->tasks_count <= 0)
+    ftpd_config->tasks_count = 1;
+  count = ftpd_config->tasks_count;
 
   if (!task_pool_init(count, priority))
@@ -2158 +2166 @@
   }
 
-  syslog(LOG_INFO, "ftpd: FTP daemon started (%d session%s max)",
-    count, ((count > 1) ? "s" : ""));
+  if (ftpd_config->verbose)
+    syslog(LOG_INFO, "ftpd: FTP daemon started (%d session%s max)",
+           count, ((count > 1) ? "s" : ""));
 
   return RTEMS_SUCCESSFUL;