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
594 Commits 20 Branches 106 Tags
2ac17c9516ea8953f9c2bdf45b2e6b00a80b4e34
Commit Graph
594 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DL6ER 2ac17c9516 Merge pull request #184 from pi-hole/fix/db_locking 
Close database file after initialization
 2017-12-30 23:15:48 +01:00
DL6ER d0968c68aa Close database after initial check so we dont keep it open forever and hence lock it. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-30 22:34:20 +01:00
DL6ER d611c3a770 Merge pull request #183 from pi-hole/fix/reply_interpretation 
Skip replies for queries that have already been answered
 2017-12-29 02:32:29 +01:00
DL6ER 0b1175ec60 Skip this entry if we already found th reply for this forwarded query before 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-29 00:51:07 +01:00
DL6ER f026a885dd Remove two int we are not using at all 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-28 23:46:41 +01:00
DL6ER 21e60e3f9a Merge pull request #174 from pi-hole/new/extra-logging 
Handle dnsmasq "extra" logging
 2017-12-28 22:44:01 +01:00
DL6ER d669a65067 Compare age of query against current time to decide if we should give a query more time to get completed 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-28 21:02:10 +01:00
DL6ER dbc9457708 Worked on review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-28 20:48:29 +01:00
DL6ER 3346a84d1b Add global counters for types of replies (and properly GC them) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-28 20:43:47 +01:00
DL6ER d087434e8b Merge pull request #182 from pi-hole/master 
Merge latest changes into development
 2017-12-28 20:38:19 +01:00
Dan Schaper 1e45569390 Merge pull request #181 from pi-hole/release/v2.13.1 
Pi-hole FTL v2.13.1
v2.13.1 		2017-12-28 07:44:48 -08:00
DL6ER 8352566b77 Merge pull request #178 from pi-hole/tweak/wildcard_auditing 
Wildcard auditing
 2017-12-27 23:09:06 +01:00
DL6ER 7cbf68f0b6 Output correct counters in log_counter_info() (this has always been wrong but nobody noticed it) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-27 13:25:11 +01:00
DL6ER 13b89c72af Save reply type in query struct (can be used somewhere later on) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-27 00:52:36 +01:00
DL6ER 372dbca40a Update comment and use correct string for strlen() 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-27 00:35:38 +01:00
DL6ER bc3d1f1c2e Makes sure wildcard matching is unambigious 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-27 00:30:43 +01:00
DL6ER 7425c1d700 Continue if exact match was found 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-27 00:23:37 +01:00
DL6ER e5e7ff729d Remove debugging output 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-27 00:23:10 +01:00
DL6ER dac50b19a9 Add parsing for "reply ... is ..." lines 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-27 00:20:25 +01:00
DL6ER 95a9c548e5 Merge pull request #179 from pi-hole/fix/help-arg 
Add --help
 2017-12-25 11:47:40 +01:00
Mcat12 fc942428c3 Add support for --help 
It's referenced in the usage, but was never actually added as an alias.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2017-12-24 16:22:49 -05:00
DL6ER a940e4089b Use short circuit evolution to shorten statement 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 22:00:26 +01:00
DL6ER 91047f97f1 Accept "*domain.tld" as wildcard audit entry 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 21:54:40 +01:00
Mark Drobnak 2984ae452b Merge pull request #177 from pi-hole/fix/no_branch 
Fix for "(no branch)" output
 2017-12-23 11:24:58 -05:00
DL6ER 12a46e5ccf Apply the same idea in the telnet request 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 12:04:41 +01:00
DL6ER cdfa4d82d6 Travis CI pulls on a tag basis, not by branch. Fix the returned branch if we find that the binary was build on "(no branch)" but is properly tagged. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 11:59:41 +01:00
DL6ER dc0788c766 Merge branch 'development' into new/extra-logging 2017-12-22 22:15:45 +01:00
DL6ER 6e45302ede Merge pull request #176 from pi-hole/master 
Sync with development branch
 2017-12-22 22:13:05 +01:00
Jacob Salmela 07b1275e53 Merge pull request #173 from pi-hole/release/v2.13 
Pi-hole FTL v2.13
v2.13 		2017-12-22 14:37:30 -06:00
DL6ER 8035d9f5a4 Save only complete queries into the database 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-22 12:31:08 +01:00
DL6ER 3d0fc44ed4 Further reduction of code duplication in the parser routine 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-22 12:16:33 +01:00
DL6ER 54fcfb4937 Merge pull request #175 from pi-hole/fix/README.md 
Fix README.md
 2017-12-22 00:44:06 +01:00
DL6ER 62fd39cede Fix README.md 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 22:37:58 +01:00
DL6ER f416fa5928 Add the concept of log generations to account for UUIDs that are not very unique 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 16:33:05 +01:00
DL6ER 86393d50fe Skip lines without UUID 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 16:21:12 +01:00
DL6ER b61d035807 Update tests with new log format 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 16:15:34 +01:00
DL6ER f935312de5 Don't reuse i as counting index where we need it as query ID 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 16:05:48 +01:00
DL6ER 478568e1ee Extend the new debug command a little bit 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 15:54:52 +01:00
DL6ER 24e4f6f8a9 Display counter information after re-reading the log file (received SIGHUP) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 15:48:04 +01:00
DL6ER 541d86bc74 Add (undocumented) debugging command over telnet (display unknown queries) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 15:45:42 +01:00
DL6ER 99506f0407 Have to actually break out of the loops for i to be the queryID 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 15:37:28 +01:00
DL6ER d276e3b20e Handle exactly blocked queries (blocked by black.list) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 15:21:24 +01:00
DL6ER 538e5a3156 Handle wildcard blocked domains correctly 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 15:19:35 +01:00
DL6ER 413dd41717 List files like gravity.list, local.list, and hostname.list have to have a path + removed some debugging output 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 15:10:26 +01:00
DL6ER 678e755e95 Properly update time index 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 15:06:18 +01:00
DL6ER 9c49155da6 Change the logic FTL uses to treat the counters 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 15:01:49 +01:00
DL6ER a20eb2d8da Initialize query status with 0 (unknown) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 14:54:14 +01:00
DL6ER 468da59bae Added proper analysis for "cached" lines + outsourced the timestamp detection into its own subroutine to avoid large repitions of code. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 14:52:39 +01:00
DL6ER 90494ec649 Modify parser to understand "query" lines with IDs 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 14:23:59 +01:00
DL6ER c86e8d9f83 Extract dnsmasq's ID from the logged queries 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 14:17:16 +01:00