rename KModel::getName to get_module

keengo99 · Jan 16, 2025 · 6197308 · 6197308
1 parent ab7e2a5
commit 6197308
Show file tree

Hide file tree

Showing 87 changed files with 122 additions and 140 deletions.
diff --git 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
@@ -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
@@ -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
@@ -95,7 +95,7 @@ class KChain final
 	void getModelHtml(KModelPtr<T> &ptr, KWStream& s, int type, int index) {
 		s << "<tr><td><input type=hidden name='begin_sub_form' value='"
 			<< (type == 0 ? "acl_"_CS : "mark_"_CS)
-			<< ptr.m->getName() << "'>";
+			<< ptr.m->get_module() << "'>";
 		s << "[<a href=\"javascript:delmodel('" << index << "'," << type << ");\">del</a>]";
 		if (ptr.named.empty()) {
 			s << "<input type = checkbox name = 'or' value = '1' ";
@@ -108,7 +108,7 @@ class KChain final
 				s << "checked";
 			}
 			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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -35,13 +35,10 @@ using KSafeSource = std::unique_ptr<KFetchObject>;
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);