Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-15 04:37:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

hw: core -> minimal

Browse Source
This commit is contained in:
Maxim Prokhorov
2022-09-14 18:05:49 +03:00
parent 24d342e1f1
commit 5bc55cd1a5
7 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/espurna/telnet.cpp
View File

@@ -398,8 +398,9 @@ void _telnetData(unsigned char clientId, char * data, size_t len) {
return;
}
// Password prompt (disable on CORE variant)
const bool authenticated = isEspurnaCore() ? true : _telnetClientsAuth[clientId];
// Password prompt; disabled on minimal variants
const bool authenticated = isEspurnaMinimal()
? true : _telnetClientsAuth[clientId];
if (_telnetAuth && !authenticated) {
String password = getAdminPass();
@@ -435,7 +436,13 @@ void _telnetData(unsigned char clientId, char * data, size_t len) {
void _telnetNotifyConnected(unsigned char id) {
DEBUG_MSG_P(PSTR("[TELNET] Client #%u connected\n"), id);
if (!isEspurnaCore()) {
#if __cplusplus >= 201703L
if constexpr (isEspurnaMinimal()) {
#else
if (isEspurnaMinimal()) {
#endif
_telnetClientsAuth[id] = true;
} else {
_telnetClientsAuth[id] = !_telnetAuth;
if (_telnetAuth) {
if (getAdminPass().length()) {
@@ -444,8 +451,6 @@ void _telnetNotifyConnected(unsigned char id) {
_telnetClientsAuth[id] = true;
}
}
} else {
_telnetClientsAuth[id] = true;
}
#if DEBUG_SUPPORT
@@ -466,7 +471,7 @@ void _telnetLoop() {
if (_telnetClients[i]->localIP() != WiFi.softAPIP()) {
// Telnet is always available for the ESPurna Core image
const bool can_connect = isEspurnaCore() ? true : getSetting("telnetSTA", 1 == TELNET_STA);
const bool can_connect = isEspurnaMinimal() ? true : getSetting("telnetSTA", 1 == TELNET_STA);
if (!can_connect) {
DEBUG_MSG_P(PSTR("[TELNET] Rejecting - Only local connections\n"));
_telnetDisconnect(i);
@@ -531,8 +536,8 @@ void _telnetSetupClient(unsigned char i, AsyncClient *client) {
void _telnetNewClient(AsyncClient* client) {
if (client->localIP() != WiFi.softAPIP()) {
// Telnet is always available for the ESPurna Core image
const bool can_connect = isEspurnaCore() ? true : getSetting("telnetSTA", 1 == TELNET_STA);
// Telnet is always available for the ESPurna minimal variants
const bool can_connect = isEspurnaMinimal() ? true : getSetting("telnetSTA", 1 == TELNET_STA);
if (!can_connect) {
DEBUG_MSG_P(PSTR("[TELNET] Rejecting - Only local connections\n"));