nhttpd: small re-sorts; TODO: fix $Revision$ replacements

Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a105efe84
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: small re-sorts; TODO: fix $Revision$ replacements

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-05 09:31:31 +02:00
parent e71967d7b5
commit 347bf90f5d
7 changed files with 23 additions and 25 deletions

View File

@@ -155,10 +155,10 @@ public:
CControlAPI(CNeutrinoAPI *_NeutrinoAPI); CControlAPI(CNeutrinoAPI *_NeutrinoAPI);
// virtual functions for HookHandler/Hook // virtual functions for HookHandler/Hook
virtual std::string getHookName(void) {return std::string("mod_ControlAPI");} virtual std::string getHookName(void) {return std::string("mod_ControlAPI");}
virtual std::string getHookVersion(void) {return std::string("$Revision$");} virtual std::string getHookVersion(void) {return std::string("$Revision$");}
virtual THandleStatus Hook_SendResponse(CyhookHandler *hh); virtual THandleStatus Hook_SendResponse(CyhookHandler *hh);
virtual THandleStatus Hook_PrepareResponse(CyhookHandler *hh); virtual THandleStatus Hook_PrepareResponse(CyhookHandler *hh);
}; };
#endif /* __nhttpd_neutrinocontrolapi_hpp__ */ #endif /* __nhttpd_neutrinocontrolapi_hpp__ */

View File

@@ -65,8 +65,9 @@ public:
// virtual functions for BaseClass // virtual functions for BaseClass
virtual std::string YWeb_cgi_func(CyhookHandler *hh, std::string ycmd); virtual std::string YWeb_cgi_func(CyhookHandler *hh, std::string ycmd);
// virtual functions for HookHandler/Hook // virtual functions for HookHandler/Hook
virtual std::string getHookName(void) {return std::string("mod_NeutrinoYParser-Coolstream");} virtual std::string getHookName(void) {return std::string("mod_NeutrinoYParser");}
virtual std::string getHookVersion(void) {return std::string("$Revision$");} virtual std::string getHookVersion(void) {return std::string("$Revision$");}
virtual THandleStatus Hook_SendResponse(CyhookHandler *hh); virtual THandleStatus Hook_SendResponse(CyhookHandler *hh);
virtual THandleStatus Hook_ReadConfig(CConfigFile *Config, CStringList &ConfigList); virtual THandleStatus Hook_ReadConfig(CConfigFile *Config, CStringList &ConfigList);

View File

@@ -17,16 +17,12 @@ public:
} }
; ;
// Hooks // virtual functions for HookHandler/Hook
virtual THandleStatus Hook_PrepareResponse(CyhookHandler *hh); virtual std::string getHookName(void) {return std::string("mod_auth");}
virtual std::string getHookName(void) { virtual std::string getHookVersion(void) {return std::string("$Revision$");}
return std::string("mod_auth"); virtual THandleStatus Hook_PrepareResponse(CyhookHandler *hh);
} virtual THandleStatus Hook_ReadConfig(CConfigFile *Config, CStringList &ConfigList);
virtual std::string getHookVersion(void) {
return std::string("$Revision$");
}
virtual THandleStatus Hook_ReadConfig(CConfigFile *Config,
CStringList &ConfigList);
protected: protected:
bool CheckAuth(CyhookHandler *hh); bool CheckAuth(CyhookHandler *hh);
std::string decodeBase64(const char *b64buffer); std::string decodeBase64(const char *b64buffer);

View File

@@ -48,12 +48,12 @@ public:
static void RemoveCategoryFromCache(std::string category); static void RemoveCategoryFromCache(std::string category);
static void DeleteCache(void); static void DeleteCache(void);
// Hooks // virtual functions for HookHandler/Hook
virtual std::string getHookName(void) {return std::string("mod_cache");}
virtual std::string getHookVersion(void) {return std::string("$Revision$");}
virtual THandleStatus Hook_PrepareResponse(CyhookHandler *hh); virtual THandleStatus Hook_PrepareResponse(CyhookHandler *hh);
virtual THandleStatus Hook_SendResponse(CyhookHandler *hh); virtual THandleStatus Hook_SendResponse(CyhookHandler *hh);
virtual std::string getHookVersion(void) {return std::string("$Revision$");} virtual THandleStatus Hook_ReadConfig(CConfigFile *Config, CStringList &ConfigList);
virtual std::string getHookName(void) {return std::string("mod_cache");}
virtual THandleStatus Hook_ReadConfig(CConfigFile *Config,CStringList &ConfigList);
}; };
#endif /* __yhttpd_mod_cache_h__ */ #endif /* __yhttpd_mod_cache_h__ */

View File

@@ -28,11 +28,11 @@ public:
CmodSendfile(){}; CmodSendfile(){};
~CmodSendfile(void){}; ~CmodSendfile(void){};
// Hooks // virtual functions for HookHandler/Hook
virtual THandleStatus Hook_PrepareResponse(CyhookHandler *hh);
// virtual THandleStatus Hook_SendResponse(CyhookHandler *hh);
virtual std::string getHookName(void) {return std::string("mod_sendfile");} virtual std::string getHookName(void) {return std::string("mod_sendfile");}
virtual std::string getHookVersion(void) {return std::string("$Revision$");} virtual std::string getHookVersion(void) {return std::string("$Revision$");}
virtual THandleStatus Hook_PrepareResponse(CyhookHandler *hh);
// virtual THandleStatus Hook_SendResponse(CyhookHandler *hh);
virtual THandleStatus Hook_ReadConfig(CConfigFile *Config, CStringList &ConfigList); virtual THandleStatus Hook_ReadConfig(CConfigFile *Config, CStringList &ConfigList);
}; };

View File

@@ -33,10 +33,10 @@ public:
void AddLogEntry_ELF(CyhookHandler *hh); void AddLogEntry_ELF(CyhookHandler *hh);
bool printf(const char *fmt, ...); bool printf(const char *fmt, ...);
// Hooks // virtual functions for HookHandler/Hook
virtual THandleStatus Hook_EndConnection(CyhookHandler *hh);
virtual std::string getHookName(void) {return std::string("mod_weblog");} virtual std::string getHookName(void) {return std::string("mod_weblog");}
virtual std::string getHookVersion(void) {return std::string("$Revision$");} virtual std::string getHookVersion(void) {return std::string("$Revision$");}
virtual THandleStatus Hook_EndConnection(CyhookHandler *hh);
virtual THandleStatus Hook_ReadConfig(CConfigFile *Config, CStringList &ConfigList); virtual THandleStatus Hook_ReadConfig(CConfigFile *Config, CStringList &ConfigList);
}; };
#endif // __yhttpd_mod_weblog_h__ #endif // __yhttpd_mod_weblog_h__

View File

@@ -113,9 +113,10 @@ public:
// virtual functions for BaseClass // virtual functions for BaseClass
virtual std::string YWeb_cgi_func(CyhookHandler *hh, std::string ycmd); virtual std::string YWeb_cgi_func(CyhookHandler *hh, std::string ycmd);
// virtual functions for HookHandler/Hook // virtual functions for HookHandler/Hook
virtual std::string getHookVersion(void) {return std::string("$Revision$");}
virtual std::string getHookName(void) {return "mod_yparser";} virtual std::string getHookName(void) {return "mod_yparser";}
virtual std::string getHookVersion(void) {return std::string("$Revision$");}
virtual THandleStatus Hook_SendResponse(CyhookHandler *hh); virtual THandleStatus Hook_SendResponse(CyhookHandler *hh);
}; };