Variable TCP Telnet ports via web interface

esp-link/cgipins.c

@@ -1,4 +1,3 @@
-
 #include <esp8266.h>
 #include "cgi.h"
 #include "espfs.h"

esp-link/cgitelnet.c

@@ -0,0 +1,79 @@
+#include <esp8266.h>
+#include "cgi.h"
+#include "config.h"
+#include "serbridge.h"
+
+// Cgi to return choice of Telnet ports
+int ICACHE_FLASH_ATTR cgiTelnetGet(HttpdConnData *connData) {
+  if (connData->conn==NULL) return HTTPD_CGI_DONE; // Connection aborted
+
+  char buff[1024];
+  int len;
+
+  len = os_sprintf(buff,
+      "{ \"telnet-port1\":%d, \"telnet-port2\":%d }",
+      flashConfig.telnet_port1, flashConfig.telnet_port2);
+
+  jsonHeader(connData, 200);
+  httpdSend(connData, buff, len);
+  return HTTPD_CGI_DONE;
+}
+
+// Cgi to change choice of Telnet ports
+int ICACHE_FLASH_ATTR cgiTelnetSet(HttpdConnData *connData) {
+  if (connData->conn==NULL) {
+    return HTTPD_CGI_DONE; // Connection aborted
+  }
+
+  int8_t ok = 0;
+  uint8_t port1, port2;
+  ok |= getUInt16Arg(connData, "port1", &port1);
+  ok |= getUInt16Arg(connData, "port2", &port2);
+  if (ok < 0) return HTTPD_CGI_DONE;
+
+  char *coll;
+  if (ok > 0) {
+    // check whether ports are different
+    if (port1 == port2) { coll = "Ports cannot be the same!"; goto collision; }
+
+    // we're good, set flashconfig
+    flashConfig.telnet_port1 = port1;
+    flashConfig.telnet_port2 = port2;
+    os_printf("Ports changed: port1=%d port2=%d\n",
+	port1, port2);
+
+    // apply the changes
+    //serbridgeReinit();
+    serbridgeInit(flashConfig.telnet_port1, flashConfig.telnet_port2);
+
+    // save to flash
+    if (configSave()) {
+      httpdStartResponse(connData, 204);
+      httpdEndHeaders(connData);
+    } else {
+      httpdStartResponse(connData, 500);
+      httpdEndHeaders(connData);
+      httpdSend(connData, "Failed to save config", -1);
+    }
+  }
+  return HTTPD_CGI_DONE;
+
+collision: {
+    char buff[128];
+    os_sprintf(buff, "Ports assignment for %s collides with another assignment", coll);
+    errorResponse(connData, 400, buff);
+    return HTTPD_CGI_DONE;
+  }
+}
+
+int ICACHE_FLASH_ATTR cgiTelnet(HttpdConnData *connData) {
+  if (connData->conn==NULL) return HTTPD_CGI_DONE; // Connection aborted. Clean up.
+  if (connData->requestType == HTTPD_METHOD_GET) {
+    return cgiTelnetGet(connData);
+  } else if (connData->requestType == HTTPD_METHOD_POST) {
+    return cgiTelnetSet(connData);
+  } else {
+    jsonHeader(connData, 404);
+    return HTTPD_CGI_DONE;
+  }
+}

esp-link/cgitelnet.h

@@ -0,0 +1,9 @@
+#ifndef CGITELNET_H
+#define CGITELNET_H
+
+#include "httpd.h"
+
+int cgiTelnet(HttpdConnData *connData);
+// int8_t telnet_port1, telnet_port2;
+
+#endif // CGITELNET_H

esp-link/config.c

