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

Add HASP_USE_HTTP checks

Browse Source
This commit is contained in:
fvanroie 2021-06-29 23:33:33 +02:00
parent 69b3882460
commit 4214bec6bb
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sys/net/hasp_network.cpp
View File

@ -30,8 +30,10 @@ void networkStart(void)
// haspProgressVal(255); // hide // haspProgressVal(255); // hide
haspReconnect(); haspReconnect();
debugStartSyslog(); debugStartSyslog();
// mqttStart(); // mqttStart();
#if HASP_USE_HTTP > 0
httpStart(); httpStart();
#endif
#if HASP_USE_MDNS > 0 #if HASP_USE_MDNS > 0
mdnsStart(); mdnsStart();
#endif // HASP_USE_MDNS #endif // HASP_USE_MDNS
@ -43,7 +45,9 @@ void networkStop(void)
debugStopSyslog(); debugStopSyslog();
// mqttStop(); // mqttStop();
#if HASP_USE_HTTP > 0
httpStop(); httpStop();
#endif
mdnsStop(); mdnsStop();
} }

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

@ -235,10 +235,13 @@ static void telnetProcessLine(const char* input)
strcasecmp_P(input, PSTR("bye")) == 0) { strcasecmp_P(input, PSTR("bye")) == 0) {
telnetClientDisconnect(); telnetClientDisconnect();
} else if(strcasecmp_P(input, PSTR("logoff")) == 0) { } else if(strcasecmp_P(input, PSTR("logoff")) == 0) {
#if HASP_USE_HTTP > 0
if(strcmp(input, http_config.password) == 0) { if(strcmp(input, http_config.password) == 0) {
telnetClient.println(F("\r\n" D_USERNAME " ")); telnetClient.println(F("\r\n" D_USERNAME " "));
telnetLoginState = TELNET_UNAUTHENTICATED; telnetLoginState = TELNET_UNAUTHENTICATED;
} else { } else
#endif
{
telnetClientDisconnect(); telnetClientDisconnect();
} }
} else { } else {
@ -317,7 +320,7 @@ IRAM_ATTR void telnetLoop()
if(telnetClient.connected()) { if(telnetClient.connected()) {
if(telnetConsole) { if(telnetConsole) {
while(telnetConsole->readKey()) { while(telnetConsole->readKey()) {
if(!telnetConsole) return; // the telnetConsole was destroyed if(!telnetConsole) return; // the telnetConsole was destroyed
if(bufferedTelnetClient.available() <= 0) bufferedTelnetClient.flush(); // flush pending updates if(bufferedTelnetClient.available() <= 0) bufferedTelnetClient.flush(); // flush pending updates
}; };