diff --git a/include/KAccessDso.h b/include/KAccessDso.h index 9de0dff..c5e9b3e 100644 --- a/include/KAccessDso.h +++ b/include/KAccessDso.h @@ -30,7 +30,7 @@ class KAccessDso module->ctx.module = access->create_ctx(); return module; } - const char* getName() { + const char *get_module() const { return access->name; } void getHtml(KWStream& s); @@ -73,8 +73,8 @@ class KAccessDsoMark : public KMark KMark* new_instance() override { return new KAccessDsoMark(ad->new_instance()); } - const char* getName() override { - return ad->getName(); + const char *get_module() const override { + return ad->get_module(); } void get_html(KWStream& s) override { return ad->getHtml(s); @@ -109,8 +109,8 @@ class KAccessDsoAcl : public KAcl KAcl* new_instance() override { return new KAccessDsoAcl(ad->new_instance()); } - const char* getName() override { - return ad->getName(); + const char *get_module() const override { + return ad->get_module(); } void get_html(KWStream& s) override { return ad->getHtml(s); diff --git a/include/KBlackListMark.h b/include/KBlackListMark.h index f85cdbb..43832fc 100644 --- a/include/KBlackListMark.h +++ b/include/KBlackListMark.h @@ -53,7 +53,7 @@ if (1== atoi(attribute["enable"].c_str())) { KMark* new_instance() override { return new KBlackListMark(); } - const char* getName() override { + const char *get_module() const override { return "black_list"; } private: @@ -112,7 +112,7 @@ class KCheckBlackListMark : public KMark KMark* new_instance() override { return new KCheckBlackListMark(); } - const char* getName()override { + const char *get_module() const override { return "check_black_list"; } private: diff --git a/include/KCdnRewriteMark.h b/include/KCdnRewriteMark.h index 80c55ca..1f3a4a0 100644 --- a/include/KCdnRewriteMark.h +++ b/include/KCdnRewriteMark.h @@ -10,7 +10,9 @@ class KHostRewriteMark : public KMark virtual ~KHostRewriteMark(); uint32_t process(KHttpRequest* rq, KHttpObject* obj, KSafeSource& fo) override; KMark * new_instance() override; - const char *getName() override; + const char* get_module() const override { + return "host_rewrite"; + } void get_display(KWStream& s) override; void get_html(KWStream& s) override; void parse_config(const khttpd::KXmlNodeBody* xml) override; @@ -30,7 +32,7 @@ class KHostMark : public KMark virtual ~KHostMark(); uint32_t process(KHttpRequest* rq, KHttpObject* obj, KSafeSource& fo) override; KMark * new_instance() override; - const char *getName() override; + const char* get_module() const override; void get_display(KWStream& s) override; void get_html(KWStream& s) override; void parse_config(const khttpd::KXmlNodeBody* xml) override; diff --git a/include/KChain.h b/include/KChain.h index 24d5bcc..22abc56 100644 --- a/include/KChain.h +++ b/include/KChain.h @@ -95,7 +95,7 @@ class KChain final void getModelHtml(KModelPtr &ptr, KWStream& s, int type, int index) { s << ""; + << ptr.m->get_module() << "'>"; s << "[del]"; if (ptr.named.empty()) { s << "NOT "; - s << ptr.m->getName(); + s << ptr.m->get_module(); } else { s << "named:" << ptr.named; } diff --git a/include/KConnectionCloseMark.h b/include/KConnectionCloseMark.h index ac180de..b495033 100644 --- a/include/KConnectionCloseMark.h +++ b/include/KConnectionCloseMark.h @@ -13,7 +13,7 @@ class KConnectionCloseMark : public KMark KMark *new_instance()override { return new KConnectionCloseMark(); } - const char *getName() override { + const char *get_module() const override { return "connection_close"; } uint32_t process(KHttpRequest* rq, KHttpObject* obj, KSafeSource& fo) override diff --git a/include/KCounterMark.h b/include/KCounterMark.h index bcaabf9..d97f868 100644 --- a/include/KCounterMark.h +++ b/include/KCounterMark.h @@ -21,7 +21,7 @@ class KCounterMark : public KMark { return new KCounterMark(); } - const char *getName() override + const char *get_module() const override { return "counter"; } diff --git a/include/KFlowMark.h b/include/KFlowMark.h index c543a03..3a73e63 100644 --- a/include/KFlowMark.h +++ b/include/KFlowMark.h @@ -26,7 +26,7 @@ class KFlowMark : public KMark { return new KFlowMark(); } - const char *getName() override + const char *get_module() const override { return "flow"; } diff --git a/include/KGeoMark.h b/include/KGeoMark.h index c86f8da..f0bf63c 100644 --- a/include/KGeoMark.h +++ b/include/KGeoMark.h @@ -101,7 +101,7 @@ class KGeoMark : public KMark KMark * new_instance() override { return new KGeoMark; } - const char *getName() override { + const char *get_module() const override { return "geo"; } void flush_timer_callback(); diff --git a/include/KHostAliasMark.h b/include/KHostAliasMark.h index a8a6a1c..49e91d7 100644 --- a/include/KHostAliasMark.h +++ b/include/KHostAliasMark.h @@ -88,7 +88,7 @@ class KHostAliasMark : public KMark KMark * new_instance()override { return new KHostAliasMark(); } - const char *getName() override { + const char *get_module() const override { return "host_alias"; } private: diff --git a/include/KHttpOnlyCookieMark.h b/include/KHttpOnlyCookieMark.h index 437cded..e9b0795 100644 --- a/include/KHttpOnlyCookieMark.h +++ b/include/KHttpOnlyCookieMark.h @@ -58,7 +58,7 @@ class KCookieMark : public KMark { return new KCookieMark; } - const char* getName() override + const char *get_module() const override { return "cookie"; } diff --git a/include/KIpRateAcl.h b/include/KIpRateAcl.h index 0e644aa..71a0c4b 100644 --- a/include/KIpRateAcl.h +++ b/include/KIpRateAcl.h @@ -17,7 +17,7 @@ class KIpRateAcl : public KAcl KAcl *new_instance() override{ return new KIpRateAcl(); } - const char *getName() override{ + const char *get_module() const override{ return "ip_rate"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/include/KIpSpeedLimitMark.h b/include/KIpSpeedLimitMark.h index f6791ef..3c0a694 100644 --- a/include/KIpSpeedLimitMark.h +++ b/include/KIpSpeedLimitMark.h @@ -65,7 +65,7 @@ class KIpSpeedLimitMark : public KMark { return new KIpSpeedLimitMark; } - const char *getName()override + const char* get_module() const override { return "ip_speed_limit"; } diff --git a/include/KIpUrlRateAcl.h b/include/KIpUrlRateAcl.h index 753dcb7..7547424 100644 --- a/include/KIpUrlRateAcl.h +++ b/include/KIpUrlRateAcl.h @@ -19,7 +19,7 @@ class KIpUrlRateAcl : public KAcl KAcl *new_instance() override { return new KIpUrlRateAcl(); } - const char *getName() override { + const char *get_module() const override { return "ip_url_rate"; } void get_display(KWStream& s) override { diff --git a/include/KIpUrlRateMark.h b/include/KIpUrlRateMark.h index ccb79d4..0e96127 100644 --- a/include/KIpUrlRateMark.h +++ b/include/KIpUrlRateMark.h @@ -23,7 +23,7 @@ class KIpUrlRateMark : public KMark KMark * new_instance() override { return new KIpUrlRateMark(); } - const char *getName() override { + const char *get_module() const override { return "ip_url_rate"; } uint32_t process(KHttpRequest* rq, KHttpObject* obj, KSafeSource& fo) override { diff --git a/include/KMapRedirectMark.h b/include/KMapRedirectMark.h index f08b972..7826efe 100644 --- a/include/KMapRedirectMark.h +++ b/include/KMapRedirectMark.h @@ -23,7 +23,7 @@ class KMapRedirectMark : public KMark{ virtual ~KMapRedirectMark(); uint32_t process(KHttpRequest* rq, KHttpObject* obj, KSafeSource& fo) override; KMark *new_instance()override; - const char *getName()override; + const char *get_module() const override; void get_html(KWStream& s) override; void get_display(KWStream& s) override; void parse_config(const khttpd::KXmlNodeBody* xml) override; diff --git a/include/KMarkAcl.h b/include/KMarkAcl.h index cb5b8a6..f06e125 100644 --- a/include/KMarkAcl.h +++ b/include/KMarkAcl.h @@ -19,7 +19,7 @@ class KMarkAcl: public KAcl KAcl *new_instance() override { return new KMarkAcl(); } - const char *getName() override { + const char *get_module() const override { return "mark"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/include/KMarkMark.h b/include/KMarkMark.h index 7b5089d..548864c 100644 --- a/include/KMarkMark.h +++ b/include/KMarkMark.h @@ -19,7 +19,7 @@ class KMarkMark : public KMark { return new KMarkMark; } - const char *getName() override + const char *get_module() const override { return "mark"; } diff --git a/include/KMinObjVerifiedMark.h b/include/KMinObjVerifiedMark.h index b4aeacc..ea49570 100644 --- a/include/KMinObjVerifiedMark.h +++ b/include/KMinObjVerifiedMark.h @@ -26,7 +26,7 @@ class KMinObjVerifiedMark : public KMark { return new KMinObjVerifiedMark; } - const char *getName()override + const char* get_module() const override { return "min_obj_verified"; } diff --git a/include/KModel.h b/include/KModel.h index 9f29130..1ea0395 100644 --- a/include/KModel.h +++ b/include/KModel.h @@ -35,13 +35,10 @@ using KSafeSource = std::unique_ptr; class KModel { public: KModel() { - //revers = false; - //is_or = false; isGlobal = true; ref = 1; } - virtual const char *getName() = 0; - /* 工厂实例不会调用 parse_config */ + virtual const char *get_module() const = 0; virtual void parse_config(const khttpd::KXmlNodeBody* xml) = 0; virtual void parse_child(const kconfig::KXmlChanged* changed) { } @@ -60,9 +57,8 @@ class KModel { } } void dump(kgl::serializable* m, bool is_short) { - //m->add("revers", revers); - //m->add("is_or", is_or); - m->add("module", getName()); + m->add("refs", get_ref()); + m->add("module", get_module()); KStringBuf out; if (is_short) { get_display(out); @@ -71,10 +67,6 @@ class KModel { } m->add("html", out.str()); } - /* 命名模块的名字 */ - //KString named; - //bool revers; - //bool is_or; bool isGlobal; protected: volatile uint32_t ref; diff --git a/include/KMultiHostAcl.h b/include/KMultiHostAcl.h index 6e1ef3c..1e7c3cc 100644 --- a/include/KMultiHostAcl.h +++ b/include/KMultiHostAcl.h @@ -12,7 +12,7 @@ class KMultiHostAcl: public KAcl { void get_html(KWStream& s) override; void get_display(KWStream& s) override; KAcl *new_instance() override; - const char *getName() override; + const char *get_module() const override; bool match(KHttpRequest* rq, KHttpObject* obj) override; void parse_config(const khttpd::KXmlNodeBody* xml) override; private: diff --git a/include/KMultiServerMark.h b/include/KMultiServerMark.h index 088c890..b1a0c2b 100644 --- a/include/KMultiServerMark.h +++ b/include/KMultiServerMark.h @@ -53,7 +53,7 @@ class KMultiServerMark : public KMark KMark* new_instance() override { return new KMultiServerMark(); } - const char* getName() override { + const char *get_module() const override { return "multi_server"; } private: diff --git a/include/KObjFlagAcl.h b/include/KObjFlagAcl.h index bc32ab0..c431179 100644 --- a/include/KObjFlagAcl.h +++ b/include/KObjFlagAcl.h @@ -45,7 +45,7 @@ class KObjFlagAcl : public KAcl { KAcl *new_instance() override { return new KObjFlagAcl(); } - const char *getName() override { + const char *get_module() const override { return "obj_flag"; } private: diff --git a/include/KPerIpAcl.h b/include/KPerIpAcl.h index aff805b..ded26d8 100644 --- a/include/KPerIpAcl.h +++ b/include/KPerIpAcl.h @@ -85,7 +85,7 @@ class KPerIpAcl: public KAcl { KAcl *new_instance() override { return new KPerIpAcl(); } - const char *getName() override { + const char *get_module() const override { return "per_ip"; } diff --git a/include/KPortMapMark.h b/include/KPortMapMark.h index 151c398..6d26de6 100644 --- a/include/KPortMapMark.h +++ b/include/KPortMapMark.h @@ -48,7 +48,7 @@ class KPortMapMark : public KMark { return new KPortMapMark; } - const char *getName()override + const char* get_module() const override { return "port_map"; } diff --git a/include/KQueueMark.h b/include/KQueueMark.h index 314fbc8..a982e05 100644 --- a/include/KQueueMark.h +++ b/include/KQueueMark.h @@ -33,7 +33,7 @@ class KQueueMark : public KMark KMark* new_instance()override { return new KQueueMark; } - const char* getName()override { + const char *get_module() const override { return "queue"; } void get_html(KWStream& s) override; @@ -56,7 +56,7 @@ class KPerQueueMark : public KMark KMark* new_instance() override { return new KPerQueueMark; } - const char* getName() override { + const char *get_module() const override { return "per_queue"; } void get_display(KWStream& s) override; diff --git a/include/KRandAcl.h b/include/KRandAcl.h index 0a9c752..4d431d4 100644 --- a/include/KRandAcl.h +++ b/include/KRandAcl.h @@ -23,7 +23,7 @@ class KRandAcl : public KAcl KAcl *new_instance() override { return new KRandAcl(); } - const char *getName() override { + const char *get_module() const override { return "rand"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/include/KRedirectMark.h b/include/KRedirectMark.h index d8e7710..a201119 100644 --- a/include/KRedirectMark.h +++ b/include/KRedirectMark.h @@ -32,7 +32,7 @@ class KRedirectMark: public KMark { virtual ~KRedirectMark(); uint32_t process(KHttpRequest* rq, KHttpObject* obj, KSafeSource& fo) override; KMark * new_instance()override; - const char *getName()override; + const char * get_module() const override; void get_display(KWStream& s) override; void get_html(KWStream& s) override; void parse_config(const khttpd::KXmlNodeBody* xml) override; diff --git a/include/KRemoveHeaderMark.h b/include/KRemoveHeaderMark.h index 85204ff..b994ca6 100644 --- a/include/KRemoveHeaderMark.h +++ b/include/KRemoveHeaderMark.h @@ -63,7 +63,7 @@ class KRemoveHeaderMark : public KMark KMark* new_instance() override { return new KRemoveHeaderMark; } - const char* getName()override { + const char *get_module() const override { return "remove_header"; } void get_html(KWStream& s) override { diff --git a/include/KRemoveParamMark.h b/include/KRemoveParamMark.h index da3e0b0..3ee7328 100644 --- a/include/KRemoveParamMark.h +++ b/include/KRemoveParamMark.h @@ -104,7 +104,7 @@ class KRemoveParamMark : public KMark KMark * new_instance() override { return new KRemoveParamMark(); } - const char *getName()override { + const char* get_module() const override { return "remove_param"; } diff --git a/include/KReplaceHeaderMark.h b/include/KReplaceHeaderMark.h index 1ec87c3..2ba3134 100644 --- a/include/KReplaceHeaderMark.h +++ b/include/KReplaceHeaderMark.h @@ -85,7 +85,7 @@ class KReplaceHeaderMark : public KMark KMark* new_instance() override { return new KReplaceHeaderMark; } - const char* getName() override { + const char *get_module() const override { return "replace_header"; } void get_html(KWStream& s) override { diff --git a/include/KReplaceIPMark.h b/include/KReplaceIPMark.h index c7ff8dc..3a35682 100644 --- a/include/KReplaceIPMark.h +++ b/include/KReplaceIPMark.h @@ -81,7 +81,7 @@ class KReplaceIPMark : public KMark { return new KReplaceIPMark; } - const char *getName()override + const char* get_module() const override { return "replace_ip"; } @@ -201,7 +201,7 @@ class KParentMark : public KMark { return new KParentMark; } - const char *getName()override + const char * get_module() const override { return "parent"; } diff --git a/include/KRewriteMarkEx.h b/include/KRewriteMarkEx.h index f650c15..9c1e97b 100644 --- a/include/KRewriteMarkEx.h +++ b/include/KRewriteMarkEx.h @@ -179,7 +179,7 @@ class KRewriteMarkEx: public KMark { ~KRewriteMarkEx(void); uint32_t process(KHttpRequest* rq, KHttpObject* obj, KSafeSource& fo) override; KMark * new_instance() override; - const char *getName() override; + const char * get_module() const override; void get_display(KWStream& s) override; void get_html(KWStream& s) override; static void getEnv(KHttpRequest *rq, char *env, KWStream&s); diff --git a/include/KSelfPortsAcl.h b/include/KSelfPortsAcl.h index 113b71e..16446e1 100644 --- a/include/KSelfPortsAcl.h +++ b/include/KSelfPortsAcl.h @@ -12,7 +12,7 @@ class KSelfPortsAcl: public KMultiIntAcl { KAcl *new_instance() override { return new KSelfPortsAcl(); } - const char *getName() override { + const char *get_module() const override { return "self_ports"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { @@ -29,7 +29,7 @@ class KListenPortsAcl: public KMultiIntAcl { KAcl *new_instance() override { return new KListenPortsAcl(); } - const char *getName() override { + const char *get_module() const override { return "listen_ports"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/include/KSelfsAcl.h b/include/KSelfsAcl.h index 5c86840..40d727f 100644 --- a/include/KSelfsAcl.h +++ b/include/KSelfsAcl.h @@ -14,7 +14,7 @@ class KSelfsAcl: public KMultiAcl { KAcl *new_instance() override { return new KSelfsAcl(); } - const char *getName() override { + const char *get_module() const override { return "selfs"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/include/KSrcsAcl.h b/include/KSrcsAcl.h index 7802b8d..4e52254 100644 --- a/include/KSrcsAcl.h +++ b/include/KSrcsAcl.h @@ -14,7 +14,7 @@ class KSrcsAcl: public KAcl { KAcl *new_instance() override { return new KSrcsAcl(); } - const char *getName() override { + const char *get_module() const override { return "srcs"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/include/KStatusCodeAcl.h b/include/KStatusCodeAcl.h index 1940046..acf6123 100644 --- a/include/KStatusCodeAcl.h +++ b/include/KStatusCodeAcl.h @@ -19,7 +19,7 @@ class KStatusCodeAcl: public KAcl KAcl *new_instance() override { return new KStatusCodeAcl(); } - const char *getName() override { + const char *get_module() const override { return "status_code"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/include/KTimeoutMark.h b/include/KTimeoutMark.h index fa3accc..1bcb46d 100644 --- a/include/KTimeoutMark.h +++ b/include/KTimeoutMark.h @@ -19,7 +19,7 @@ class KTimeoutMark : public KMark { return new KTimeoutMark; } - const char *getName()override + const char* get_module() const override { return "timeout"; } diff --git a/include/KUrlRateAcl.h b/include/KUrlRateAcl.h index 980ec1b..518a48e 100644 --- a/include/KUrlRateAcl.h +++ b/include/KUrlRateAcl.h @@ -19,7 +19,7 @@ class KUrlRateAcl : public KAcl KAcl *new_instance() override { return new KUrlRateAcl(); } - const char *getName() override { + const char *get_module() const override { return "url_rate"; } void get_display(KWStream& s)override { diff --git a/include/KUrlRewriteMark.h b/include/KUrlRewriteMark.h index 0f4d1f1..ec791ca 100644 --- a/include/KUrlRewriteMark.h +++ b/include/KUrlRewriteMark.h @@ -45,7 +45,7 @@ class KUrlRewriteMark : public KMark { return new KUrlRewriteMark; } - const char *getName()override + const char* get_module() const override { return "url_rewrite"; } diff --git a/include/KVaryMark.h b/include/KVaryMark.h index c02e479..05b7654 100644 --- a/include/KVaryMark.h +++ b/include/KVaryMark.h @@ -49,7 +49,7 @@ class KVaryMark : public KMark KMark* new_instance() override { return new KVaryMark; } - const char* getName() override { + const char *get_module() const override { return "vary"; } private: diff --git a/include/KWhiteListModel.h b/include/KWhiteListModel.h index b186d35..8fedef9 100644 --- a/include/KWhiteListModel.h +++ b/include/KWhiteListModel.h @@ -26,7 +26,7 @@ class KWhiteListAcl : public KAcl } return wlm.find(host, rq->getClientIp(),this->flush); } - const char *getName() override { + const char *get_module() const override { return "white_list"; } void get_display(KWStream& s) override { @@ -86,7 +86,7 @@ class KWhiteListMark : public KMark wlm.add(host, (svh ? svh->vh->name.c_str() : NULL), rq->getClientIp(), false); return KF_STATUS_REQ_TRUE; } - const char *getName()override { + const char* get_module() const override { return "white_list"; } void get_display(KWStream& s) override { diff --git a/include/KWorkModelAcl.h b/include/KWorkModelAcl.h index 53462e1..2328c33 100644 --- a/include/KWorkModelAcl.h +++ b/include/KWorkModelAcl.h @@ -14,7 +14,7 @@ class KWorkModelAcl : public KAcl KAcl *new_instance() override { return new KWorkModelAcl(); } - const char *getName() override { + const char *get_module() const override { return "work_model"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KAddHeaderMark.h b/module/access/KAddHeaderMark.h index 1201ee5..7462749 100644 --- a/module/access/KAddHeaderMark.h +++ b/module/access/KAddHeaderMark.h @@ -41,7 +41,7 @@ class KAddHeaderMark: public KMark { return new KAddHeaderMark; } - const char *getName() override + const char *get_module() const override { return "add_header"; } @@ -124,7 +124,7 @@ class KAddResponseHeaderMark : public KMark { return new KAddResponseHeaderMark; } - const char *getName() override + const char *get_module() const override { return "add_response_header"; } diff --git a/module/access/KAuthMark.h b/module/access/KAuthMark.h index 50bf996..af188d4 100644 --- a/module/access/KAuthMark.h +++ b/module/access/KAuthMark.h @@ -36,7 +36,9 @@ class KAuthMark: public KMark { virtual ~KAuthMark(); uint32_t process(KHttpRequest* rq, KHttpObject* obj, KSafeSource& fo) override; KMark * new_instance() override; - const char *getName() override; + const char* get_module() const override { + return "auth"; + } void get_html(KWStream &s) override; void get_display(KWStream &s) override; void parse_config(const khttpd::KXmlNodeBody* xml) override; diff --git a/module/access/KAuthUserAcl.h b/module/access/KAuthUserAcl.h index 7a16f9e..1787534 100644 --- a/module/access/KAuthUserAcl.h +++ b/module/access/KAuthUserAcl.h @@ -32,7 +32,7 @@ class KAuthUserAcl: public KMultiAcl { KAcl *new_instance() override { return new KAuthUserAcl(); } - const char *getName() override { + const char *get_module() const override { return "auth_user"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { @@ -55,7 +55,7 @@ class KRegAuthUserAcl: public KAcl ~KRegAuthUserAcl() { } - const char *getName() override { + const char *get_module() const override { return "reg_auth_user"; } KAcl *new_instance() override { diff --git a/module/access/KCacheControlMark.h b/module/access/KCacheControlMark.h index 9f7d799..d9bd8ca 100644 --- a/module/access/KCacheControlMark.h +++ b/module/access/KCacheControlMark.h @@ -101,7 +101,7 @@ class KCacheControlMark: public KMark { KMark * new_instance() override { return new KCacheControlMark(); } - const char *getName() override { + const char *get_module() const override { return "cache_control"; } private: diff --git a/module/access/KCloudIpAcl.h b/module/access/KCloudIpAcl.h index 64b6c2f..56f35e5 100644 --- a/module/access/KCloudIpAcl.h +++ b/module/access/KCloudIpAcl.h @@ -12,7 +12,7 @@ class KCloudIpAcl: public KAcl { void get_display(KWStream& s) override; void get_html(KWStream& s) override; KAcl *new_instance() override; - const char *getName() override; + const char *get_module() const override; bool match(KHttpRequest* rq, KHttpObject* obj) override; void parse_config(const khttpd::KXmlNodeBody* xml) override; void start(); diff --git a/module/access/KContentLengthAcl.h b/module/access/KContentLengthAcl.h index cf5a0b1..d349bfe 100644 --- a/module/access/KContentLengthAcl.h +++ b/module/access/KContentLengthAcl.h @@ -42,7 +42,7 @@ class KContentLengthAcl : public KAcl { KAcl *new_instance() override { return new KContentLengthAcl(); } - const char *getName() override { + const char *get_module() const override { return "content_length"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KDirAcl.h b/module/access/KDirAcl.h index 880cf54..e62c9d0 100644 --- a/module/access/KDirAcl.h +++ b/module/access/KDirAcl.h @@ -18,7 +18,7 @@ class KDirAcl: public KMultinAcl { KAcl *new_instance() override { return new KDirAcl(); } - const char *getName() override { + const char *get_module() const override { return "dir"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KDstPortAcl.h b/module/access/KDstPortAcl.h index 61f55d1..c19f844 100644 --- a/module/access/KDstPortAcl.h +++ b/module/access/KDstPortAcl.h @@ -36,7 +36,7 @@ class KDstPortAcl: public KAcl { KAcl *new_instance() override { return new KDstPortAcl(); } - const char *getName() override { + const char *get_module() const override { return "dst_port"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KFileAcl.h b/module/access/KFileAcl.h index d5a2b33..9de61b2 100644 --- a/module/access/KFileAcl.h +++ b/module/access/KFileAcl.h @@ -35,7 +35,7 @@ class KFileAcl: public KMultiAcl { KAcl *new_instance() override { return new KFileAcl(); } - const char *getName() override { + const char *get_module() const override { return "file"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KFileExeAcl.h b/module/access/KFileExeAcl.h index f77c2fe..e4ed99a 100644 --- a/module/access/KFileExeAcl.h +++ b/module/access/KFileExeAcl.h @@ -35,7 +35,7 @@ class KFileExeAcl : public KMultiAcl { KAcl *new_instance() override { return new KFileExeAcl(); } - const char *getName() override { + const char *get_module() const override { return "file_ext"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { @@ -71,7 +71,7 @@ class KFileNameAcl : public KMultiAcl { KAcl *new_instance() override { return new KFileNameAcl(); } - const char *getName() override { + const char *get_module() const override { return "filename"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KFlagMark.h b/module/access/KFlagMark.h index 96b044c..1b46032 100644 --- a/module/access/KFlagMark.h +++ b/module/access/KFlagMark.h @@ -243,7 +243,7 @@ class KFlagMark: public KMark { KMark * new_instance() override { return new KFlagMark(); } - const char *getName() override { + const char *get_module() const override { return "flag"; } public: diff --git a/module/access/KGSpeedLimitMark.h b/module/access/KGSpeedLimitMark.h index 6b2b599..048fdc7 100644 --- a/module/access/KGSpeedLimitMark.h +++ b/module/access/KGSpeedLimitMark.h @@ -58,7 +58,7 @@ class KGSpeedLimitMark: public KMark { KMark * new_instance()override { return new KGSpeedLimitMark(); } - const char *getName()override { + const char* get_module() const override { return "gspeed_limit"; } private: diff --git a/module/access/KHeaderAcl.h b/module/access/KHeaderAcl.h index 5b514b1..d9655e6 100644 --- a/module/access/KHeaderAcl.h +++ b/module/access/KHeaderAcl.h @@ -46,7 +46,7 @@ class KHeaderAcl : public KAcl } s << ">nc"; } - const char* getName() override { + const char *get_module() const override { return "header"; } bool match_header(KHttpHeader* next) { @@ -102,7 +102,7 @@ class KHeaderMapAcl : public KMultiAcl KAcl* new_instance() override { return new KHeaderMapAcl; } - const char* getName() override { + const char *get_module() const override { return "header_map"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KHostAcl.h b/module/access/KHostAcl.h index 11c59a1..5b9af1d 100644 --- a/module/access/KHostAcl.h +++ b/module/access/KHostAcl.h @@ -40,7 +40,7 @@ class KHostAcl: public KMultiAcl { KAcl *new_instance() override { return new KHostAcl(); } - const char *getName() override { + const char* get_module() const override { return "host"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { @@ -57,7 +57,7 @@ class KWideHostAcl : public KAcl{ KAcl *new_instance() override { return new KWideHostAcl(); } - const char *getName() override { + const char *get_module() const override { return "wide_host"; } void get_display(KWStream& s) override { diff --git a/module/access/KHttpsProxyMark.h b/module/access/KHttpsProxyMark.h index 60b2d10..622e87a 100644 --- a/module/access/KHttpsProxyMark.h +++ b/module/access/KHttpsProxyMark.h @@ -12,7 +12,7 @@ class KHttpsProxyMark : public KMark { KMark* newInstance() { return new KHttpsProxyMark(); } - const char* getName() { + const char *get_module() const { return "https_proxy"; } std::string getHtml(KModel* model) { diff --git a/module/access/KLoadAvgAcl.h b/module/access/KLoadAvgAcl.h index 69f80e9..ad7145e 100644 --- a/module/access/KLoadAvgAcl.h +++ b/module/access/KLoadAvgAcl.h @@ -39,7 +39,7 @@ class KLoadAvgAcl : public KAcl { KAcl *new_instance() override { return new KLoadAvgAcl(); } - const char *getName() override { + const char *get_module() const override { return "loadavg"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KMethodAcl.h b/module/access/KMethodAcl.h index 2a59e31..a076d1c 100644 --- a/module/access/KMethodAcl.h +++ b/module/access/KMethodAcl.h @@ -40,7 +40,7 @@ class KMethodAcl: public KAcl { KAcl *new_instance() override { return new KMethodAcl(); } - const char *getName() override { + const char *get_module() const override { return "meth"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KObjAlwaysOnAcl.h b/module/access/KObjAlwaysOnAcl.h index 18f7078..9bdaa55 100644 --- a/module/access/KObjAlwaysOnAcl.h +++ b/module/access/KObjAlwaysOnAcl.h @@ -32,7 +32,7 @@ class KObjAlwaysOnAcl: public KAcl { KAcl *new_instance() override { return new KObjAlwaysOnAcl(); } - const char *getName() override { + const char *get_module() const override { return "obj_always_on"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KPathAcl.h b/module/access/KPathAcl.h index 08772ef..db07001 100644 --- a/module/access/KPathAcl.h +++ b/module/access/KPathAcl.h @@ -47,7 +47,7 @@ class KPathAcl: public KAcl { KAcl *new_instance() override { return new KPathAcl(); } - const char *getName() override { + const char * get_module() const override { return "path"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KPathSignMark.h b/module/access/KPathSignMark.h index d017a9a..2d3b8fb 100644 --- a/module/access/KPathSignMark.h +++ b/module/access/KPathSignMark.h @@ -93,7 +93,7 @@ class KPathSignMark : public KMark } return ReturnWithRewriteParam(rq, np, KF_STATUS_REQ_TRUE); } - const char *getName() override { + const char *get_module() const override { return "path_sign"; } void get_html(KWStream& s) override { diff --git a/module/access/KRefererAcl.h b/module/access/KRefererAcl.h index 5e31a4b..526e935 100644 --- a/module/access/KRefererAcl.h +++ b/module/access/KRefererAcl.h @@ -82,7 +82,7 @@ class KRefererAcl : public KAcl } free(buf); } - const char* getName() override { + const char *get_module() const override { return "referer"; } void get_html(KWStream &s) override { diff --git a/module/access/KRegFileAcl.h b/module/access/KRegFileAcl.h index 8c78a18..2043fe3 100644 --- a/module/access/KRegFileAcl.h +++ b/module/access/KRegFileAcl.h @@ -45,7 +45,7 @@ class KRegFileAcl: public KAcl { KAcl *new_instance() override { return new KRegFileAcl(); } - const char *getName() override { + const char *get_module() const override { return "reg_file"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { @@ -97,7 +97,7 @@ class KRegFileNameAcl final: public KAcl { KAcl *new_instance() override { return new KRegFileNameAcl(); } - const char *getName() override { + const char *get_module() const override { return "reg_filename"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KRegPathAcl.h b/module/access/KRegPathAcl.h index e3438b9..02aaceb 100644 --- a/module/access/KRegPathAcl.h +++ b/module/access/KRegPathAcl.h @@ -51,7 +51,7 @@ class KRegPathAcl: public KAcl { KAcl *new_instance() override { return new KRegPathAcl(); } - const char *getName() override { + const char *get_module() const override { return "reg_path"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { @@ -120,7 +120,7 @@ class KRegParamAcl: public KAcl { KAcl *new_instance() override { return new KRegParamAcl(); } - const char *getName() override { + const char *get_module() const override { return "reg_param"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KResponseFlagMark.h b/module/access/KResponseFlagMark.h index ed70a19..e2750f7 100644 --- a/module/access/KResponseFlagMark.h +++ b/module/access/KResponseFlagMark.h @@ -108,7 +108,7 @@ class KResponseFlagMark : public KMark { KMark * new_instance() override { return new KResponseFlagMark(); } - const char *getName() override { + const char *get_module() const override { return "response_flag"; } private: @@ -164,7 +164,7 @@ class KExtendFlagMark : public KMark { KMark *new_instance() override { return new KExtendFlagMark(); } - const char *getName()override { + const char * get_module() const override { return "extend_flag"; } private: diff --git a/module/access/KRewriteMark.h b/module/access/KRewriteMark.h index 07e7165..0e0e549 100644 --- a/module/access/KRewriteMark.h +++ b/module/access/KRewriteMark.h @@ -33,7 +33,7 @@ class KRewriteMark: public KMark { virtual ~KRewriteMark(); uint32_t process(KHttpRequest* rq, KHttpObject* obj, KSafeSource& fo) override; KMark * new_instance()override; - const char *getName()override; + const char *get_module() const override; void get_display(KWStream& s) override; void get_html(KWStream& s) override; void parse_config(const khttpd::KXmlNodeBody* xml) override; diff --git a/module/access/KSSLSerialAcl.h b/module/access/KSSLSerialAcl.h index 0f706c1..fb00ca1 100644 --- a/module/access/KSSLSerialAcl.h +++ b/module/access/KSSLSerialAcl.h @@ -12,7 +12,7 @@ class KSSLSerialAcl: public KMultiAcl { KAcl *new_instance() override { return new KSSLSerialAcl(); } - const char *getName() override { + const char *get_module() const override { return "ssl_serial"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KSelfIpAcl.h b/module/access/KSelfIpAcl.h index dc45046..8444495 100644 --- a/module/access/KSelfIpAcl.h +++ b/module/access/KSelfIpAcl.h @@ -45,7 +45,7 @@ class KSelfIpAcl : public KIpAclBase { KAcl *new_instance() override { return new KSelfIpAcl(); } - const char *getName() override { + const char *get_module() const override { return "self"; } }; diff --git a/module/access/KSelfPortAcl.h b/module/access/KSelfPortAcl.h index 6c029b7..1d37dca 100644 --- a/module/access/KSelfPortAcl.h +++ b/module/access/KSelfPortAcl.h @@ -39,7 +39,7 @@ class KSelfPortAcl: public KAcl { KAcl *new_instance() override { return new KSelfPortAcl(); } - const char *getName() override { + const char *get_module() const override { return "self_port"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KSpeedLimitMark.h b/module/access/KSpeedLimitMark.h index a676b37..c20c05c 100644 --- a/module/access/KSpeedLimitMark.h +++ b/module/access/KSpeedLimitMark.h @@ -54,7 +54,7 @@ class KSpeedLimitMark : public KMark { KMark * new_instance()override { return new KSpeedLimitMark(); } - const char *getName()override { + const char* get_module() const override { return "speed_limit"; } private: diff --git a/module/access/KSrcAcl.h b/module/access/KSrcAcl.h index fa191e8..0ecd37d 100644 --- a/module/access/KSrcAcl.h +++ b/module/access/KSrcAcl.h @@ -40,7 +40,7 @@ class KSrcAcl : public KIpAclBase { KAcl *new_instance() override { return new KSrcAcl(); } - const char *getName() override { + const char * get_module() const override { return "src"; } }; diff --git a/module/access/KStubStatusMark.h b/module/access/KStubStatusMark.h index 8e992a1..15b4fd0 100644 --- a/module/access/KStubStatusMark.h +++ b/module/access/KStubStatusMark.h @@ -31,7 +31,7 @@ class KStubStatusMark: public KMark { { return new KStubStatusMark(); } - const char *getName() override + const char *get_module() const override { return "stub_status"; } diff --git a/module/access/KTimeAcl.h b/module/access/KTimeAcl.h index d760339..6e6397a 100644 --- a/module/access/KTimeAcl.h +++ b/module/access/KTimeAcl.h @@ -37,7 +37,7 @@ class KTimeAcl: public KAcl { KAcl *new_instance() override { return new KTimeAcl(); } - const char *getName() override { + const char *get_module() const override { return "time"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KTryFileAcl.h b/module/access/KTryFileAcl.h index 99510b8..b4e2052 100644 --- a/module/access/KTryFileAcl.h +++ b/module/access/KTryFileAcl.h @@ -28,7 +28,7 @@ class KTryFileAcl: public KAcl { KAcl *new_instance() override { return new KTryFileAcl(); } - const char *getName() override { + const char *get_module() const override { return "try_file"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/access/KUrlAcl.h b/module/access/KUrlAcl.h index 2e94895..b89664e 100644 --- a/module/access/KUrlAcl.h +++ b/module/access/KUrlAcl.h @@ -51,7 +51,7 @@ class KUrlAcl : public KAcl { KAcl *new_instance() override { return new KUrlAcl(); } - const char *getName() override { + const char *get_module() const override { return "url"; } bool match(KHttpRequest* rq, KHttpObject* obj) override { diff --git a/module/filter/param.cpp b/module/filter/param.cpp index 7bb5f7b..d44d26c 100644 --- a/module/filter/param.cpp +++ b/module/filter/param.cpp @@ -15,7 +15,7 @@ class KParamMark : public KParamFilterHook hit = 0; } - const char* getName() { + const char *get_module() const { return "param"; } void build_short(KWStream& s) { diff --git a/src/KAccess.cpp b/src/KAccess.cpp index 22d9d3e..fbde31d 100644 --- a/src/KAccess.cpp +++ b/src/KAccess.cpp @@ -213,7 +213,7 @@ bool KAccess::addAclModel(u_short type, KAcl* m, bool replace) { } return true; } - auto it = acl_factorys[type].find(m->getName()); + auto it = acl_factorys[type].find(m->get_module()); if (it != acl_factorys[type].end()) { if (!replace) { m->release(); @@ -222,7 +222,7 @@ bool KAccess::addAclModel(u_short type, KAcl* m, bool replace) { (*it).second->release(); acl_factorys[type].erase(it); } - acl_factorys[type].insert(std::pair(m->getName(), m)); + acl_factorys[type].insert(std::pair(m->get_module(), m)); return true; } @@ -234,7 +234,7 @@ bool KAccess::addMarkModel(u_short type, KMark* m, bool replace) { } return true; } - auto it = mark_factorys[type].find(m->getName()); + auto it = mark_factorys[type].find(m->get_module()); if (it != mark_factorys[type].end()) { if (!replace) { m->release(); @@ -243,7 +243,7 @@ bool KAccess::addMarkModel(u_short type, KMark* m, bool replace) { (*it).second->release(); mark_factorys[type].erase(it); } - mark_factorys[type].insert(std::pair(m->getName(), m)); + mark_factorys[type].insert(std::pair(m->get_module(), m)); return true; } void KAccess::loadModel() { @@ -801,11 +801,7 @@ int KAccess::get_module(KVirtualHostEvent* ctx, const KString& name, bool is_mar ctx->setStatus("not found"); return WHM_CALL_NOT_FOUND; } - KStringBuf s; - m->get_html(s); - sl->add("html", s.str()); - sl->add("refs", m->get_ref()); - sl->add("module", m->getName()); + m->dump(sl, false); return WHM_OK; } int KAccess::get_named_module(KVirtualHostEvent* ctx, const KString& name, bool is_mark) { @@ -827,11 +823,7 @@ int KAccess::get_named_module(KVirtualHostEvent* ctx, const KString& name, bool ctx->setStatus("not found"); return WHM_CALL_NOT_FOUND; } - KStringBuf s; - m->get_html(s); - sl->add("html", s.str()); - sl->add("refs", m->get_ref()); - sl->add("module", m->getName()); + m->dump(sl, false); return WHM_OK; } int KAccess::dump_available_named_module(KVirtualHostEvent* ctx, int type, bool only_public) { @@ -850,7 +842,7 @@ int KAccess::dump_available_named_module(KVirtualHostEvent* ctx, int type, bool } sl->add("name", (*it).first); auto m = (*it).second->get_module(); - sl->add("module", m->getName()); + sl->add("module", m->get_module()); } } else { for (auto it = named_marks.begin(); it != named_marks.end(); ++it) { @@ -863,7 +855,7 @@ int KAccess::dump_available_named_module(KVirtualHostEvent* ctx, int type, bool } sl->add("name", (*it).first); auto m = (*it).second->get_module(); - sl->add("module", m->getName()); + sl->add("module", m->get_module()); } } return WHM_OK; @@ -877,7 +869,7 @@ int KAccess::dump_named_module(KVirtualHostEvent* ctx, bool detail) { } sl->add("name", (*it).first); auto m = (*it).second->get_module(); - sl->add("module", m->getName()); + sl->add("module", m->get_module()); if (detail) { KStringBuf s; m->get_display(s); @@ -891,7 +883,7 @@ int KAccess::dump_named_module(KVirtualHostEvent* ctx, bool detail) { } sl->add("name", (*it).first); auto m = (*it).second->get_module(); - sl->add("module", m->getName()); + sl->add("module", m->get_module()); if (detail) { KStringBuf s; m->get_display(s); diff --git a/src/KAuthMark.cpp b/src/KAuthMark.cpp index 25640b0..47ab4f2 100644 --- a/src/KAuthMark.cpp +++ b/src/KAuthMark.cpp @@ -257,9 +257,6 @@ bool KAuthMark::loadAuthFile(KString&path) { KMark *KAuthMark::new_instance() { return new KAuthMark; } -const char *KAuthMark::getName() { - return "auth"; -} void KAuthMark::get_html(KWStream &s) { KAuthMark *acl = (KAuthMark *) this; s << "file: