ControlPoint connection corrections

Author: pschatzmann

src/dlna/clients/DLNAControlPoint.h

@@ -201,7 +201,9 @@ class DLNAControlPoint : public IControlPoint {
     }
 
     // instantiate subscription manager
-    subscription_mgr.setup(http, udp, local_url, getDevice());
+    if (local_url && p_http_server) {
+      subscription_mgr.setup(http, udp, local_url, getDevice());
+    }
 
     // If we exited early because a device was found, deactivate the MSearch
     // schedule so it will stop repeating. The scheduler will clean up
@@ -656,8 +658,9 @@ class DLNAControlPoint : public IControlPoint {
 
   /// checks if the usn contains the search target
   bool matches(const char* usn) {
+    if (search_target == nullptr || *search_target == '\0') return true;
     if (StrView(search_target).equals("ssdp:all")) return true;
-    return StrView(usn).contains(search_target);
+    return StrView(usn).contains(search_target) || StrView(search_target).contains(usn);
   }
 
   /// processes a bye-bye message
@@ -792,7 +795,9 @@ class DLNAControlPoint : public IControlPoint {
       (void)ref;
       return createSoapXML(action, out);
     };
-    p_http->stop();
+    if (!p_http->isKeepAlive()) {
+      p_http->stop();
+    }
     p_http->request().put("SOAPACTION", soapAction);
     int rc = p_http->post(post_url, xmlLen, printXML, "text/xml");
 

src/dlna/clients/SubscriptionMgrControlPoint.h

@@ -373,7 +373,7 @@ class SubscriptionMgrControlPoint {
     for (auto& service : device.getServices()) {
       if (!subscribeToService(service)) {
         DlnaLogger.log(DlnaLogLevel::Error, "Subscription to service %s failed",
-                       service.service_id);
+                       service.service_id.c_str());
         ok = false;
       }
     }
@@ -397,7 +397,7 @@ class SubscriptionMgrControlPoint {
       if (!unsubscribeFromService(service)) {
         DlnaLogger.log(DlnaLogLevel::Warning,
                        "Unsubscribe from service %s failed",
-                       service.service_id);
+                       service.service_id.c_str());
         ok = false;
       }
     }
@@ -422,7 +422,8 @@ class SubscriptionMgrControlPoint {
     if (StrView(service.event_sub_url).isEmpty()) {
       return false;
     }
-    Url url(service.event_sub_url);
+
+    Url url(getURLString(service).c_str());
 
     // If already subscribed and not expired, nothing to do
     if (service.subscription_state == SubscriptionState::Subscribed &&
@@ -463,7 +464,7 @@ class SubscriptionMgrControlPoint {
       // failed to subscribe
       DlnaLogger.log(DlnaLogLevel::Error,
                      "Failed to subscribe to service %s, rc=%d",
-                     service.service_id, rc);
+                     service.service_id.c_str(), rc);
       return false;
     }
     return true;
@@ -489,7 +490,7 @@ class SubscriptionMgrControlPoint {
       return true;
     }
 
-    Url url(service.event_sub_url);
+    Url url(getURLString(service).c_str());
     int rc = p_http->unsubscribe(url, service.subscription_id.c_str());
     if (rc == 200) {
       DlnaLogger.log(DlnaLogLevel::Info, "Unsubscribe %s -> rc=%d", url.url(),
@@ -503,7 +504,7 @@ class SubscriptionMgrControlPoint {
     } else {
       DlnaLogger.log(DlnaLogLevel::Error,
                      "Failed to unsubscribe from service %s, rc=%d",
-                     service.service_id, rc);
+                     service.service_id.c_str(), rc);
       return false;
     }
     return true;
@@ -572,6 +573,20 @@ class SubscriptionMgrControlPoint {
     // reply OK to the NOTIFY
     client.replyOK();
   }
+
+  Str getURLString(DLNAServiceInfo& service) {
+     Str url_str{100};
+    if (service.event_sub_url.startsWith("/")) {
+      // relative URL: need to build full URL using device base URL
+      url_str = p_device->getBaseURL();
+      url_str += service.event_sub_url.c_str();
+      url_str.replace("//", "/");
+
+    } else {
+      url_str = service.event_sub_url.c_str();
+    }
+    return url_str;
+  }
 };
 
 }  // namespace tiny_dlna

src/dlna_config.h

@@ -15,9 +15,14 @@
 #define DLNA_RUN_SUBSCRIPTIONS_EVERY_MS 300
 #endif
 
+/// Define the default http request timeout
+#ifndef DLNA_HTTP_READ_TIMEOUT_MS
+#define DLNA_HTTP_READ_TIMEOUT_MS 100
+#endif
+
 /// Define the default http request timeout
 #ifndef DLNA_HTTP_REQUEST_TIMEOUT_MS
-#define DLNA_HTTP_REQUEST_TIMEOUT_MS 60
+#define DLNA_HTTP_REQUEST_TIMEOUT_MS 6000
 #endif
 
 /// Define XML parse buffer size

