Commit Graph
145 Commits
Author SHA1 Message Date
Mcat12 5937391020 Merge branch 'development' into new/IP-NODATA-AAAA-blocking
# Conflicts:
#	FTL.h
2018-05-27 11:17:30 -04:00
Mark Drobnak 94d25c5883 Merge branch 'development' into new/regex-lists 2018-05-25 18:18:09 -04:00
DL6ER 218e599dd1 Add dns_queries_all_types field to ">stats". While dns_queries is the number of entires in the query log (only A and AAAA queries), the new counter also takes PTR, SOA, etc. into account.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-25 09:22:07 +02:00
DL6ER a1cb443ce6 Add blocking mode IP-NODATA-AAAA
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-20 12:54:08 +02:00
DL6ER 7a1d037709 Remove obsolete variables
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-19 17:25:54 +02:00
DL6ER 79fb026278 Improve blocking regex implementation (block both A and AAAA requests, not only A)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-19 16:32:52 +02:00
DL6ER decef2e5fd Remove special support for old type of wildcard lists as dnsmasq config file
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-19 14:46:21 +02:00
DL6ER fd57e9f601 Add new BLOCKINGMODE "NULL" responding with "0.0.0.0" and "::" to A and AAAA queries, respectively
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-13 12:16:26 +02:00
DL6ER 5c38d32c60 Merge branch 'development' into ftldns/remove_old_debug_options
Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	args.c
2018-05-12 16:49:06 +02:00
DL6ER f28cc2b8fb Remove obsolete test singularity function
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-12 14:47:00 +02:00
DL6ER 599e27b324 Revert "No forking" 2018-05-12 14:39:44 +02:00
DL6ER 24b98093e8 Merge branch 'development' into ftldns/remove_old_debug_options
Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	args.c
2018-05-12 13:38:36 +02:00
DL6ER 64fc0c3e59 Merge pull request #274 from pi-hole/no-initial-forking
No forking
2018-05-12 13:12:50 +02:00
DL6ER c606ad75ab Remove undocumented, old, and unused debug commands
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-10 19:24:02 +02:00
DL6ER f6e4ec4230 Add blocked domains counter for individual clients
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-10 14:22:58 +02:00
DL6ER 0714bd6ed1 Don't go into background, just let this be handled by init (sys-V, systemd)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-08 18:02:18 +02:00
DL6ER e31d686d64 Implement method for having multiple regex + add timer output (to be removed after beta testing phase)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-25 11:43:15 +02:00
DL6ER 2f6e24045f Add regex blocking support
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-24 17:22:17 +02:00
DL6ER 6d82f29f09 Add BLOCKINGMODE=IP|NXDOMAIN config flag for selecting if FTLDNS should reply with IPv4/IPv6 addresses (need 2 cache slots per domain) or with NXDOMAIN (need 1 cache slot per domain)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-22 12:08:44 +02:00
DL6ER d50494b8f4 Get rid of numBlocked file, FTLDNS can now determine number of domains thanks to the new lists format
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-21 23:57:25 +02:00
DL6ER 821e64e514 Accept gravity.list and black.list in simple domain list format. Speeds up list importing by about 2x
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-21 23:26:44 +02:00
DL6ER 2e24b81557 Merge pull request #254 from pi-hole/FTLDNS-IGNORE_LOCALHOST
Add IGNORE_LOCALHOST config option
2018-04-14 11:44:51 +02:00
DL6ER efbe8025d0 Implement IGNORE_LOCALHOST config option
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-11 18:50:36 +02:00
DL6ER e2d0529993 Implement name resolving power back for FTLDNS. This re-implements lots of already extensively tested code that was present in pre-FTLDNS for over a year. This implementation is only slightly different by ensuring that name resolution is done in a specific non-blocking way.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-11 18:20:06 +02:00
DL6ER 3f92f3a543 Re-implement improved exception for queried CNAME requiring forwarding of A/AAAA record. Slighly improve GC subroutine
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-08 22:52:24 +02:00
DL6ER 9f940d82e0 Reduce memory footprint by removing unnecessry TTL value
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-06 23:52:07 +02:00
DL6ER dfc32a6204 Move reply type and dnssec status to per-query (not per-domain) for more accurate data at negligible additional costs
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-06 23:32:32 +02:00
DL6ER d2ad635fb1 Increase MAXCONNS from 40 to 255
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-04 12:19:17 +02:00
DL6ER be5e8fe63e Measure and store response time for individual queries
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-01 16:11:55 +02:00
DL6ER c5f34a4dea Use number of effectively blocked domains from /etc/pihole/numBlocked if available. Fall back to counting number of entries in preEventHorizon if this file is not found (e.g. updated gravity didn't run yet)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-30 21:02:25 +02:00
DL6ER 1c191dd2c2 Read number of blocked domains from preEventHorizon. Solves #246
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-30 19:54:17 +02:00
DL6ER e3f9685a8f Handle correctly that config is only read at initialization, whereas hosts files are read also on reload (SIGHUP)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-04 23:26:07 +01:00
DL6ER 2ae4b52bb3 A number of improvements:
- use "extern" for the glibal variable specifications in the header files (and clarif where the variables are actually defined)
- record number of failed requests to forward destinations
- Add dnsmasq_interface.h to DTLDEPS
- Add new request type ">cacheinfo" to get information about cache usage in the resolver

Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-26 17:24:09 +01:00
DL6ER f9405903c5 Fork only after DNS / DHCP ports have been bound to be able to pass such error messages to "service status", also don't allow users to start pihole-FTL as root (must be run with user pihole)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-24 15:27:09 +01:00
DL6ER ea3309e7b1 Initial commit for FTLDNS
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-22 20:21:06 +01:00
DL6ER ecde321632 Add custom macros for the memory-functions
- calloc,
- realloc,
- free, and
- strdup

These functions will not directly improve memory handling but they will log if something will go wrong *before* it actually goes wrong. This will ease debugging when user provide log snippets especially in ENOMEM (no memory available) situations.

Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-07 12:24:12 +01:00
DL6ER 99d27c4779 Merge branch 'development' into new/MAXLOGAGE
Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	parser.c
2018-01-22 10:14:54 +01:00
DL6ER 6ccd43c648 Merge pull request #211 from pi-hole/tweak/no_pihole.log.1
Don't read pihole.log.1
2018-01-22 08:01:13 +01:00
Mcat12 590f1f97f7 Merge remote-tracking branch 'origin/development' into new/API
# Conflicts:
#	FTL.h
#	socket.c
2018-01-21 09:48:41 -05:00
DL6ER bfd3f1405d Add "MAXLOGAGE" config option
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-21 15:13:50 +01:00
DL6ER 6da7c01f42 Remove "TIMEFRAME" option
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-21 14:57:04 +01:00
DL6ER 1ca920310e Don't read pihole.log.1 to enhance startup speed of FTL
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-21 14:41:22 +01:00
DL6ER d12726a01b Only listen on IPv4 and IPv6 telnet sockets if we successfully bound to the corresponding port
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-21 14:01:22 +01:00
DL6ER df3b049ede Remove clientips[]
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-20 21:41:12 +01:00
DL6ER 0aee819dc2 Implement some of the review comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-20 21:38:24 +01:00
Mcat12 232507a51e Merge remote-tracking branch 'origin/development' into new/API 2018-01-20 11:21:36 -05:00
DL6ER b58731d9f3 Import queries from long-term database (if available) on startup of FTL. Fall back to log interpretation if database is not available
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-20 14:03:41 +01:00
DL6ER 4977497c68 Move MAGICBYTE into FTL.h to have it available everywhere (we will need it in database.c)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-20 11:01:04 +01:00
DL6ER 5704d72c1d Add timers
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-15 23:13:12 +01:00
DL6ER 6ae42424ee Add timers to FTL and measure time needed to save queries in database (only when running in debug mode)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-15 17:20:21 +01:00