Option to enable TELNET in STA mode from the Web UI

code/espurna/config/general.h

@@ -18,8 +18,8 @@
 #define TELNET_SUPPORT          1               // Enable telnet support by default
 #endif
 
-#ifndef TELNET_ONLY_AP
-#define TELNET_ONLY_AP          1               // By default, allow only connections via AP interface
+#ifndef TELNET_STA
+#define TELNET_STA              0               // By default, disallow connections via STA interface
 #endif
 
 #define TELNET_PORT             23              // Port to listen to telnet clients

code/espurna/telnet.ino

@@ -57,8 +57,9 @@ void _telnetData(unsigned char clientId, void *data, size_t len) {
 
 void _telnetNewClient(AsyncClient *client) {
 
-    #if TELNET_ONLY_AP
-        if (client->localIP() != WiFi.softAPIP()) {
+    if (client->localIP() != WiFi.softAPIP()) {
+        bool telnetSTA = getSetting("telnetSTA", TELNET_STA).toInt() == 1;
+        if (!telnetSTA) {
             DEBUG_MSG_P(PSTR("[TELNET] Rejecting - Only local connections\n"));
             client->onDisconnect([](void *s, AsyncClient *c) {
                 c->free();
@@ -67,7 +68,7 @@ void _telnetNewClient(AsyncClient *client) {
             client->close(true);
             return;
         }
-    #endif
+    }
 
     for (unsigned char i = 0; i < TELNET_MAX_CLIENTS; i++) {
         if (!_telnetClients[i] || !_telnetClients[i]->connected()) {

code/espurna/web.ino

@@ -688,6 +688,11 @@ void _wsStart(uint32_t client_id) {
             }
         #endif
 
+        #if TELNET_SUPPORT
+            root["telnetVisible"] = 1;
+            root["telnetSTA"] = getSetting("telnetSTA", TELNET_STA).toInt() == 1;
+        #endif
+
         root["maxNetworks"] = WIFI_MAX_NETWORKS;
         JsonArray& wifi = root.createNestedArray("wifi");
         for (byte i=0; i<WIFI_MAX_NETWORKS; i++) {

code/html/index.html

@@ -435,7 +435,7 @@
                                 </div>
 
                                 <div class="pure-g">
-                                    <label class="pure-u-1 pure-u-md-1-4" for="adminPass2">Admin password (repeat)</label>
+                                    <label class="pure-u-1 pure-u-md-1-4" for="adminPass2">Repeat password</label>
                                     <input name="adminPass2" class="pure-u-1 pure-u-md-3-4" type="password" tabindex="12" autocomplete="false" />
                                 </div>
 
@@ -466,6 +466,15 @@
                                     </div>
                                 </div>
 
+                                <div class="pure-g module module-telnet">
+                                    <div class="pure-u-1 pure-u-sm-1-4"><label for="telnetSTA">Enable TELNET</label></div>
+                                    <div class="pure-u-1 pure-u-sm-1-4"><input type="checkbox" name="telnetSTA" /></div>
+                                    <div class="pure-u-0 pure-u-md-1-2">&nbsp;</div>
+                                    <div class="pure-u-0 pure-u-md-1-4">&nbsp;</div>
+                                    <div class="pure-u-1 pure-u-md-3-4 hint">Turn ON to be able to telnet to your device while connected to your home router.<br />TELNET is always enabled in AP mode.</div>
+                                </div>
+
+
                                 <div class="pure-g module module-nofuss">
                                     <div class="pure-u-1 pure-u-sm-1-4"><label for="nofussEnabled">Automatic remote updates (NoFUSS)</label></div>
                                     <div class="pure-u-1 pure-u-sm-1-4"><input type="checkbox" name="nofussEnabled" /></div>

code/ota_flash.sh

@@ -173,7 +173,7 @@ if [ "$auth" == "" ]; then
 fi
 
 if [ "$flags" == "" ]; then
-    read -p "Extra flags for the build: " -e -i "-DTELNET_ONLY_AP=0" flags
+    read -p "Extra flags for the build: " -e -i "" flags
 fi
 
 read -p "Environment to build: " -e -i "esp8266-1m-ota" env