recheck domain before adding to autohostlist

nfq/desync.c

@@ -225,16 +225,25 @@ static void auto_hostlist_failed(const char *hostname)
 	{
 		DLOG("auto hostlist : fail threshold reached. adding %s to auto hostlist\n", hostname);
 		HostFailPoolDel(&params.hostlist_auto_fail_counters, fail_counter);
-		if (!StrPoolAddStr(&params.hostlist, hostname))
+		
+		DLOG("auto hostlist : rechecking %s to avoid duplicates\n", hostname);
+		bool bExcluded=false;
+		if (!HostlistCheck(params.hostlist, params.hostlist_exclude, hostname, &bExcluded) && !bExcluded)
 		{
-			fprintf(stderr, "StrPoolAddStr out of memory\n");
-			return;
-		}
-		if (!append_to_list_file(params.hostlist_auto_filename, hostname))
-		{
-			perror("write to auto hostlist:");
-			return;
+			DLOG("auto hostlist : adding %s\n", hostname);
+			if (!StrPoolAddStr(&params.hostlist, hostname))
+			{
+				fprintf(stderr, "StrPoolAddStr out of memory\n");
+				return;
+			}
+			if (!append_to_list_file(params.hostlist_auto_filename, hostname))
+			{
+				perror("write to auto hostlist:");
+				return;
+			}
 		}
+		else
+			DLOG("auto hostlist : NOT adding %s\n", hostname);
 	}
 }
 

nfq/pools.c

@@ -76,6 +76,7 @@ hostfail_pool * HostFailPoolAdd(hostfail_pool **pp,const char *s,int fail_time)
 	size_t slen = strlen(s);
 	ADD_STR_POOL(hostfail_pool, pp, s, slen)
 	elem->expire = time(NULL) + fail_time;
+	elem->counter = 0;
 	return elem;
 }
 hostfail_pool *HostFailPoolFind(hostfail_pool *p,const char *s)

tpws/pools.c

@@ -76,6 +76,7 @@ hostfail_pool * HostFailPoolAdd(hostfail_pool **pp,const char *s,int fail_time)
 	size_t slen = strlen(s);
 	ADD_STR_POOL(hostfail_pool, pp, s, slen)
 	elem->expire = time(NULL) + fail_time;
+	elem->counter = 0;
 	return elem;
 }
 hostfail_pool *HostFailPoolFind(hostfail_pool *p,const char *s)

tpws/tamper.c

@@ -303,16 +303,25 @@ static void auto_hostlist_failed(const char *hostname)
 	{
 		VPRINT("auto hostlist : fail threshold reached. adding %s to auto hostlist", hostname);
 		HostFailPoolDel(&params.hostlist_auto_fail_counters, fail_counter);
-		if (!StrPoolAddStr(&params.hostlist, hostname))
-		{
-			fprintf(stderr, "StrPoolAddStr out of memory\n");
-			return;
-		}
-		if (!append_to_list_file(params.hostlist_auto_filename, hostname))
+		
+		VPRINT("auto hostlist : rechecking %s to avoid duplicates", hostname);
+		bool bExcluded=false;
+		if (!HostlistCheck(params.hostlist, params.hostlist_exclude, hostname, &bExcluded) && !bExcluded)
 		{
-			perror("write to auto hostlist:");
-			return;
+			VPRINT("auto hostlist : adding %s", hostname);
+			if (!StrPoolAddStr(&params.hostlist, hostname))
+			{
+				fprintf(stderr, "StrPoolAddStr out of memory\n");
+				return;
+			}
+			if (!append_to_list_file(params.hostlist_auto_filename, hostname))
+			{
+				perror("write to auto hostlist:");
+				return;
+			}
 		}
+		else
+			VPRINT("auto hostlist: NOT adding %s", hostname);
 	}
 }