Allow network when telnetd not configured

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3146 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 1 insertions, 80 deletions

diff --git a/nuttx/examples/nsh/nsh_telnetd.c b/nuttx/examples/nsh/nsh_telnetd.c
index 26a7f854a..42eb5a9e9 100644
--- a/nuttx/examples/nsh/nsh_telnetd.c
+++ b/nuttx/examples/nsh/nsh_telnetd.c
@@ -785,86 +785,7 @@ static void nsh_telnetexit(FAR struct nsh_vtbl_s *vtbl)
 
 int nsh_telnetmain(int argc, char *argv[])
 {
- struct in_addr addr;
-#if defined(CONFIG_EXAMPLES_NSH_DHCPC)
- FAR void *handle;
-#endif
-#if defined(CONFIG_EXAMPLES_NSH_DHCPC) || defined(CONFIG_EXAMPLES_NSH_NOMAC)
- uint8_t mac[IFHWADDRLEN];
-#endif
-
-/* Many embedded network interfaces must have a software assigned MAC */
-
-#ifdef CONFIG_EXAMPLES_NSH_NOMAC
-  mac[0] = 0x00;
-  mac[1] = 0xe0;
-  mac[2] = 0xb0;
-  mac[3] = 0x0b;
-  mac[4] = 0xba;
-  mac[5] = 0xbe;
-  uip_setmacaddr("eth0", mac);
-#endif
-
-  /* Set up our host address */
-
-#if !defined(CONFIG_EXAMPLES_NSH_DHCPC)
-  addr.s_addr = HTONL(CONFIG_EXAMPLES_NSH_IPADDR);
-#else
-  addr.s_addr = 0;
-#endif
-  uip_sethostaddr("eth0", &addr);
-
-  /* Set up the default router address */
-
-  addr.s_addr = HTONL(CONFIG_EXAMPLES_NSH_DRIPADDR);
-  uip_setdraddr("eth0", &addr);
-
-  /* Setup the subnet mask */
-
-  addr.s_addr = HTONL(CONFIG_EXAMPLES_NSH_NETMASK);
-  uip_setnetmask("eth0", &addr);
-
-#if defined(CONFIG_EXAMPLES_NSH_DHCPC)
-  /* Set up the resolver */
-
-  resolv_init();
-#endif
-
-#if defined(CONFIG_EXAMPLES_NSH_DHCPC)
-  /* Get the MAC address of the NIC */
-
-  uip_getmacaddr("eth0", mac);
-
-  /* Set up the DHCPC modules */
-
-  handle = dhcpc_open(&mac, IFHWADDRLEN);
-
-  /* Get an IP address.  Note that there is no logic for renewing the IP address in this
-   * example.  The address should be renewed in ds.lease_time/2 seconds.
-   */
-
-  if (handle)
-    {
-        struct dhcpc_state ds;
-        (void)dhcpc_request(handle, &ds);
-        uip_sethostaddr("eth1", &ds.ipaddr);
-        if (ds.netmask.s_addr != 0)
-          {
-            uip_setnetmask("eth0", &ds.netmask);
-          }
-        if (ds.default_router.s_addr != 0)
-          {
-            uip_setdraddr("eth0", &ds.default_router);
-          }
-        if (ds.dnsaddr.s_addr != 0)
-          {
-            resolv_conf(&ds.dnsaddr);
-          }
-        dhcpc_close(handle);
-    }
-#endif
-
-  /* Execute nsh_connection on each connection to port 23 */
+  /* Execute nsh_connection() on each connection to port 23 */
 
   uip_server(HTONS(23), nsh_connection, CONFIG_EXAMPLES_NSH_STACKSIZE);
   return OK;