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
900 Commits 20 Branches 106 Tags
c4f491d5ae2e2e6b8a1cbeee9e7a506ddeaaf3da
Commit Graph

900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DL6ER c4f491d5ae Fix missing information bug in findCLientID() 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-24 00:45:14 +01:00
Mark Drobnak 2f473b80ea Merge pull request #215 from pi-hole/update/sqlite3.22.0 
Update SQLite3 from 3.21.0 to 3.22.0
 2018-01-22 16:50:52 -05:00
DL6ER 066925737a Update SQLite3 from 3.21.0 to 3.22.0 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-22 22:02:29 +01:00
DL6ER 77827b4c34 Merge pull request #212 from pi-hole/new/MAXLOGAGE 
Add "MAXLOGAGE" config option
 2018-01-22 20:51:04 +01:00
Mark Drobnak 3b22cccfc3 Merge pull request #214 from pi-hole/fix/negative_unknown 
Mark queries we mark as not completed again as unknown
 2018-01-22 14:47:17 -05:00
DL6ER 1d1ac54086 Mark queries we mark not completes again as unknown so they are counted correctly later in the code. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-22 18:18:49 +01:00
DL6ER 2624012ca0 Add to README that maximum is 31 days 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-22 10:16:15 +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
Mark Drobnak fc0ef14363 Merge pull request #75 from pi-hole/new/API 
Use MessagePack for the Unix socket API
 2018-01-21 17:45:36 -05:00
Mcat12 5341b18ecf Handle possible pack_fixstr or pack_str32 error 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-21 15:40:58 -05:00
Mcat12 9bc056248f Use a static buffer for getallqueries string arguments 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-21 15:02:41 -05:00
DL6ER 7955b770c4 Merge pull request #213 from pi-hole/tweak/ANY 
Skip ANY entries, log that we have seen them if in debug mode
 2018-01-21 20:00:46 +01:00
Mcat12 b6b7b5708b Only allow up to 2GB strings to be sent 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-21 12:46:46 -05:00
Mcat12 42bf9a4c6f Fix status output in getStats 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-21 11:37:37 -05:00
DL6ER 09334d11b9 Skip ANY entries, log that we have seen them if in debug mode 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-21 17:08:45 +01:00
Mcat12 9007af7dbb Fix under-allocation in getVersion 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-21 10:54:59 -05:00
Mcat12 be5815fbda Use float instead of double in getQueryTypesOverTime 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-21 10:54:21 -05:00
Mcat12 4e8027b74d Use float instead of double in getForwardDestinationsOverTime 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-21 10:53:29 -05:00
Mcat12 ad99f975fe Fix under-allocation in getTopDomains 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-21 10:43:03 -05:00
Mcat12 76aff45eb5 Clarify getOverTime comment 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-21 10:41:23 -05:00
Mcat12 173efff918 Don't use buffers in getStats 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-21 10:38:34 -05: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 a06d929bf0 Merge pull request #210 from pi-hole/fix/check_sockets 
Only listen on IPv4 and IPv6 telnet sockets if we successfully bound to the corresponding port
 2018-01-21 14:18:30 +01:00
DL6ER 8a7d1c4303 Merge pull request #209 from pi-hole/fix/database-forwardID 
Validate database entries on import
 2018-01-21 14:09:22 +01:00
DL6ER fdf7b5aca6 Merge branch 'fix/database-forwardID' into fix/check_sockets 2018-01-21 14:09:02 +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 72ad1970c1 Also try to import data from database after flushing event 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-21 11:42:01 +01:00
DL6ER 446bd677f7 Validate all imported database fields 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-21 11:24:35 +01:00
Mcat12 9f5ae62423 Fix indentation in msgpack.c 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-20 21:40:41 -05:00
Mcat12 587ec590f8 forwardID can be null, so check for that (don't segfault!) 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-20 20:28:20 -05:00
DL6ER 996689fb45 Remove sleep from main() 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-20 21:42:00 +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
DL6ER 9fda0e6ae8 Merge pull request #208 from pi-hole/new/loadFromDB 
Import data from long-term database
 2018-01-20 20:59:07 +01:00
DL6ER 5fcae6664c Added missing free() and removed redundant code 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-20 19:47:49 +01:00
Mcat12 232507a51e Merge remote-tracking branch 'origin/development' into new/API 2018-01-20 11:21:36 -05:00
Mcat12 1fd7ade5fe Add back detailed ssend error message 
Might have been lost in a merge.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-20 11:19:09 -05:00
Mcat12 7c57b86443 Reword api.h license description header 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-20 11:14:42 -05:00
Mcat12 cf0cdfed7d Reword api.c license header description 
Removed reference to the HTTP API.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-20 11:11:52 -05:00
DL6ER 7c10244e4d Another small tweak for the test suite 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-20 15:21:16 +01:00
DL6ER 933bc52237 Fix tests due to corrected counting of forward destinations 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-20 15:18:33 +01:00
DL6ER bc77d6e67a Ensure that only the first forward destination a query is sent to gets counted 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-20 15:00:03 +01:00
DL6ER 2443b231e1 Detect if we cached the <CNAME> but still need to ask the upstream servers for the actual IPs. In think case we have to decrease the "cached" counter 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-20 14:38:45 +01:00
DL6ER 0f07c9e553 Remove unnecessarily duplicated validate_access() calls 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-20 14:07:32 +01: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