From 2ebccbb993dca41674de295f2d513abd568f971a Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Fri, 13 Mar 2020 09:19:04 +0100 Subject: [PATCH] Quick changes for working with NPUPNP --- CMakeLists.txt | 12 +++++------- src/action_request.cc | 11 +++++++++++ src/device_description_handler.cc | 4 ++++ src/file_request_handler.cc | 4 ++++ src/iohandler/file_io_handler.cc | 2 ++ src/iohandler/io_handler.cc | 2 ++ src/iohandler/mem_io_handler.cc | 2 ++ src/serve_request_handler.cc | 9 ++++++++- src/server.cc | 8 ++++++++ src/transcoding/transcode_ext_handler.cc | 2 ++ src/upnp_cds.cc | 12 +++++++++++- src/upnp_cm.cc | 11 +++++++++++ src/upnp_mrreg.cc | 10 +++++++++- src/url_request_handler.cc | 6 ++++++ src/util/upnp_clients.cc | 12 ++++++++++++ src/util/upnp_headers.cc | 14 +++++++++++++- src/util/upnp_headers.h | 2 ++ src/web/web_request_handler.cc | 4 ++++ 18 files changed, 116 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46f2ca5c..b51300d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -293,13 +293,11 @@ if (LFS_FOUND) target_link_libraries(gerbera ${LFS_LIBRARIES}) endif() -find_package (LibUpnp REQUIRED) -include_directories(${UPNP_INCLUDE_DIRS}) -target_link_libraries (gerbera ${UPNP_LIBRARIES}) - -if (UPNP_VERSION_STRING VERSION_LESS "1.12.1") - message(FATAL_ERROR "gerbera requires libupnp 1.12.1 or above.") -endif() +#### Hard-coded NPUPNP defs for now, just for testing +add_definitions(-DUSING_NPUPNP) +include_directories(/usr/include/npupnp/upnp) +target_link_libraries (gerbera -lnpupnp) +set (UPNP_HAS_IPV6 1) if (NOT UPNP_HAS_IPV6) message(FATAL_ERROR "Gerbera requires libupnp with IPv6 support.") diff --git a/src/action_request.cc b/src/action_request.cc index 3aa4a991..29be6aaf 100644 --- a/src/action_request.cc +++ b/src/action_request.cc @@ -65,11 +65,17 @@ std::string ActionRequest::getServiceID() const std::unique_ptr ActionRequest::getRequest() const { +#if !defined(USING_NPUPNP) DOMString cxml = ixmlPrintDocument(UpnpActionRequest_get_ActionRequest(upnp_request)); +#endif auto request = std::make_unique(); +#if defined(USING_NPUPNP) + auto ret = request->load_string(upnp_request->xmlAction.c_str()); +#else auto ret = request->load_string(cxml); ixmlFreeDOMString(cxml); +#endif if (ret.status != pugi::xml_parse_status::status_ok) throw_std_runtime_error("Unable to parse ixml"); @@ -94,6 +100,7 @@ void ActionRequest::update() std::string xml = buf.str(); log_debug("ActionRequest::update(): {}", xml.c_str()); +#if !defined(USING_NPUPNP) IXML_Document* result = nullptr; int err = ixmlParseBufferEx(xml.c_str(), &result); @@ -105,6 +112,10 @@ void ActionRequest::update() UpnpActionRequest_set_ActionResult(upnp_request, result); UpnpActionRequest_set_ErrCode(upnp_request, errCode); } +#else + UpnpActionRequest_set_xmlResponse(upnp_request, xml); + UpnpActionRequest_set_ErrCode(upnp_request, errCode); +#endif } else { // ok, here there can be two cases // either the function below already did set an error code, diff --git a/src/device_description_handler.cc b/src/device_description_handler.cc index 6aca745e..cf2e8015 100644 --- a/src/device_description_handler.cc +++ b/src/device_description_handler.cc @@ -45,7 +45,11 @@ void DeviceDescriptionHandler::getInfo(const char* filename, UpnpFileInfo* info) { // We should be able to do the generation here, but libupnp doesnt support the request cookies yet UpnpFileInfo_set_FileLength(info, -1); +#if defined(USING_NPUPNP) UpnpFileInfo_set_ContentType(info, "application/xml"); +#else + UpnpFileInfo_set_ContentType(info, ixmlCloneDOMString("application/xml")); +#endif UpnpFileInfo_set_IsReadable(info, 1); UpnpFileInfo_set_IsDirectory(info, 0); } diff --git a/src/file_request_handler.cc b/src/file_request_handler.cc index e8579b06..615f7e85 100644 --- a/src/file_request_handler.cc +++ b/src/file_request_handler.cc @@ -238,7 +238,11 @@ void FileRequestHandler::getInfo(const char* filename, UpnpFileInfo* info) UpnpFileInfo_set_LastModified(info, statbuf.st_mtime); UpnpFileInfo_set_IsDirectory(info, S_ISDIR(statbuf.st_mode)); +#if defined(USING_NPUPNP) + UpnpFileInfo_set_ContentType(info, mimeType); +#else UpnpFileInfo_set_ContentType(info, ixmlCloneDOMString(mimeType.c_str())); +#endif headers->writeHeaders(info); diff --git a/src/iohandler/file_io_handler.cc b/src/iohandler/file_io_handler.cc index 7e239250..ab5155ec 100644 --- a/src/iohandler/file_io_handler.cc +++ b/src/iohandler/file_io_handler.cc @@ -32,7 +32,9 @@ #include "file_io_handler.h" // API #include +#ifndef USING_NPUPNP #include +#endif #include #include "cds_objects.h" diff --git a/src/iohandler/io_handler.cc b/src/iohandler/io_handler.cc index f9789425..75a36130 100644 --- a/src/iohandler/io_handler.cc +++ b/src/iohandler/io_handler.cc @@ -31,7 +31,9 @@ #include "io_handler.h" // API +#ifndef USING_NPUPNP #include +#endif #include #include "server.h" diff --git a/src/iohandler/mem_io_handler.cc b/src/iohandler/mem_io_handler.cc index 5574a16d..2916fd12 100644 --- a/src/iohandler/mem_io_handler.cc +++ b/src/iohandler/mem_io_handler.cc @@ -35,7 +35,9 @@ #include #include #include +#ifndef USING_NPUPNP #include +#endif #include #include #include diff --git a/src/serve_request_handler.cc b/src/serve_request_handler.cc index 8eaf46af..b9bd7b25 100644 --- a/src/serve_request_handler.cc +++ b/src/serve_request_handler.cc @@ -94,7 +94,11 @@ void ServeRequestHandler::getInfo(const char* filename, UpnpFileInfo* info) UpnpFileInfo_set_IsReadable(info, 0); } +#if defined(USING_NPUPNP) + UpnpFileInfo_set_ContentType(info, mimetype); +#else UpnpFileInfo_set_ContentType(info, ixmlCloneDOMString(mimetype.c_str())); +#endif } else { throw_std_runtime_error("Not a regular file: " + path); } @@ -157,8 +161,11 @@ std::unique_ptr ServeRequestHandler::open(const char* filename, info->is_readable = 0; } - +#if defined(USING_NPUPNP) + info->content_type = mimetype; +#else info->content_type = ixmlCloneDOMString(mimetype.c_str()); +#endif */ } else { throw_std_runtime_error("Not a regular file: " + path); diff --git a/src/server.cc b/src/server.cc index 913a4913..7cbabc71 100644 --- a/src/server.cc +++ b/src/server.cc @@ -398,9 +398,17 @@ int Server::handleUpnpClientEvent(Upnp_EventType eventType, const void* event) case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE: case UPNP_DISCOVERY_SEARCH_RESULT: { auto d_event = reinterpret_cast(event); +#if defined(USING_NPUPNP) + const char* userAgent = UpnpDiscovery_get_Os_cstr(d_event); +#else const char* userAgent = UpnpString_get_String(UpnpDiscovery_get_Os(d_event)); +#endif const struct sockaddr_storage* destAddr = UpnpDiscovery_get_DestAddr(d_event); +#if defined(USING_NPUPNP) + const char* location = UpnpDiscovery_get_Location_cstr(d_event); +#else const char* location = UpnpString_get_String(UpnpDiscovery_get_Location(d_event)); +#endif Clients::addClientByDiscovery(destAddr, userAgent, location); break; diff --git a/src/transcoding/transcode_ext_handler.cc b/src/transcoding/transcode_ext_handler.cc index 4dad0e3f..412c1370 100644 --- a/src/transcoding/transcode_ext_handler.cc +++ b/src/transcoding/transcode_ext_handler.cc @@ -37,7 +37,9 @@ #include #include #include +#ifndef USING_NPUPNP #include +#endif #include #include #include diff --git a/src/upnp_cds.cc b/src/upnp_cds.cc index 6491fa78..a758655c 100644 --- a/src/upnp_cds.cc +++ b/src/upnp_cds.cc @@ -284,6 +284,7 @@ void ContentDirectoryService::processSubscriptionRequest(const std::unique_ptrprint(buf, "", 0); std::string xml = buf.str(); +#if !defined(USING_NPUPNP) IXML_Document* event = nullptr; int err = ixmlParseBufferEx(xml.c_str(), &event); if (err != IXML_SUCCESS) { @@ -295,6 +296,11 @@ void ContentDirectoryService::processSubscriptionRequest(const std::unique_ptrgetSubscriptionID().c_str()); ixmlDocument_free(event); +#else + UpnpAcceptSubscriptionXML( + deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(), + DESC_CDS_SERVICE_ID, xml, request->getSubscriptionID().c_str()); +#endif log_debug("end"); } @@ -313,6 +319,7 @@ void ContentDirectoryService::sendSubscriptionUpdate(const std::string& containe propset->print(buf, "", 0); std::string xml = buf.str(); +#if !defined(USING_NPUPNP) IXML_Document* event = nullptr; int err = ixmlParseBufferEx(xml.c_str(), &event); if (err != IXML_SUCCESS) { @@ -323,8 +330,11 @@ void ContentDirectoryService::sendSubscriptionUpdate(const std::string& containe UpnpNotifyExt(deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(), DESC_CDS_SERVICE_ID, event); - ixmlDocument_free(event); +#else + UpnpNotifyXML(deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(), + DESC_CDS_SERVICE_ID, xml); +#endif log_debug("end"); } diff --git a/src/upnp_cm.cc b/src/upnp_cm.cc index aa608480..33f86bd2 100644 --- a/src/upnp_cm.cc +++ b/src/upnp_cm.cc @@ -127,6 +127,7 @@ void ConnectionManagerService::processSubscriptionRequest(const std::unique_ptr< propset->print(buf, "", 0); std::string xml = buf.str(); +#if !defined(USING_NPUPNP) IXML_Document* event = nullptr; int err = ixmlParseBufferEx(xml.c_str(), &event); if (err != IXML_SUCCESS) { @@ -138,6 +139,11 @@ void ConnectionManagerService::processSubscriptionRequest(const std::unique_ptr< DESC_CM_SERVICE_ID, event, request->getSubscriptionID().c_str()); ixmlDocument_free(event); +#else + UpnpAcceptSubscriptionXML( + deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(), + DESC_CM_SERVICE_ID, xml, request->getSubscriptionID().c_str()); +#endif } void ConnectionManagerService::sendSubscriptionUpdate(const std::string& sourceProtocol_CSV) @@ -150,6 +156,7 @@ void ConnectionManagerService::sendSubscriptionUpdate(const std::string& sourceP propset->print(buf, "", 0); std::string xml = buf.str(); +#if !defined(USING_NPUPNP) IXML_Document* event = nullptr; int err = ixmlParseBufferEx(xml.c_str(), &event); if (err != IXML_SUCCESS) { @@ -162,4 +169,8 @@ void ConnectionManagerService::sendSubscriptionUpdate(const std::string& sourceP DESC_CM_SERVICE_ID, event); ixmlDocument_free(event); +#else + UpnpNotifyXML(deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(), + DESC_CM_SERVICE_ID, xml); +#endif } diff --git a/src/upnp_mrreg.cc b/src/upnp_mrreg.cc index 16eefaed..f993f452 100644 --- a/src/upnp_mrreg.cc +++ b/src/upnp_mrreg.cc @@ -34,7 +34,9 @@ #include #include "config/config_manager.h" -#include "ixml.h" +#ifndef USING_NPUPNP +#include +#endif #include "server.h" #include "storage/storage.h" #include "upnp_xml.h" @@ -120,6 +122,7 @@ void MRRegistrarService::processSubscriptionRequest(const std::unique_ptrprint(buf, "", 0); std::string xml = buf.str(); +#if !defined(USING_NPUPNP) IXML_Document* event = nullptr; int err = ixmlParseBufferEx(xml.c_str(), &event); if (err != IXML_SUCCESS) { @@ -131,6 +134,11 @@ void MRRegistrarService::processSubscriptionRequest(const std::unique_ptrgetSubscriptionID().c_str()); ixmlDocument_free(event); +#else + UpnpAcceptSubscriptionXML( + deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(), + DESC_MRREG_SERVICE_ID, xml, request->getSubscriptionID().c_str()); +#endif } // TODO: FIXME diff --git a/src/url_request_handler.cc b/src/url_request_handler.cc index f2a99c94..66af027b 100644 --- a/src/url_request_handler.cc +++ b/src/url_request_handler.cc @@ -32,7 +32,9 @@ #ifdef HAVE_CURL #include "url_request_handler.h" // API +#ifndef USING_NPUPNP #include +#endif #include #include "config/config_manager.h" @@ -138,7 +140,11 @@ void URLRequestHandler::getInfo(const char* filename, UpnpFileInfo* info) // ixmlCloneDOMString(header.c_str())); // } +#if defined(USING_NPUPNP) + UpnpFileInfo_set_ContentType(info, mimeType); +#else UpnpFileInfo_set_ContentType(info, ixmlCloneDOMString(mimeType.c_str())); +#endif log_debug("web_get_info(): end"); /// \todo transcoding for get_info diff --git a/src/util/upnp_clients.cc b/src/util/upnp_clients.cc index ab02b58d..7bc85d77 100644 --- a/src/util/upnp_clients.cc +++ b/src/util/upnp_clients.cc @@ -203,6 +203,15 @@ bool Clients::getInfoByType(const std::string& match, ClientMatchType type, cons bool Clients::downloadDescription(const std::string& location, std::unique_ptr& xml) { +#if defined(USING_NPUPNP) + std::string description, ct; + int errCode = UpnpDownloadUrlItem(location, description, ct); + if (errCode != UPNP_E_SUCCESS) { + log_debug("Error obtaining client description from {} -- error = {}", location, errCode); + return false; + } + const char *cxml = description.c_str(); +#else IXML_Document* descDoc = nullptr; int errCode = UpnpDownloadXmlDoc(location.c_str(), &descDoc); if (errCode != UPNP_E_SUCCESS) { @@ -211,12 +220,15 @@ bool Clients::downloadDescription(const std::string& location, std::unique_ptr

