pi-hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2024-10-26 16:52:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Interpret black.list (status 5)

Browse Source
This commit is contained in:
DL6ER
2017-06-17 14:08:45 +02:00
parent 63dd3956e7
commit 73734596eb
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gc.c
+8
View File
@@ -83,6 +83,14 @@ void *GC_thread(void *val)
validate_access("domains", queries[i].domainID, true, __LINE__, __FUNCTION__, __FILE__);
domains[queries[i].domainID].blockedcount--;
break;
case 5:
// Blocked by user's black list
counters.blocked--;
validate_access("overTime", queries[i].timeidx, true, __LINE__, __FUNCTION__, __FILE__);
overTime[queries[i].timeidx].blocked--;
validate_access("domains", queries[i].domainID, true, __LINE__, __FUNCTION__, __FILE__);
domains[queries[i].domainID].blockedcount--;
break;
default:
/* That cannot happen */
break;
parser.c
+16
View File
@@ -331,6 +331,7 @@ void process_pihole_log(int file)
// - "gravity.list" + domain
// - "forwarded" + domain
// - "cached" + domain
// - "black.list" + domain
// in the following up to 200 lines
bool firsttime = true;
int forwardID = -1;
@@ -374,6 +375,12 @@ void process_pihole_log(int file)
status = detectStatus(domain);
break;
}
// Blocked by black.list ?
else if(strstr(readbuffer2,"black.list ") != NULL)
{
status = 5;
break;
}
}
}
else
@@ -520,8 +527,17 @@ void process_pihole_log(int file)
domains[domainID].blockedcount++;
domains[domainID].wildcard = true;
break;
case 5:
// Blocked by user's black list
counters.blocked++;
validate_access("overTime", timeidx, true, __LINE__, __FUNCTION__, __FILE__);
overTime[timeidx].blocked++;
validate_access("domains", domainID, true, __LINE__, __FUNCTION__, __FILE__);
domains[domainID].blockedcount++;
break;
default:
/* That cannot happen */
logg("Found unexpected status %i",status);
break;
}