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
1,120 Commits 20 Branches 106 Tags
d06decad80098befd4686d237402bd36fe1118fe
Commit Graph
1120 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mcat12 1983d3d116 Rename api_stats.c to api.c 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-12 14:55:58 -05:00
Mcat12 071f924f70 Remove the rest of the DNS commands and unused helpers 
They now live in the API

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-12 14:55:24 -05:00
DL6ER bb7bf43421 Merge pull request #180 from pi-hole/new/IPv6support 
Add dual-stack socket support for FTL
 2018-01-12 19:15:40 +01:00
Mcat12 cf2aff7b16 Remove addList 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-11 22:20:43 -05:00
Mcat12 3158f17701 Remove getPiholeStatus 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-11 20:46:25 -05:00
DL6ER 5df4ea3cdd Remove obsolete comment 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-11 23:19:02 +01:00
Mcat12 7d877223f4 Remove getList 
Most DNS endpoints will be implemented in the API to keep FTL focused
on providing stats.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-11 16:54:36 -05:00
DL6ER 51b645a01a Incorporate review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-11 21:01:40 +01:00
Mcat12 b9780dc295 Reimplement output for getPiholeStatus 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-10 23:05:05 -05:00
Mcat12 f02c4e81a5 Reimplement output for getList 
Adds `>getWhitelist`, `>getBlacklist`, and `getWildlist`

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-10 22:46:45 -05:00
Mark Drobnak 46585b236a Merge pull request #193 from pi-hole/tweak/README.md.1 
Update README.md
 2018-01-10 22:08:22 -05:00
Mark Drobnak 561c55ea0b Merge pull request #196 from pi-hole/fix/desc_sorting 
Improve sorting and displaying algorithms for top-clients and top-domains
 2018-01-10 22:06:26 -05:00
Mcat12 6287495508 Properly track the git modules instead of ignoring 
Git does not track the contents of submodules, which was what I was
trying to avoid with the previous commit. We can just specify them
upfront and only the commit at which the submodules pull from will be
stored.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-10 22:00:26 -05:00
Mcat12 3d6b864b86 Ignore test-generated files 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-10 21:46:20 -05:00
DL6ER c6b23ffa15 Complete re-write of this feature. We create now two sockets (one for IPv4-only and one for IPv6-only) to be able to bind to the corresponding loopback interfaces. We listen independently, but handle incoming requests using the same code. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-10 18:02:45 +01:00
Mcat12 37360bb3b1 Send forward destinations names and IP addresses alongside overTime data 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-09 16:08:29 -05:00
Mcat12 4ed20a4e8a Don't show a warning if write() returns 0 (this isn't an error) 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-09 16:07:58 -05:00
DL6ER 1eebc23c7c Disable debug statement 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-09 21:34:24 +01:00
DL6ER a95f683711 Detect if the current machine has IPv6 capable interfaces and behave accordingly (don't try to bind to a dual-stack port if the machine isn't capable to handling IPv6, e.g. in docker) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-09 21:30:10 +01:00
DL6ER 1254b74c93 dualstack will always bee boolean 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-09 19:59:10 +01:00
DL6ER 13b2fb3c35 Merge branch 'development' into new/IPv6support 
Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	socket.c
 2018-01-09 19:44:28 +01:00
DL6ER f6adb835ec Merge pull request #195 from pi-hole/flow/merge-2.13.2-to-dev 
GitFlow - Merge 2.13.2 to development
 2018-01-09 19:24:47 +01:00
Mcat12 30ae391e85 Let socket-test take in an optional command 
Example:
./socket-test travis ">stats"

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-08 18:15:41 -05:00
DL6ER ff6258f456 Fine-tune new tests 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-09 00:04:20 +01:00
DL6ER 85cf6c6623 Extend tests 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-09 00:01:55 +01:00
DL6ER 71434f81d8 Another descending (absteigend) and ascending (aufsteigend) tweak 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-08 23:55:39 +01:00
DL6ER 19a851c60f Fix meaning of ascending and descending 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-08 23:41:31 +01:00
DL6ER 684f334ef1 Implement improved algorithm in getTopClients(). As a by-product this also adds the optional "desc" feature to the top clients requests where it wasn't available before 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-08 22:27:40 +01:00
DL6ER 15f5c2aa72 Implement improved algorithm in getTopDomains(). Instead of assuming how many lines of data we have sent, we can also explicitly count them. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-08 22:22:50 +01:00
Mcat12 da7c354b71 Add socket implementation to getUnknownQueries and use istelnet 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 23:29:16 -05:00
Mcat12 43716b4f2d Add socket implementation to getClientNames and use istelnet 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 23:16:00 -05:00
Mcat12 14827420d6 Use ssend in getClientNames 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 23:09:32 -05:00
Mcat12 dde1602959 Add socket implementation for getClientsOverTime and use istelnet 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 23:09:29 -05:00
Mcat12 f90f6c8b4f Use ssend in getClientsOverTime 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 22:52:54 -05:00
Mcat12 64a1408e5d Add socket implementation of getDBstats and use istelnet 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 22:51:04 -05:00
Mcat12 2671a6fde0 Add socket implementation of getVersion and use istelnet 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 22:40:30 -05:00
Mcat12 bd639817f4 Remove the unused first boolean variables (used by Json serialization) 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 22:30:17 -05:00
Mcat12 779a82468e Add socket implementation to getQueryTypesOverTime and use istelnet 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 22:29:06 -05:00
Mcat12 08143393f0 Add socket implementation to getClientID and use istelnet 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 22:23:01 -05:00
Mcat12 7d0f680347 Add socket implementation to getForwardDestinationsOverTime and istelnet 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 22:19:20 -05:00
Mcat12 89ea9960aa Fix pack_uint64 
It needed to have its endianness flipped.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 21:49:18 -05:00
Mcat12 81200a270d Add socket implementation to getMemoryUsage and use istelnet 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 21:10:14 -05:00
Mcat12 14a8099d0f Merge branch 'master' into development 2018-01-07 20:57:54 -05:00
Dan Schaper 1de2b99c8a Merge pull request #191 from pi-hole/release/v2.13.2 
Pi-hole FTL v2.13.2
v2.13.2 		2018-01-07 17:34:24 -08:00
Mark Drobnak 6305b955ac Merge pull request #192 from pi-hole/fix/clients_lowercase 
Ensure that host names are always lower case

Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>

Conflicts:
	parser.c
 2018-01-08 02:07:29 +01:00
DL6ER fc4e26f08a Minor formating change 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-08 02:02:36 +01:00
Mark Drobnak 1683b5cdf0 Merge pull request #192 from pi-hole/fix/clients_lowercase 
Ensure that host names are always lower case
 2018-01-07 19:53:36 -05:00
DL6ER 97d55c26ed Also add Unix socket handle 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 23:53:58 +01:00
DL6ER c165cb8cbd Update README.md. Fixes #190 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 23:49:53 +01:00
DL6ER fc1e49c9c3 Ensure that host name returned by char *resolveHostname(const char *addr) is always lower case 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 23:23:47 +01:00