From 4c90ce863fc33b7a2f960aa9aeb02101a38ae699 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 5 Sep 2017 08:49:02 +0200 Subject: [PATCH] nhttpd: remove obsolete CONFIG_SYSTEM_TUXBOX_COOLSTREAM switch Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f53335d5331af281bc2c8b7fc9a2848ab684823d Author: vanhofen Date: 2017-09-05 (Tue, 05 Sep 2017) Origin message was: ------------------ - nhttpd: remove obsolete CONFIG_SYSTEM_TUXBOX_COOLSTREAM switch ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/nhttpd/yconfig.h | 19 ++++++------------- src/nhttpd/yhttpd.cpp | 7 ++++--- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/nhttpd/yconfig.h b/src/nhttpd/yconfig.h index 33aeee8c3..2ba1fa4d8 100644 --- a/src/nhttpd/yconfig.h +++ b/src/nhttpd/yconfig.h @@ -22,8 +22,7 @@ // System Choice ONE choice //----------------------------------------------------------------------------- #ifndef CONFIG_SYSTEM_BY_COMPILER // use Compiler directive to set CONFIG_SYSTEM -//#define CONFIG_SYSTEM_TUXBOX y // Tuxbox project -#define CONFIG_SYSTEM_TUXBOX_COOLSTREAM y // Tuxbox project for coolstream +#define CONFIG_SYSTEM_TUXBOX y // Tuxbox project #endif //----------------------------------------------------------------------------- // General central Definitions @@ -70,11 +69,12 @@ //#undef Y_CONFIG_HAVE_SENDFILE // Sendfile does not work for SSL, but we'll fallback to send //#endif -#if defined(CONFIG_SYSTEM_TUXBOX) || defined(CONFIG_SYSTEM_TUXBOX_COOLSTREAM) +#ifdef CONFIG_SYSTEM_TUXBOX #define Y_CONFIG_FEATURE_UPLOAD y #define Y_CONFIG_USE_YPARSER y #define Y_CONFIG_USE_AUTHHOOK y #endif + #ifdef Y_CONFIG_FEATURE_KEEP_ALIVE #define HTTP_PROTOCOL "HTTP/1.1" #else @@ -102,12 +102,15 @@ #define HTTPD_SENDFILE_ALL "true" #define HTTPD_LANGUAGEDIR "languages" #define HTTPD_DEFAULT_LANGUAGE "Deutsch" + #define AUTHUSER "root" +#define AUTHPASSWORD "ni" #define HTTPD_CONFIGDIR CONFIGDIR #define HTTPD_CONFIGFILE HTTPD_CONFIGDIR"/nhttpd.conf" #define YWEB_CONFIGFILE HTTPD_CONFIGDIR"/Y-Web.conf" #define PUBLICDOCUMENTROOT PUBLIC_HTTPDDIR +#define PRIVATEDOCUMENTROOT PRIVATE_HTTPDDIR #define NEUTRINO_CONFIGFILE CONFIGDIR"/neutrino.conf" #define MOVIEBROWSER_CONFIGFILE CONFIGDIR"/moviebrowser.conf" #define HOSTEDDOCUMENTROOT HOSTED_HTTPDDIR @@ -117,16 +120,6 @@ #define ZAPITXMLPATH CONFIGDIR"/zapit" #define TUXBOX_LOGOS_URL LOGODIR //NI -// switch for Box differences -#ifdef CONFIG_SYSTEM_TUXBOX -#define AUTHPASSWORD "dbox2" -#define PRIVATEDOCUMENTROOT DATADIR "/neutrino/httpd-y" -#endif - -#ifdef CONFIG_SYSTEM_TUXBOX_COOLSTREAM -#define AUTHPASSWORD "ni" -#define PRIVATEDOCUMENTROOT PRIVATE_HTTPDDIR -#endif //----------------------------------------------------------------------------- // Aggregated definitions //----------------------------------------------------------------------------- diff --git a/src/nhttpd/yhttpd.cpp b/src/nhttpd/yhttpd.cpp index fedee02d9..5895342eb 100644 --- a/src/nhttpd/yhttpd.cpp +++ b/src/nhttpd/yhttpd.cpp @@ -56,7 +56,8 @@ static CmodCache mod_cache; // static instance #endif //----------------------------------------------------------------------------- -#if defined(CONFIG_SYSTEM_TUXBOX) || defined(CONFIG_SYSTEM_TUXBOX_COOLSTREAM) + +#ifdef CONFIG_SYSTEM_TUXBOX #include "neutrinoapi.h" #include static CNeutrinoAPI *NeutrinoAPI; @@ -254,7 +255,7 @@ void Cyhttpd::hooks_attach() { CyhookHandler::attach(testhook); #endif -#if defined(CONFIG_SYSTEM_TUXBOX) || defined(CONFIG_SYSTEM_TUXBOX_COOLSTREAM) +#ifdef CONFIG_SYSTEM_TUXBOX NeutrinoAPI = new CNeutrinoAPI(); CyhookHandler::attach(NeutrinoAPI->NeutrinoYParser); CyhookHandler::attach(NeutrinoAPI->ControlAPI); @@ -292,7 +293,7 @@ void Cyhttpd::hooks_detach() { delete testhook; #endif -#if defined(CONFIG_SYSTEM_TUXBOX) || defined(CONFIG_SYSTEM_TUXBOX_COOLSTREAM) +#ifdef CONFIG_SYSTEM_TUXBOX CyhookHandler::detach(NeutrinoAPI->NeutrinoYParser); #else #ifdef Y_CONFIG_USE_YPARSER