Merge pull request #97 from rigid/patch-1

set default telnet parameters via kconfig

configs/config_default

@@ -85,5 +85,8 @@ CONFIG_ENV_DEFAULT_STATION_GW="192.168.0.1"
 CONFIG_ENV_DEFAULT_AP_IP="192.168.1.1"
 CONFIG_ENV_DEFAULT_AP_MASK="255.255.255.0"
 CONFIG_ENV_DEFAULT_AP_GW="192.168.1.1"
+CONFIG_ENV_DEFAULT_TELNET_AUTOSTART=n
+CONFIG_ENV_DEFAULT_TELNET_PORT=23
+CONFIG_ENV_DEFAULT_TELNET_DROP=60
 # CONFIG_ENABLE_SECOND_UART is not set
 CONFIG_ENABLE_BANNER=y

kcnf

@@ -58,9 +58,25 @@ endif
 config SERVICE_TCP
 bool "TCP/IP services"
 
-config SERVICE_TELNET
+menuconfig SERVICE_TELNET
 bool "Telnet Service"
 depends on SERVICE_TCP
+help
+    Provides a commandline interface via telnet.
+
+if SERVICE_TELNET
+    config ENV_DEFAULT_TELNET_AUTOSTART
+    bool "always run telnet server after boot"
+    default n
+
+    config ENV_DEFAULT_TELNET_PORT
+    int "TCP port to bind to"
+    default 23
+
+    config ENV_DEFAULT_TELNET_DROP
+    int "Drop connection after this many seconds of inactivity"
+    default 60
+endif
 
 config SERVICE_ECHO
 bool "Echo Service"

src/main.c

@@ -72,9 +72,9 @@ const struct envpair defaultenv[] = {
 #endif
 #if defined(CONFIG_SERVICE_TELNET)
   /* Note: modules requiring their own config might be able to have a 'registration' struct that adds to here */
-	{ "telnet-port",       "23" },
-	{ "telnet-autostart",  "0" },
-	{ "telnet-drop",       "60" },
+	{ "telnet-port",       EXPAND_AND_QUOTE(CONFIG_ENV_DEFAULT_TELNET_PORT) },
+	{ "telnet-autostart",  EXPAND_AND_QUOTE(CONFIG_ENV_DEFAULT_TELNET_AUTOSTART) },
+	{ "telnet-drop",       EXPAND_AND_QUOTE(CONFIG_ENV_DEFAULT_TELNET_DROP) },
 #endif
 #if defined(CONFIG_CMD_TFTP)
 	{ "tftp-server",       CONFIG_ENV_DEFAULT_TFTP_SERVER_IP},