Github
/
FTL
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mention how many host lines we have written in custom.list 

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2023-01-30 19:23:01 +01:00
parent 50e951b216
commit 9f969984e2
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/config/dnsmasq_config.c
View File

@ -712,46 +712,54 @@ bool write_custom_list(void)
rotate_files(DNSMASQ_CUSTOM_LIST);
log_debug(DEBUG_CONFIG, "Opening "DNSMASQ_CUSTOM_LIST" for writing");
FILE *pihole_conf = fopen(DNSMASQ_CUSTOM_LIST, "w");
FILE *custom_list = fopen(DNSMASQ_CUSTOM_LIST, "w");
// Return early if opening failed
if(!pihole_conf)
if(!custom_list)
{
log_err("Cannot open "DNSMASQ_CUSTOM_LIST" for writing, unable to update custom.list: %s", strerror(errno));
return false;
}
// Lock file, may block if the file is currently opened
if(flock(fileno(pihole_conf), LOCK_EX) != 0)
if(flock(fileno(custom_list), LOCK_EX) != 0)
{
log_err("Cannot open "DNSMASQ_CUSTOM_LIST" in exclusive mode: %s", strerror(errno));
fclose(pihole_conf);
fclose(custom_list);
return false;
}
write_config_header(pihole_conf, "Custom DNS entries (HOSTS file)");
write_config_header(custom_list, "Custom DNS entries (HOSTS file)");
fputc('\n', custom_list);
if(cJSON_GetArraySize(config.dns.hosts.v.json) > 0)
const int N = cJSON_GetArraySize(config.dns.hosts.v.json);
if(N > 0)
{
const int n = cJSON_GetArraySize(config.dns.hosts.v.json);
for(int i = 0; i < n; i++)
for(int i = 0; i < N; i++)
{
cJSON *entry = cJSON_GetArrayItem(config.dns.hosts.v.json, i);
if(entry != NULL && cJSON_IsString(entry))
fprintf(pihole_conf, "%s\n", entry->valuestring);
fprintf(custom_list, "%s\n", entry->valuestring);
}
fputs("\n", pihole_conf);
fputc('\n', custom_list);
}
if(N == 1)
fprintf(custom_list, "\n# There is %d entry in this file\n", N);
else if(N > 1)
fprintf(custom_list, "\n# There are %d entries in this file\n", N);
else if(N == 0)
fputs("\n# There are currently no entries in this file\n", custom_list);
// Unlock file
if(flock(fileno(pihole_conf), LOCK_UN) != 0)
if(flock(fileno(custom_list), LOCK_UN) != 0)
{
log_err("Cannot release lock on custom.list: %s", strerror(errno));
fclose(pihole_conf);
fclose(custom_list);
return false;
}
// Close file
if(fclose(pihole_conf) != 0)
if(fclose(custom_list) != 0)
{
log_err("Cannot close custom.list: %s", strerror(errno));
return false;

6
test/test_suite.bats
View File

@ -500,16 +500,16 @@
@test "Compiled deny regex as expected" {
run bash -c 'grep -c "Compiling deny regex 0 (DB ID 6): regex\[0-9\].ftl" /var/log/pihole/FTL.log'
printf "%s\n" "${lines[@]}"
[[ ${lines[0]} == "1" ]]
[[ ${lines[0]} == "2" ]]
}
@test "Compiled allow regex as expected" {
run bash -c 'grep -c "Compiling allow regex 0 (DB ID 3): regex2" /var/log/pihole/FTL.log'
printf "%s\n" "${lines[@]}"
[[ ${lines[0]} == "1" ]]
[[ ${lines[0]} == "2" ]]
run bash -c 'grep -c "Compiling allow regex 1 (DB ID 4): ^gravity-allowed" /var/log/pihole/FTL.log'
printf "%s\n" "${lines[@]}"
[[ ${lines[0]} == "1" ]]
[[ ${lines[0]} == "2" ]]
}
@test "Regex Test 1: \"regex7.ftl\" vs. [database regex]: MATCH" {