Commit Graph
1103 Commits
Author SHA1 Message Date
DL6ER 79e63dd63e Merge branch 'development' into new/regex-lists 2018-05-27 10:37:15 +02:00
DL6ER fcfd16c51b Merge pull request #292 from pi-hole/tweak/makefile-pie
Change `-Wl,-pie` to `-pie`
2018-05-27 09:16:27 +02:00
Mark Drobnak a662c6dadd Change -Wl,-pie to -pie
Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
2018-05-26 17:38:12 -04:00
DL6ER d52482168a Switch to compiling on GNU-C11 standard. According to https://gcc.gnu.org/onlinedocs/gcc-4.9.1/gcc/C-Dialect-Options.html#C-Dialect-Options this dialect will become standard in a future gcc.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-26 23:12:12 +02:00
DL6ER d3e9365f53 Remove obsolete readGravityFiles() funtion
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-26 19:24:34 +02:00
DL6ER a5f31c2d67 Pass has_IPv4/6 as bool (and not bool*) to add_blocked_domain_cache()
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-26 12:08:28 +02:00
DL6ER 556993ca5a Replace while() continue; by if() continue; for the sake of readability (there really is no need for a while() loop being used here)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-26 12:01:44 +02:00
Mark Drobnak 94d25c5883 Merge branch 'development' into new/regex-lists 2018-05-25 18:18:09 -04:00
Mark Drobnak edd0894a0f Merge pull request #291 from pi-hole/tweak/stats/dns_queries_all_types
Add dns_queries_all_types field to ">stats"
2018-05-25 18:01:24 -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 9b5eb62263 Don't set regex status for domains read from database as we don't add them to the resolvers cache here (performance reasons)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-19 17:40:34 +02:00
DL6ER 7e31c8e797 Remove debug print statement
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-19 17:27:44 +02:00
DL6ER 7a1d037709 Remove obsolete variables
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-19 17:25:54 +02:00
DL6ER b6dd8ec47f Implement reading regex from file
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-19 17:21:56 +02:00
DL6ER a783798575 Simplify cache handling routines (remove all code duplication) + ensure that regex blocked entries follow the user defined blocking mode (previously, they always returned NXDOMAIN)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-19 16:58:41 +02:00
DL6ER db7dbda9da Use status == QUERY_WILDCARD to identify regex blocked queries
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-19 16:37:25 +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 d69887256f Merge pull request #282 from pi-hole/new/reread_BLOCKINGMODE_on_SIGHUP
Improve BLOCKINGMODE config setting
2018-05-14 23:42:09 +02:00
DL6ER 325ba2df83 Merge pull request #283 from pi-hole/fix/listsparser_negative_count
Fix negative display of read domains
2018-05-14 22:50:54 +02:00
DL6ER 167f8c2793 Fix negative display of read domains
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-13 17:54:55 +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 50e4f57f08 Re-parse BLOCKINGMODE on receive of SIGHUP for being able to change it without a full restart of pihole-FTL
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-13 12:04:42 +02:00
DL6ER 4e478dbf81 Make parse_FTLconf() static as we use it only in one c file
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-13 11:45:44 +02:00
DL6ER 0da3046566 Outsource BLOCKINGMODE determination into its won function get_blocking_mode()
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-13 11:44:33 +02:00
DL6ER df800f124a Merge pull request #278 from pi-hole/new/SIGSEGV_backtrace
Include backtrace on SIGSEGV
2018-05-13 01:29:34 +02:00
Mark Drobnak 99ad8924ee Merge pull request #276 from pi-hole/ftldns/remove_old_debug_options
Remove undocumented, old, and unused debug commands
2018-05-12 15:36:48 -04: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 d5e57f0cef Merge pull request #281 from pi-hole/revert-274-no-initial-forking
Revert "No forking"
2018-05-12 16:24:29 +02:00
DL6ER df9d119810 Merge pull request #277 from pi-hole/fix/wildcard_warning
Suppress wrong warning
2018-05-12 15:58:12 +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 d2c14b0a71 Remove unneeded variable sockID
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-12 13:12:26 +02:00
DL6ER 5d2ed0a5a6 Remove database debug callback
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-12 13:07:03 +02:00
DL6ER 870560e6a7 Adjust spacing and remove unneccesary newline
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-11 17:09:15 +02:00
DL6ER 496741ce99 Generate and log simple backtrace on SIGSEGV, although much less powerful than inside the debugger (e.g., it cannot give precise line numbers) it should at least be able to show in which function the crash happened
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-11 17:03:57 +02:00
DL6ER c71cb022f7 Return early if no wildcard domains are defined to avoid warning to be printed although for-loop will anyhow be skipped
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-11 16:48:27 +02:00
DL6ER 51fae2c4ce Merge pull request #275 from pi-hole/new/more_per_client_details
Add blocked per client counter
2018-05-11 16:41:15 +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 cfece8d9f9 Remove debug statement
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-10 14:38:35 +02:00
DL6ER db2e0d9361 Implement API changed to add new option (e.g. ">top-clients blocked withzero (20)")
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-10 14:37:39 +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 b3a0e12252 Merge pull request #273 from pi-hole/ftldns/clean_README
Clean README of this repo
2018-05-08 18:06:38 +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 3448f06842 Clean README (remove everything we describe now in the official documentation)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-05 23:23:17 +02:00
DL6ER dc854bcb2c Merge pull request #272 from pi-hole/new/analyzeTCP
Analyze incoming TCP queries
2018-05-04 19:19:53 +02:00
DL6ER ff35a43b12 Analyze incoming TCP queries. There have been no hooks here as TCP queries are handled in a different part of the resolver (as the resolver forks itself for handling TCP queries to not block)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-04 16:41:29 +02:00
DL6ER a198daa015 Merge pull request #271 from pi-hole/tweak/anyuser
Allow starting FTLDNS as any user
2018-05-03 20:31:32 +02:00