Changeset 65c65bb in rtems-libbsd

Timestamp:

07/01/16 05:49:52 (7 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

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

Children:

4dec435

Parents:

fc26479

Message:

Add telnetd as service to rc.conf.

Files:

• libbsd.py (modified) (1 diff)
• libbsd_waf.py (modified) (1 diff)
• rtemsbsd/include/machine/rtems-bsd-config.h (modified) (3 diffs)
• rtemsbsd/include/machine/rtems-bsd-rc-conf-services.h (modified) (1 diff)
• rtemsbsd/include/rtems/telnetd.h (modified) (1 diff)
• rtemsbsd/telnetd/telnetd-init.c (added)
• rtemsbsd/telnetd/telnetd-service.c (added)
• rtemsbsd/telnetd/telnetd.c (modified) (6 diffs)
• testsuite/rcconf02/test_main.c (modified) (5 diffs)

libbsd.py

@@ -149 +149 @@
             'telnetd/pty.c',
             'telnetd/telnetd.c',
+            'telnetd/telnetd-init.c',
+            'telnetd/telnetd-service.c',
             'sys/dev/tsec/if_tsec_nexus.c',
         ],

libbsd_waf.py

@@ -1116 +1116 @@
               'rtemsbsd/telnetd/des.c',
               'rtemsbsd/telnetd/pty.c',
+              'rtemsbsd/telnetd/telnetd-init.c',
+              'rtemsbsd/telnetd/telnetd-service.c',
               'rtemsbsd/telnetd/telnetd.c']
     if bld.get_env()["RTEMS_ARCH"] == "arm":

rtemsbsd/include/machine/rtems-bsd-config.h

@@ -33 +33 @@
  *  RTEMS_BSD_CONFIG_NET_IF_LAGG            : Link Aggregetion and Failover.
  *  RTEMS_BSD_CONFIG_NET_IF_VLAN            : Virtual LAN.
+ *  RTEMS_BSD_CONFIG_SERVICE_TELNETD        : Telnet Protocol (TELNET).
+ *   RTEMS_BSD_CONFIG_TELNETD_STACK_SIZE    : Telnet shell task stack size.
  *  RTEMS_BSD_CONFIG_SERVICE_FTPD           : File Transfer Protocol (FTP).
  *  RTEMS_BSD_CONFIG_BSP_CONFIG             : Configure default BSP devices.
@@ -119 +121 @@
 
 /*
+ * Telnetd
+ */
+#if defined(RTEMS_BSD_CONFIG_SERVICE_TELNETD)
+  #if defined(RTEMS_BSD_CONFIG_TELNETD_STACK_SIZE)
+    #define RTEMS_BSD_CFGDECL_TELNETD_STACK_SIZE \
+      int rtems_telnetd_stack_size = RTEMS_BSD_CONFIG_TELNETD_STACK_SIZE
+  #endif /* RTEMS_BSD_CONFIG_TELNETD_STACK_SIZE */
+  #define RTEMS_BSD_CFGDECL_TELNETD RTEMS_BSD_RC_CONF_SYSINT(rc_conf_telnetd)
+#endif /* RTEMS_BSD_CONFIG_SERVICE_TELNETD */
+
+/*
  * Configure the system.
  */
@@ -146 +159 @@
    * Create the services.
    */
+  RTEMS_BSD_CFGDECL_TELNETD;
+  RTEMS_BSD_CFGDECL_TELNETD_STACK_SIZE;
   RTEMS_BSD_CFGDECL_FTPD;
 #endif /* RTEMS_BSD_CONFIG_INIT */

rtemsbsd/include/machine/rtems-bsd-rc-conf-services.h

@@ -155 +155 @@
  * Decls for the handlers.
  */