src/http/Server/HttpClientHandler.h

@@ -178,10 +178,9 @@ class HttpClientHandler : public IClientHandler {
   }
 
   void endClient() override {
-    if (p_client) {
-      p_client->flush();
-      p_client->stop();
-    }
+    if (!p_client) return;
+    p_client->flush();
+    if (!p_client->isKeepAlive()) p_client->stop();
   }
 
   void crlf() override {

src/http/Server/HttpRequest.h

@@ -7,6 +7,10 @@
 #include "HttpHeader.h"
 #include "IHttpRequest.h"
 #include "basic/StrPrint.h"
+#ifdef ESP32
+#include <WiFi.h>
+#include <lwip/sockets.h>
+#endif
 
 namespace tiny_dlna {
 
@@ -71,6 +75,7 @@ class HttpRequest : public IHttpRequest {
     DlnaLogger.log(DlnaLogLevel::Info, "HttpRequest::stop");
     if (client_ptr != nullptr) {
       client_ptr->stop();
+      // delay(300);
     }
   }
 
@@ -183,6 +188,8 @@ class HttpRequest : public IHttpRequest {
   /// Sets the timeout.
   void setTimeout(int ms) override { client_ptr->setTimeout(ms); }
 
+  bool isKeepAlive() { return StrView(connection).equals(CON_KEEP_ALIVE); }
+
  protected:
   ClientType default_client;
   Client* client_ptr = nullptr;
@@ -201,12 +208,38 @@ class HttpRequest : public IHttpRequest {
 
   /// opens a connection to the indicated host
   virtual int connect(const char* ip, uint16_t port) {
-    DlnaLogger.log(DlnaLogLevel::Info, "HttpRequest::connect %s", ip);
-    int rc = this->client_ptr->connect(ip, port);
+    this->client_ptr->setTimeout(DLNA_HTTP_REQUEST_TIMEOUT_MS);
+    if (!isKeepAlive() && this->client_ptr->connected()) {
+      stop();
+    }
+#ifdef ESP32
+    // clear input buffer
+    static_cast<ClientType*>(client_ptr)->clear();
+    // static_cast<ClientType*>(client_ptr)
+    //     ->setConnectionTimeout(DLNA_HTTP_REQUEST_TIMEOUT_MS);
+    static_cast<ClientType*>(client_ptr)->setNoDelay(true);
+    int enable = 1;
+    static_cast<ClientType*>(client_ptr)
+        ->setSocketOption(SOL_SOCKET, SO_REUSEADDR, &enable,
+                          sizeof(enable));  // Address reuse
+#endif
+    DlnaLogger.log(DlnaLogLevel::Info, "HttpRequest::connect %s:%d", ip, port);
     uint64_t end = millis() + client_ptr->getTimeout();
-    DlnaLogger.log(DlnaLogLevel::Info, "Connected: %s (rc=%d) with timeout %ld",
-                   connected() ? "true" : "false", rc,
-                   client_ptr->getTimeout());
+    bool rc = false;
+    for (int j=0;j < 3; j++) {
+      rc = this->client_ptr->connect(ip, port);
+      if (rc) break;
+      delay(200);
+    }
+    if (!connected()) {
+      DlnaLogger.log(
+          DlnaLogLevel::Error, "Connected: %s (rc=%d) with timeout %ld",
+          connected() ? "true" : "false", rc, client_ptr->getTimeout());
+    } else {
+      DlnaLogger.log(
+          DlnaLogLevel::Debug, "Connected: %s (rc=%d) with timeout %ld",
+          connected() ? "true" : "false", rc, client_ptr->getTimeout());
+    }
     return rc;
   }
 
@@ -281,9 +314,6 @@ class HttpRequest : public IHttpRequest {
     DlnaLogger.log(DlnaLogLevel::Info, "%s %s", methods[method], url.url());
 
     if (!connected()) {
-      DlnaLogger.log(DlnaLogLevel::Info,
-                     "HttpRequest::connecting to host %s port %d", url.host(),
-                     url.port());
       connect(url.host(), url.port());
     }
 

src/http/Server/HttpServer.h

@@ -242,7 +242,7 @@ class HttpServer : public IHttpServer {
     ClientType client = server_ptr->accept();
     if (client.connected()) {
       DlnaLogger.log(DlnaLogLevel::Info, "copy: accepted new client");
-      client.setTimeout(DLNA_HTTP_REQUEST_TIMEOUT_MS);
+      client.setTimeout(DLNA_HTTP_READ_TIMEOUT_MS);
 #ifdef ESP32    
       client.setNoDelay(true);  // disables Nagle
 #endif

src/http/Server/IHttpRequest.h

@@ -32,6 +32,8 @@ class IHttpRequest {
   virtual bool connected() = 0;
   /// Get number of bytes available to read
   virtual int available() = 0;
+  /// Do not close the connection after request
+  virtual bool isKeepAlive() = 0;
   /// Stop the connection
   virtual void stop() = 0;
   /// Send POST request with string data