@@ -35,6 +35,8 @@ FlashConfig flashDefault = {
   .data_bits	= EIGHT_BITS,
   .parity	= NONE_BITS,
   .stop_bits	= ONE_STOP_BIT,
+  .telnet_port1 = 23,
+  .telnet_port2 = 2323,
 };
 
 typedef union {

esp-link/config.h

@@ -13,7 +13,7 @@ typedef struct {
   char     hostname[32];               // if using DHCP
   uint32_t staticip, netmask, gateway; // using DHCP if staticip==0
   uint8_t  log_mode;                   // UART log debug mode
-  uint8_t   swap_uart;                  // swap uart0 to gpio 13&15
+  uint8_t  swap_uart;                  // swap uart0 to gpio 13&15
   uint8_t  tcp_enable, rssi_enable;    // TCP client settings
   char     api_key[48];                // RSSI submission API key (Grovestreams for now)
   uint8_t  slip_enable, mqtt_enable,   // SLIP protocol, MQTT client
@@ -41,6 +41,8 @@ typedef struct {
   int8_t   data_bits;
   int8_t   parity;
   int8_t   stop_bits;
+  uint16_t  telnet_port1,               // Telnet port settings
+           telnet_port2;
 } FlashConfig;
 extern FlashConfig flashConfig;
 

esp-link/main.c

@@ -32,6 +32,7 @@
 #include "gpio.h"
 #include "cgiservices.h"
 #include "web-server.h"
+#include "cgitelnet.h"
 
 #ifdef SYSLOG
 #include "syslog.h"
@@ -96,6 +97,8 @@ HttpdBuiltInUrl builtInUrls[] = {
   { "/services/info", cgiServicesInfo, NULL },
   { "/services/update", cgiServicesSet, NULL },
   { "/pins", cgiPins, NULL },
+  { "/telnet/info", cgiTelnet, NULL},
+  { "/telnet/update", cgiTelnet, NULL},
 #ifdef MQTT
   { "/mqtt", cgiMqtt, NULL },
 #endif
@@ -179,7 +182,7 @@ user_init(void) {
   WEB_Init();
 
   // init the wifi-serial transparent bridge (port 23)
-  serbridgeInit(23, 2323);
+  serbridgeInit(flashConfig.telnet_port1, flashConfig.telnet_port1);
   uart_add_recv_cb(&serbridgeUartCb);
 #ifdef SHOW_HEAP_USE
   os_timer_disarm(&prHeapTimer);

html/home.html

@@ -50,6 +50,28 @@ <h1>Info</h1>
             <a href="https://github.com/jeelabs/esp-link/blob/master/README.md">the online README</a>
             for up-to-date help.</p>
           </div>
+<div class="card">
+            <h1>Telnet Serial-Bridge</h1>
+            <p style="margin-bottom:0;">There are two ports available for telnet to use by default: 23 &nbsp; 2323</p>
+            <div id="telnet-spinner" class="spinner spinner-small"></div>
+            <table id="telnet-table" class="pure-table pure-table-horizontal" hidden><tbody>
+            <tr><td>Current Telnet ports</td><td class="telnet-info"></td></tr>
+            <tr><td colspan=2 class="popup-target">Telnet port 1:<br>
+                <div class="click-to-edit telnet-port1">
+                  <span class="edit-off" style="display:block; width:auto;"></span>
+                  <textarea class="edit-on" rows=1 maxlength=5 hidden> </textarea>
+                  <div class="popup">Click to edit!<br>Default port: 23</div>
+                </div>
+            </td></tr>
+            <tr><td colspan=2 class="popup-target">Telnet port 2:<br>
+                <div class="click-to-edit telnet-port2">
+                  <span class="edit-off" style="display:block; width:auto;"></span>
+                  <textarea class="edit-on" rows=1 maxlength=5 hidden> </textarea>
+                  <div class="popup">Click to edit!<br>Default port: 2323</div>
+                </div>
+            </td></tr>
+            </tbody></table>
+          </div>
         </div>
         <!-- RIGHT COLUMN -->
         <div class="pure-u-1 pure-u-md-1-2">
@@ -152,9 +174,12 @@ <h1>System details</h1>
 onLoad(function() {
   makeAjaxInput("system", "description");
   makeAjaxInput("system", "name");
+  makeAjaxInput("telnet", "port1");
+  makeAjaxInput("telnet", "port2");
   fetchPins();
   getWifiInfo();
   getSystemInfo();
+  getTelnetInfo();
   bnd($("#pinform"), "submit", setPins);
 });
 </script>

html/ui.js

@@ -302,6 +302,22 @@ function getWifiInfo() {
       function(s, st) { window.setTimeout(getWifiInfo, 1000); });
 }
 
+//===== Telnet info
+
+function showTelnetInfo(data) {
+  Object.keys(data).forEach(function(v) {
+    setEditToClick("telnet-"+v, data[v]);
+  });
+  $("#telnet-spinner").setAttribute("hidden", "");
+  $("#telnet-table").removeAttribute("hidden");
+  currAp = data.ssid;
+}
+
+function getTelnetInfo() {
+  ajaxJson('GET', "/telnet/info", showTelnetInfo,
+      function(s, st) { window.setTimeout(getTelnetInfo, 1000); });
+}
+
 //===== System info
 
 function showSystemInfo(data) {

serial/serbridge.c

@@ -469,6 +469,8 @@ serbridgeInitPins()
 }
 
 // Start transparent serial bridge TCP server on specified port (typ. 23)
+// Here is where we need to change the ports. But how do we do this from the Ajax call?
+
 void ICACHE_FLASH_ATTR
 serbridgeInit(int port1, int port2)
 {