-void rc_conf_net_init(void* arg);    /* Installed by default. */
-void rc_conf_ftpd_init(void* arg);   /* ftpd_enabled="YES" */
+void rc_conf_net_init(void* arg);           /* Installed by default. */
+void rc_conf_telnetd_init(void* arg);       /* telnetd_enabled="YES" */
+void rc_conf_ftpd_init(void* arg);          /* ftpd_enabled="YES" */
 
 /*

rtemsbsd/include/rtems/telnetd.h

@@ -89 +89 @@
 
 /**
+ * @brief Start the Telnet subsystem with the provided configuration.
+ */
+rtems_status_code rtems_telnetd_start(const rtems_telnetd_config_table* config);
+
+/**
  * @brief Telnet configuration.
  *

rtemsbsd/telnetd/telnetd.c

@@ -88 +88 @@
 
 /***********************************************************/
-static rtems_id telnetd_task_id = RTEMS_ID_NONE;
-
-rtems_id (*telnetd_spawn_task)(
+static rtems_telnetd_config_table* telnetd_config;
+static rtems_id                    telnetd_task_id;
+
+/*
+ * chrisj: this variable was global and with no declared interface in a header
+ *         file and with no means to set it so I have stopped it being global;
+ *         if this breaks any user they will have be to provide a formal
+ *         interface to get this change reverted.
+ */
+static const rtems_id (*telnetd_spawn_task)(
   const char *,
   unsigned,
@@ -208 +215 @@
 
   /* we don't redirect stdio as this probably
-   * was started from the console anyways..
+   * was started from the console anyway ..
    */
   do {
-    if (rtems_telnetd_config.keep_stdio) {
+    if (telnetd_config->keep_stdio) {
       bool start = true;
       char device_name [32];
 
       ttyname_r( 1, device_name, sizeof( device_name));
-      if (rtems_telnetd_config.login_check != NULL) {
+      if (telnetd_config->login_check != NULL) {
         start = rtems_shell_login_prompt(
           stdin,
           stderr,
           device_name,
-          rtems_telnetd_config.login_check
+          telnetd_config->login_check
         );
       }
       if (start) {
-        rtems_telnetd_config.command( device_name, arg->arg);
+        telnetd_config->command( device_name, arg->arg);
       } else {
         syslog(
@@ -245 +252 @@
 
       arg->devname = devname;
-      arg->arg = rtems_telnetd_config.arg;
+      arg->arg = telnetd_config->arg;
       strncpy(arg->peername, peername, sizeof(arg->peername));
 
       telnetd_task_id = telnetd_spawn_task(
         devname,
-        rtems_telnetd_config.priority,
-        rtems_telnetd_config.stack_size,
+        telnetd_config->priority,
+        telnetd_config->stack_size,
         spawned_shell,
         arg
@@ -288 +295 @@
 }
 
-rtems_status_code rtems_telnetd_initialize( void)
-{
-  if (telnetd_task_id != RTEMS_ID_NONE) {
+rtems_status_code rtems_telnetd_start(const rtems_telnetd_config_table* config)
+{
+  if (telnetd_config != NULL) {
     fprintf(stderr, "telnetd already started\n");
     return RTEMS_RESOURCE_IN_USE;
   }
 
-  if (rtems_telnetd_config.command == NULL) {
+  if (config->command == NULL) {
     fprintf(stderr, "telnetd setup with invalid command\n");
     return RTEMS_IO_ERROR;
   }
 
+  telnetd_config = calloc(1, sizeof(*telnetd_config));
+  if (telnetd_config == NULL) {
+    fprintf(stderr, "telnetd cannot alloc telnetd config table\n");
+    return RTEMS_NO_MEMORY;
+  }
+
+
   if ( !telnet_pty_initialize() ) {
     fprintf(stderr, "telnetd cannot initialize PTY driver\n");
+    free(telnetd_config);
+    telnetd_config = NULL;
     return RTEMS_IO_ERROR;
   }
 
+  *telnetd_config = *config;
+
   /* Check priority */
-  if (rtems_telnetd_config.priority < 2) {
-    rtems_telnetd_config.priority = 100;
+  if (telnetd_config->priority < 2) {
+    telnetd_config->priority = 100;
   }
 
   /* Check stack size */
-  if (rtems_telnetd_config.stack_size <= 0) {
-    rtems_telnetd_config.stack_size = (size_t)32 * 1024;
+  if (telnetd_config->stack_size <= 0) {
+    telnetd_config->stack_size = (size_t)32 * 1024;
   }
 
@@ -318 +336 @@
   telnetd_task_id = telnetd_spawn_task(
     "TNTD",
-    rtems_telnetd_config.priority,
-    rtems_telnetd_config.stack_size,
+    telnetd_config->priority,
+    telnetd_config->stack_size,
     rtems_task_telnetd,
     0
   );
   if (telnetd_task_id == RTEMS_ID_NONE) {
+    free(telnetd_config);
+    telnetd_config = NULL;
     return RTEMS_IO_ERROR;
   }
 
   /* Print status */
-  if (!rtems_telnetd_config.keep_stdio) {
+  if (!telnetd_config->keep_stdio) {
     fprintf(
       stderr,
       "telnetd started with stacksize = %u and priority = %d\n",
-      (unsigned) rtems_telnetd_config.stack_size,
-      (unsigned) rtems_telnetd_config.priority
+      (unsigned) telnetd_config->stack_size,
+      (unsigned) telnetd_config->priority
     );
   }
@@ -387 +407 @@
 
   /* call their routine */
-  if (rtems_telnetd_config.login_check != NULL) {
+  if (telnetd_config->login_check != NULL) {
     start = rtems_shell_login_prompt(
       stdin,
       stderr,
       arg->devname,
-      rtems_telnetd_config.login_check
+      telnetd_config->login_check
     );
     login_failed = !start;
   }
   if (start) {
-    rtems_telnetd_config.command( arg->devname, arg->arg);
+    telnetd_config->command( arg->devname, arg->arg);
   }
 

testsuite/rcconf02/test_main.c

@@ -70 +70 @@
 #include <rtems/shell.h>
 
-#if DEFINE_FOR_TESTING
-#define RCCONF02_HAS_SHELL
-#endif
-
 #define TEST_NAME "LIBBSD RC.CONF 2"
 
@@ -121 +117 @@
   "\n"                                                     \
   "dhcpcd_options=\"-h foobar\"\n"                         \
+  "\n"                                                     \
+  "telnetd_enable=\"YES\"\n"                               \
+  "telnetd_options=\"-v -C 10 -P 50 -L\"\n"                \
   "\n"                                                     \
   "ftpd_enable=\"YES\"\n"                                  \
@@ -154 +153 @@
   test_rc_conf_script();
 
-#if defined(RCCONF02_HAS_SHELL)
   rtems_shell_init(
     "SHLL",
@@ -164 +162 @@
     NULL
     );
-#else
-  printf("RCCONF02 sleeping for 10s\n");
-  sleep(10);
-#endif /* RCCONF02_HAS_SHELL */
 
   exit(0);
 }
-
-/*
- * Optional shell for testing this test.
- */
-#if defined(RCCONF02_HAS_SHELL)
 
 #define CONFIGURE_SHELL_COMMANDS_INIT
@@ -215 +204 @@
 
 #include <rtems/shellconfig.h>
-#endif /* RCCONF02_HAS_SHELL */
 
 #define RTEMS_BSD_CONFIG_BSP_CONFIG
+#define RTEMS_BSD_CONFIG_SERVICE_TELNETD
+#define RTEMS_BSD_CONFIG_TELNETD_STACK_SIZE (16 * 1024)
 #define RTEMS_BSD_CONFIG_SERVICE_FTPD
 
+#define CONFIGURE_MAXIMUM_DRIVERS 32
+
 #include <rtems/bsd/test/default-init.h>