jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 21:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build errors

Browse Source
This commit is contained in:
fvanroie 2021-02-17 23:18:03 +01:00
parent 046ecb0b7a
commit b7366336cc
1 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/sys/svc/hasp_telnet.cpp
View File

@ -2,41 +2,44 @@
For full license information read the LICENSE file in the project folder */ For full license information read the LICENSE file in the project folder */
#include "hasp_conf.h" #include "hasp_conf.h"
#if HASP_USE_TELNET > 0 #if HASP_USE_TELNET > 0
#include "ArduinoJson.h" #include "ArduinoJson.h"
#include "ConsoleInput.h" #include "ConsoleInput.h"
#include "log/hasp_debug.h" #include "hasp_debug.h"
#include "hasp_config.h" #include "hasp_config.h"
#include "hasp_telnet.h" #include "hasp_telnet.h"
#include "hasp_http.h"
#include "../hasp/hasp_dispatch.h" #include "../../hasp/hasp_dispatch.h"
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
#include <WiFi.h> #include <WiFi.h>
WiFiClient telnetClient; WiFiClient telnetClient;
static WiFiServer * telnetServer; static WiFiServer* telnetServer;
#elif defined(ARDUINO_ARCH_ESP8266) #elif defined(ARDUINO_ARCH_ESP8266)
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
WiFiClient telnetClient; WiFiClient telnetClient;
static WiFiServer * telnetServer; static WiFiServer* telnetServer;
#else #else
//#include <STM32Ethernet.h> //#include <STM32Ethernet.h>
EthernetClient telnetClient; EthernetClient telnetClient;
static EthernetServer telnetServer(23); static EthernetServer telnetServer(23);
#endif #endif
#if HASP_USE_HTTP > 0 #if HASP_USE_HTTP > 0
extern char httpUser[32]; // extern char http_config.user[32];
extern char httpPassword[32]; // extern char http_config.password[32];
#endif extern hasp_http_config_t http_config;
#endif
uint8_t telnetLoginState = TELNET_UNAUTHENTICATED; uint8_t telnetLoginState = TELNET_UNAUTHENTICATED;
uint16_t telnetPort = 23; uint16_t telnetPort = 23;
uint8_t telnetEnabled = true; // Enable telnet debug output uint8_t telnetEnabled = true; // Enable telnet debug output
uint8_t telnetLoginAttempt = 0; // Initial attempt uint8_t telnetLoginAttempt = 0; // Initial attempt
ConsoleInput * telnetConsole; ConsoleInput* telnetConsole;
void telnetClientDisconnect() void telnetClientDisconnect()
{ {
@ -83,34 +86,34 @@ void telnetAcceptClient()
// telnetClient.print((char)0xFD); // telnetClient.print((char)0xFD);
// telnetClient.print((char)0x1B); // telnetClient.print((char)0x1B);
#if HASP_USE_HTTP > 0 #if HASP_USE_HTTP > 0
if(strlen(httpUser) != 0 || strlen(httpPassword) != 0) { if(strlen(http_config.user) != 0 || strlen(http_config.password) != 0) {
telnetClient.println(F("\r\n" D_TELNET_USERNAME " ")); telnetClient.println(F("\r\n" D_USERNAME " "));
telnetLoginState = TELNET_UNAUTHENTICATED; telnetLoginState = TELNET_UNAUTHENTICATED;
} else } else
#endif #endif
{ {
telnetClientLogon(); telnetClientLogon();
} }
telnetLoginAttempt = 0; // Initial attempt telnetLoginAttempt = 0; // Initial attempt
} }
#if 0 #if 0
static inline void telnetProcessLine() static inline void telnetProcessLine()
{ {
telnetInputBuffer[telnetInputIndex] = 0; // null terminate our char array telnetInputBuffer[telnetInputIndex] = 0; // null terminate our char array
switch(telnetLoginState) { switch(telnetLoginState) {
case TELNET_UNAUTHENTICATED: { case TELNET_UNAUTHENTICATED: {
telnetClient.printf(PSTR(D_TELNET_PASSWORD" %c%c%c"), 0xFF, 0xFB, 0x01); // Hide characters telnetClient.printf(PSTR(D_PASSWORD" %c%c%c"), 0xFF, 0xFB, 0x01); // Hide characters
#if HASP_USE_HTTP > 0 #if HASP_USE_HTTP > 0
telnetLoginState = strcmp(telnetInputBuffer, httpUser) == 0 ? TELNET_USERNAME_OK : TELNET_USERNAME_NOK; telnetLoginState = strcmp(telnetInputBuffer, http_config.user) == 0 ? TELNET_USERNAME_OK : TELNET_USERNAME_NOK;
break; break;
} }
case TELNET_USERNAME_OK: case TELNET_USERNAME_OK:
case TELNET_USERNAME_NOK: { case TELNET_USERNAME_NOK: {
telnetClient.printf(PSTR("%c%c%c\n"), 0xFF, 0xFC, 0x01); // Show characters telnetClient.printf(PSTR("%c%c%c\n"), 0xFF, 0xFC, 0x01); // Show characters
if(telnetLoginState == TELNET_USERNAME_OK && strcmp(telnetInputBuffer, httpPassword) == 0) { if(telnetLoginState == TELNET_USERNAME_OK && strcmp(telnetInputBuffer, http_config.password) == 0) {
telnetClientLogon(); telnetClientLogon();
} else { } else {
telnetLoginState = TELNET_UNAUTHENTICATED; telnetLoginState = TELNET_UNAUTHENTICATED;
@ -120,12 +123,12 @@ static inline void telnetProcessLine()
if(telnetLoginAttempt >= 3) { if(telnetLoginAttempt >= 3) {
telnetClientDisconnect(); telnetClientDisconnect();
} else { } else {
telnetClient.print(F(D_TELNET_USERNAME" ")); telnetClient.print(F(D_USERNAME" "));
} }
} }
#else #else
telnetClientLogon(); telnetClientLogon();
#endif #endif
break; break;
} }
default: default:
@ -179,24 +182,24 @@ static inline void telnetProcessCharacter(char ch)
//} //}
} }
#endif #endif
static inline void telnetProcessLine(const char * input) static inline void telnetProcessLine(const char* input)
{ {
switch(telnetLoginState) { switch(telnetLoginState) {
case TELNET_UNAUTHENTICATED: { case TELNET_UNAUTHENTICATED: {
char buffer[20]; char buffer[20];
snprintf_P(buffer, sizeof(buffer), PSTR(D_TELNET_PASSWORD " %c%c%c\n"), 0xFF, 0xFB, snprintf_P(buffer, sizeof(buffer), PSTR(D_PASSWORD " %c%c%c\n"), 0xFF, 0xFB,
0x01); // Hide characters 0x01); // Hide characters
telnetClient.print(buffer); telnetClient.print(buffer);
#if HASP_USE_HTTP > 0 #if HASP_USE_HTTP > 0
telnetLoginState = strcmp(input, httpUser) == 0 ? TELNET_USERNAME_OK : TELNET_USERNAME_NOK; telnetLoginState = strcmp(input, http_config.user) == 0 ? TELNET_USERNAME_OK : TELNET_USERNAME_NOK;
break; break;
} }
case TELNET_USERNAME_OK: case TELNET_USERNAME_OK:
case TELNET_USERNAME_NOK: { case TELNET_USERNAME_NOK: {
telnetClient.printf(PSTR("%c%c%c\n"), 0xFF, 0xFC, 0x01); // Show characters telnetClient.printf(PSTR("%c%c%c\n"), 0xFF, 0xFC, 0x01); // Show characters
if(telnetLoginState == TELNET_USERNAME_OK && strcmp(input, httpPassword) == 0) { if(telnetLoginState == TELNET_USERNAME_OK && strcmp(input, http_config.password) == 0) {
telnetClientLogon(); telnetClientLogon();
} else { } else {
telnetLoginState = TELNET_UNAUTHENTICATED; telnetLoginState = TELNET_UNAUTHENTICATED;
@ -206,19 +209,19 @@ static inline void telnetProcessLine(const char * input)
if(telnetLoginAttempt >= 3) { if(telnetLoginAttempt >= 3) {
telnetClientDisconnect(); telnetClientDisconnect();
} else { } else {
telnetClient.print(F(D_TELNET_USERNAME " ")); telnetClient.print(F(D_USERNAME " "));
} }
} }
#else #else
telnetClientLogon(); telnetClientLogon();
#endif #endif
break; break;
} }
default: default:
if(strcasecmp_P(input, PSTR("exit")) == 0) { if(strcasecmp_P(input, PSTR("exit")) == 0) {
telnetClientDisconnect(); telnetClientDisconnect();
} else if(strcasecmp_P(input, PSTR("logoff")) == 0) { } else if(strcasecmp_P(input, PSTR("logoff")) == 0) {
telnetClient.println(F("\r\n" D_TELNET_USERNAME " ")); telnetClient.println(F("\r\n" D_USERNAME " "));
telnetLoginState = TELNET_UNAUTHENTICATED; telnetLoginState = TELNET_UNAUTHENTICATED;
} else { } else {
dispatch_text_line(input); dispatch_text_line(input);
@ -231,15 +234,15 @@ void telnetSetup()
// telnetSetConfig(settings); // telnetSetConfig(settings);
if(telnetEnabled) { // Setup telnet server for remote debug output if(telnetEnabled) { // Setup telnet server for remote debug output
#if defined(STM32F4xx) #if defined(STM32F4xx)
// if(!telnetServer) telnetServer = new EthernetServer(telnetPort); // if(!telnetServer) telnetServer = new EthernetServer(telnetPort);
// if(telnetServer) { // if(telnetServer) {
telnetServer->begin(); telnetServer->begin();
LOG_INFO(TAG_TELN, F(D_TELNET_STARTED)); LOG_INFO(TAG_TELN, F(D_TELNET_STARTED));
// } else { // } else {
// LOG_ERROR(TAG_TELN,F("Failed to start telnet server")); // LOG_ERROR(TAG_TELN,F("Failed to start telnet server"));
//} //}
#else #else
if(!telnetServer) telnetServer = new WiFiServer(telnetPort); if(!telnetServer) telnetServer = new WiFiServer(telnetPort);
if(telnetServer) { if(telnetServer) {
telnetServer->setNoDelay(true); telnetServer->setNoDelay(true);
@ -254,7 +257,7 @@ void telnetSetup()
} }
LOG_ERROR(TAG_TELN, F(D_TELNET_FAILED)); LOG_ERROR(TAG_TELN, F(D_TELNET_FAILED));
#endif #endif
} }
} }
@ -262,7 +265,7 @@ void telnetLoop()
{ {
// Basic telnet client handling code from: https://gist.github.com/tablatronix/4793677ca748f5f584c95ec4a2b10303 // Basic telnet client handling code from: https://gist.github.com/tablatronix/4793677ca748f5f584c95ec4a2b10303
#if defined(STM32F4xx) #if defined(STM32F4xx)
Ethernet.schedule(); Ethernet.schedule();
// if(telnetServer) // if(telnetServer)
{ // client is connected { // client is connected
@ -289,7 +292,7 @@ void telnetLoop()
} }
} }
} }
#else #else
if(telnetServer && telnetServer->hasClient()) { // a new client has connected if(telnetServer && telnetServer->hasClient()) { // a new client has connected
if(!telnetClient.connected()) { // nobody is already connected if(!telnetClient.connected()) { // nobody is already connected
telnetAcceptClient(); // allow the new client telnetAcceptClient(); // allow the new client
@ -312,11 +315,11 @@ void telnetLoop()
} }
} }
} }
#endif #endif
} }
#if HASP_USE_CONFIG > 0 #if HASP_USE_CONFIG > 0
bool telnetGetConfig(const JsonObject & settings) bool telnetGetConfig(const JsonObject& settings)
{ {
bool changed = false; bool changed = false;
@ -338,7 +341,7 @@ bool telnetGetConfig(const JsonObject & settings)
* *
* @param[in] settings JsonObject with the config settings. * @param[in] settings JsonObject with the config settings.
**/ **/
bool telnetSetConfig(const JsonObject & settings) bool telnetSetConfig(const JsonObject& settings)
{ {
configOutput(settings, TAG_TELN); configOutput(settings, TAG_TELN);
bool changed = false; bool changed = false;
@ -348,6 +351,6 @@ bool telnetSetConfig(const JsonObject & settings)
return changed; return changed;
} }
#endif // HASP_USE_CONFIG #endif // HASP_USE_CONFIG
#endif #endif