Error corrections

Author: pschatzmann

examples/device-media-server-task/device-media-server-task.ino

@@ -7,7 +7,7 @@
 
 #include "WiFi.h"
 #include "dlna.h"
-#include "DLNA/HttpServerUsingTask.h"
+#include "dlna/HttpServerUsingTask.h"
 
 // Replace with your WiFi credentials
 const char* ssid = "YOUR_SSID";

examples/device-media-server-tasks/device-media-server-tasks.ino

@@ -7,7 +7,7 @@
 
 #include "WiFi.h"
 #include "dlna.h"
-#include "DLNA/HttpServerUsingTasks.h"
+#include "dlna/HttpServerUsingTasks.h"
 
 // Replace with your WiFi credentials
 const char* ssid = "YOUR_SSID";

src/dlna/clients/SubscriptionMgrControlPoint.h

@@ -223,7 +223,7 @@ class SubscriptionMgrControlPoint {
   uint64_t subscribe_timeout = 0;
   uint32_t event_subscription_duration_sec = 3600;
   uint32_t event_subscription_retry_ms = 0;
-  bool event_subscription_active = false;
+  bool event_subscription_active = true;
   uint64_t last_event_notify_ms = 0;  // timestamp of last received NOTIFY
   IHttpRequest* p_http = nullptr;
   IUDPService* p_udp = nullptr;
@@ -368,6 +368,7 @@ class SubscriptionMgrControlPoint {
    *         failures result in continued attempts for remaining services).
    */
   bool subscribeToDevice(DLNADeviceInfo& device) {
+    DlnaLogger.log(DlnaLogLevel::Info, "subscribeToDevice");
     bool ok = true;
     for (auto& service : device.getServices()) {
       if (!subscribeToService(service)) {
@@ -390,6 +391,7 @@ class SubscriptionMgrControlPoint {
    * @return true if all unsubscriptions succeeded; false otherwise.
    */
   bool unsubscribeFromDevice(DLNADeviceInfo& device) {
+    DlnaLogger.log(DlnaLogLevel::Info, "unsubscribeFromDevice");
     bool ok = true;
     for (auto& service : device.getServices()) {
       if (!unsubscribeFromService(service)) {
@@ -539,10 +541,6 @@ class SubscriptionMgrControlPoint {
     // read SID header and body
     const char* sid = client.requestHeader().get("SID");
 
-    // Use XMLParserPrint to incrementally parse the NOTIFY body and extract
-    // property child elements. XMLParserPrint accumulates the buffer and
-    // exposes a parse() method that returns the next fragment.
-
     // mark notify received early so subscription metadata gets updated
     mgr->updateReceived(sid);
 

src/dlna/devices/DLNADevice.h

@@ -438,7 +438,7 @@ class DLNADevice : public IDevice {
         is_subscribe = true;
         return handleSubscribe(client, server, requestPath, hl);  // If needed
       }
-      if (req.method() == T_UNSUBSCRIBE) {
+      if (req.method() == T_UNSUBSCRIBE || req.method() == T_POST) {
         return handleUnsubscribe(client, server, requestPath, hl);  // If
       }
     }

src/dlna_config.h

@@ -186,3 +186,6 @@
 #ifndef DLNA_DISCOVERY_NETMASK
 #define DLNA_DISCOVERY_NETMASK IPAddress(255, 255, 255, 0)
 #endif
+
+// Deactivate warnings
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"

src/http/Server/HttpClientHandler.h

@@ -125,7 +125,8 @@ class HttpClientHandler : public IClientHandler {
 #if DLNA_LOG_XML
     callback(Serial, ref);
 #endif
-#if DLNA_CHECK_XML_LENGTH
+
+    #if DLNA_CHECK_XML_LENGTH
     StrPrint test;
     size_t test_len = callback(test, ref);
     if (strlen(test.c_str()) != size) {
@@ -177,9 +178,6 @@ class HttpClientHandler : public IClientHandler {
     reply("text/plain", msg, err, msg);
   }
 
-
-  #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
   void endClient() override {
     if (p_client) {
       p_client->flush();

src/http/Server/HttpRequest.h

@@ -330,10 +330,12 @@ class HttpRequest : public IHttpRequest {
       StrPrint test;
       size_t test_len = writer(test, ref);
       if (strlen(test.c_str()) != len) {
-        DlnaLogger.log(DlnaLogLevel::Error,
-                      "HttpRequest test wrote %d bytes: expected %d / strlen: %d", test_len, len, strlen(test.c_str()));
-      }   
-#endif      
+        DlnaLogger.log(
+            DlnaLogLevel::Error,
+            "HttpRequest test wrote %d bytes: expected %d / strlen: %d",
+            test_len, len, strlen(test.c_str()));
+      }
+#endif
     }
 
     // read reply header and prepare chunk reader if needed

src/http/Server/HttpServer.h

@@ -243,7 +243,9 @@ class HttpServer : public IHttpServer {
     if (client.connected()) {
       DlnaLogger.log(DlnaLogLevel::Info, "copy: accepted new client");
       client.setTimeout(DLNA_HTTP_REQUEST_TIMEOUT_MS);
+#ifdef ESP32    
       client.setNoDelay(true);  // disables Nagle
+#endif
       open_clients.push_back(client);
     }