Adds configuration option to exclude the webserver on esp32. (#3369)

* Adds configuration option to not build/include the webserver. * Adds configuration option to not build/include the webserver. * Keep initApiServer when excluding webserver * fixes for failed formatting check * Once more with feeling! Fix for regression. * Fix includes for ARCH_ESP32 * Format changes from trunk * Merge updates from origin * Revert "Format changes from trunk" This reverts commit 436e631. * jeez! * tryfix proto conflict --------- Co-authored-by: Thomas Göttgens <[email protected]>
meshtastic · Mar 21, 2024 · f4095ce · f4095ce
1 parent 7aa21f6
commit f4095ce
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -33,7 +33,9 @@
 // #include <driver/rtc_io.h>
 
 #ifdef ARCH_ESP32
+#if !MESHTASTIC_EXCLUDE_WEBSERVER
 #include "mesh/http/WebServer.h"
+#endif
 #include "nimble/NimbleBluetooth.h"
 NimbleBluetooth *nimbleBluetooth;
 #endif
@@ -864,7 +866,7 @@ void setup()
 #endif
 #endif
 
-#ifdef ARCH_ESP32
+#if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_WEBSERVER
     // Start web server thread.
     webServerThread = new WebServerThread();
 #endif

diff --git a/src/mesh/http/ContentHandler.cpp b/src/mesh/http/ContentHandler.cpp
@@ -1,3 +1,4 @@
+#if !MESHTASTIC_EXCLUDE_WEBSERVER
 #include "NodeDB.h"
 #include "PowerFSM.h"
 #include "RadioLibInterface.h"
@@ -855,3 +856,4 @@ void handleScanNetworks(HTTPRequest *req, HTTPResponse *res)
     res->print(value->Stringify().c_str());
     delete value;
 }
+#endif
diff --git a/src/mesh/http/WebServer.cpp b/src/mesh/http/WebServer.cpp
@@ -1,3 +1,4 @@
+#if !MESHTASTIC_EXCLUDE_WEBSERVER
 #include "mesh/http/WebServer.h"
 #include "NodeDB.h"
 #include "graphics/Screen.h"
@@ -92,7 +93,6 @@ static void taskCreateCert(void *parameter)
 
         LOG_DEBUG("Retrieved Private Key: %d Bytes\n", cert->getPKLength());
         LOG_DEBUG("Retrieved Certificate: %d Bytes\n", cert->getCertLength());
-
     } else {
 
         LOG_INFO("Creating the certificate. This may take a while. Please wait...\n");
@@ -105,7 +105,6 @@ static void taskCreateCert(void *parameter)
 
         if (createCertResult != 0) {
             LOG_ERROR("Creating the certificate failed\n");
-
         } else {
             LOG_INFO("Creating the certificate was successful\n");
 
@@ -210,4 +209,5 @@ void initWebServer()
     } else {
         LOG_ERROR("Web Servers Failed! ;-( \n");
     }
-}
+}
+#endif
diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp
@@ -10,7 +10,9 @@
 #include <WiFi.h>
 #include <WiFiUdp.h>
 #ifdef ARCH_ESP32
+#if !MESHTASTIC_EXCLUDE_WEBSERVER
 #include "mesh/http/WebServer.h"
+#endif
 #include <ESPmDNS.h>
 #include <esp_wifi.h>
 static void WiFiEvent(WiFiEvent_t event);
@@ -92,11 +94,10 @@ static void onNetworkConnected()
             syslog.enable();
         }
 
-#ifdef ARCH_ESP32
+#if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_WEBSERVER
         initWebServer();
 #endif
         initApiServer();
-
         APStartupComplete = true;
     }
 
@@ -146,7 +147,6 @@ static int32_t reconnectWiFi()
 
             perhapsSetRTC(RTCQualityNTP, &tv);
             lastrun_ntp = millis();
-
         } else {
             LOG_DEBUG("NTP Update failed\n");
         }
@@ -204,7 +204,9 @@ bool initWifi()
         const char *wifiPsw = config.network.wifi_psk;
 
 #ifndef ARCH_RP2040
-        createSSLCert();                        // For WebServer
+#if !MESHTASTIC_EXCLUDE_WEBSERVER
+        createSSLCert(); // For WebServer
+#endif
         esp_wifi_set_storage(WIFI_STORAGE_RAM); // Disable flash storage for WiFi credentials
 #endif
         if (!*wifiPsw) // Treat empty password as no password
@@ -405,4 +407,4 @@ static void WiFiEvent(WiFiEvent_t event)
 uint8_t getWifiDisconnectReason()
 {
     return wifiDisconnectReason;
-}
+}