(); auto ret = xml->load_string(cxml); +#if !defined(USING_NPUPNP) ixmlFreeDOMString(cxml); ixmlDocument_free(descDoc); +#endif if (ret.status != pugi::xml_parse_status::status_ok) { log_debug("Unable to parse xml client description from {}", location); return false; diff --git a/src/util/upnp_headers.cc b/src/util/upnp_headers.cc index c05cffe6..19ba88ca 100644 --- a/src/util/upnp_headers.cc +++ b/src/util/upnp_headers.cc @@ -96,18 +96,29 @@ void Headers::writeHeaders(UpnpFileInfo* fileInfo) const if (headers == nullptr) return; +#if defined(USING_NPUPNP) + for (auto iter : *headers) { + fileInfo->response_headers.push_back(iter); + } +#else auto head = const_cast(UpnpFileInfo_get_ExtraHeadersList(fileInfo)); for (auto iter : *headers) { UpnpExtraHeaders* h = UpnpExtraHeaders_new(); UpnpExtraHeaders_set_resp(h, formatHeader(iter, false).c_str()); UpnpListInsert(head, UpnpListEnd(head), const_cast(UpnpExtraHeaders_get_node(h))); } +#endif } std::unique_ptr> Headers::readHeaders(UpnpFileInfo* fileInfo) { auto ret = std::make_unique>(); +#if defined(USING_NPUPNP) + for (const auto& entry : fileInfo->request_headers) { + ret->insert(entry); + } +#else auto head = const_cast(UpnpFileInfo_get_ExtraHeadersList(fileInfo)); UpnpListIter pos; for (pos = UpnpListBegin(head); pos != UpnpListEnd(head); pos = UpnpListNext(head, pos)) { @@ -116,6 +127,7 @@ std::unique_ptr> Headers::readHeaders(UpnpFil auto add = parseHeader(header); ret->insert(add); } - +#endif + return ret; } diff --git a/src/util/upnp_headers.h b/src/util/upnp_headers.h index 9677d6e4..dd839236 100644 --- a/src/util/upnp_headers.h +++ b/src/util/upnp_headers.h @@ -26,7 +26,9 @@ #ifndef GERBERA_HEADERS_H #define GERBERA_HEADERS_H +#if !defined(USING_NPUPNP) #include +#endif #include #include #include diff --git a/src/web/web_request_handler.cc b/src/web/web_request_handler.cc index 71fc9fd5..2ca6601b 100644 --- a/src/web/web_request_handler.cc +++ b/src/web/web_request_handler.cc @@ -120,7 +120,11 @@ void WebRequestHandler::getInfo(const char* filename, UpnpFileInfo* info) contentType = mimetype + "; charset=" + DEFAULT_INTERNAL_CHARSET; +#if defined(USING_NPUPNP) + UpnpFileInfo_set_ContentType(info, contentType); +#else UpnpFileInfo_set_ContentType(info, ixmlCloneDOMString(contentType.c_str())); +#endif Headers headers; headers.addHeader(std::string { "Cache-Control" }, std::string { "no-cache, must-revalidate" }); headers.writeHeaders(info);