fix: remove all dnsmasq operation

Signed-off-by: Dengfeng Liu <[email protected]>
liudf0716 · Jun 12, 2024 · 871265a · 871265a
1 parent 0fb4432
commit 871265a
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 50 deletions.
diff --git a/src/fw_iptables.c b/src/fw_iptables.c
@@ -487,52 +487,11 @@ iptables_fw_set_user_domains_trusted(void)
 void
 iptables_fw_clear_ipset_domains_trusted(void)
 {
-#ifdef AW_FW3
-	char f_ipset_name[128] = {0};
-	snprintf(f_ipset_name, 128, "%s/%s", DNSMASQ_CONF_D, CHAIN_IPSET_TDOMAIN);
-
-	remove(f_ipset_name);
-	iptables_flush_ipset(CHAIN_IPSET_TDOMAIN);
-#else
-#endif
 }
 
 void
 iptables_fw_set_ipset_domains_trusted(void)
 {
-#ifdef AW_FW3
-	const s_config *config;
-	t_domain_trusted *domain_trusted = NULL;
-	FILE *fd_ipset = NULL;
-	char f_ipset_name[128] = {0};
-	int  has_content = 0;
-
-	config = config_get_config();
-
-	mkdir(DNSMASQ_CONF_D, S_IRWXU|S_IRWXG|S_IRWXO);
-	snprintf(f_ipset_name, 128, "%s/%s", DNSMASQ_CONF_D, CHAIN_IPSET_TDOMAIN);
-	fd_ipset = fopen(f_ipset_name, "w");
-	if(fd_ipset == NULL) {
-		return;
-	}
-
-	LOCK_DOMAIN();
-
-	for (domain_trusted = config->pan_domains_trusted; domain_trusted != NULL; domain_trusted = domain_trusted->next) {
-		has_content = 1;
-		fprintf(fd_ipset, "ipset=/.%s/%s\n", domain_trusted->domain, CHAIN_IPSET_TDOMAIN);
-	}
-
-	UNLOCK_DOMAIN();
-
-	fclose(fd_ipset);
-
-	if(!has_content)
-		remove(f_ipset_name);
-
-	iptables_flush_ipset(CHAIN_IPSET_TDOMAIN);
-#else
-#endif
 }
 
 void

diff --git a/src/fw_iptables.h b/src/fw_iptables.h
@@ -37,7 +37,6 @@
 #define CHAIN_TO_INTERNET "WiFiDog_$ID$_Internet"
 #define CHAIN_INCOMING  "WiFiDog_$ID$_Incoming"
 #define CHAIN_AUTHSERVERS "WiFiDog_$ID$_AuthServers"
-#define	DNSMASQ_CONF_D	"/tmp/dnsmasq.d"
 #define CHAIN_IPSET_TDOMAIN	"WiFiDog_IPSET_TDomains"
 #define CHAIN_DOMAIN_TRUSTED "WiFiDog_$ID$_TDomains"
 #define CHAIN_INNER_DOMAIN_TRUSTED "WiFiDog_$ID$_ITDomains"

diff --git a/src/ping_thread.c b/src/ping_thread.c
@@ -61,7 +61,6 @@ static void fw_init_delay()
 	parse_user_trusted_domain_list();
 
 	fw_set_pan_domains_trusted();	
-	execute("/etc/init.d/dnsmasq restart", 0);
 	fw_set_trusted_maclist();
 }
 

diff --git a/src/wdctl.c b/src/wdctl.c
@@ -303,7 +303,6 @@ display_help() {
     printf("wdctlx help|?\n");
     printf("wdctlx stop\n");
     printf("wdctlx reset\n");
-    printf("wdctlx demo\n");
     printf("wdctlx status\n");
 }
 

diff --git a/src/wdctl_thread.c b/src/wdctl_thread.c
@@ -286,8 +286,6 @@ static void
 wdctl_add_trusted_pan_domains(struct bufferevent *fd, const char *arg)
 {
     add_trusted_pdomains(arg);
-    char *post_cmd = "CMD[/etc/init.d/dnsmasq restart]";
-    bufferevent_write(fd, post_cmd, strlen(post_cmd));
 }
 
 void 
@@ -303,8 +301,6 @@ static void
 wdctl_del_trusted_pan_domains(struct bufferevent *fd, const char *arg)
 {
     del_trusted_pdomains(arg);
-    char *post_cmd = "CMD[/etc/init.d/dnsmasq restart]";
-    bufferevent_write(fd, post_cmd, strlen(post_cmd));
 }
 
 void 
@@ -318,8 +314,6 @@ static void
 wdctl_clear_trusted_pan_domains(struct bufferevent *fd)
 {
 	clear_trusted_pdomains();
-    char *post_cmd = "CMD[/etc/init.d/dnsmasq restart]";
-    bufferevent_write(fd, post_cmd, strlen(post_cmd));
 }
 
 char *