Commit Graph
45 Commits
Author SHA1 Message Date
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 c606ad75ab Remove undocumented, old, and unused debug commands
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-10 19:24:02 +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 959af6789b Remove -DNO_FORK compile time flag, undo dnsmasq code modifications, make sure that "-k" is always passed to dnsmasq
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-19 07:32:40 +02:00
DL6ER af0336df89 Update README.md
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-09 13:54:48 +01:00
DL6ER d88fbf1067 Add --resolver flag
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-05 22:53:47 +01:00
DL6ER ea3309e7b1 Initial commit for FTLDNS
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-22 20:21:06 +01:00
DL6ER 3483ee8407 Remove intermediate variables where we don't need them
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-05 23:03:23 +01:00
DL6ER d0d0dfede5 Extract first 7 characters of the hash as this is what "git --no-pager describe --always" gives as output
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-05 22:36:58 +01:00
DL6ER cf93110aee Final fix for Travis versioning and all the cosmetic issues we have seen
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-05 22:34:07 +01:00
DL6ER 3086d1b40d Save socket file in home folder on Travis
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-31 23:02:34 +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 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
Mark Drobnak 95bdd62777 Merge pull request #167 from pi-hole/new/variablefilenames
Make long-term database location adjustable
2017-12-12 12:16:06 -05:00
DL6ER c9d990f403 Use a better detection for '.' in the version string / commit hash
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-08 17:18:09 +01:00
DL6ER 32c2471e04 Check if version is of format vX.YYY or vXX.YYY to decide whether on a deployed version or not
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-07 22:42:24 +01:00
DL6ER f184510b7d Explicitly specify where conf file is to be found on Travis build systems
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-07 22:28:35 +01:00
DL6ER 4da545e057 Tweaks for Travis automated testing
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-07 22:20:34 +01:00
DL6ER 172fe7a418 Remove "d" from help text
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-04 20:13:23 +01:00
DL6ER 5fcb629c52 Set ok = true also for "test" to be able to pass the parse_args() routine
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-04 11:59:56 +01:00
DL6ER 7517e21372 Remove extra newlines at the end of the invalid option and help outputs
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-04 11:55:16 +01:00
DL6ER 38ab54d785 Implement "invalid option" and "help" in argument checker
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-04 11:40:25 +01:00
DL6ER 33132c72d6 Use GIT_BRANCH not GIT_TAG ...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-03 19:35:03 +01:00
DL6ER ff6af26d04 Apply the same logic for the API request ">version"
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-03 19:29:14 +01:00
DL6ER 86d370e46a Return special version if compiled on a branch != master
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-03 18:31:04 +01:00
DL6ER 68d135621a Add "branch" command (returns branch FTL is compiled from)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-28 13:26:20 +02:00
DL6ER 15098dca97 Use local path for DB as well 2017-06-12 11:48:39 +02:00
DL6ER 692d69947e Add FTL SQLite3 implementation, we compile SQLite3 on-the-fly to become independent of installed libraries
Limit DB filesize, configureable via config file, if set to zero, the DB functionality is disabled altogether
Add ">dbstats" to the telnet interface
2017-06-09 09:47:13 +02:00
DL6ER 380aee6689 Add test suite for FTL 2017-06-05 15:12:38 +02:00
DL6ER 4cef1a9f9c Add "no-daemon" resp. "-f" option to prevent FTL forking itself into background (#42) 2017-05-11 00:21:22 +02:00
DL6ER 78f615201a Some non-POSIX systems use different conventions for exit status values.
For greater portability, we now use the macros EXIT_SUCCESS and EXIT_FAILURE for the conventional status value for success and failure, respectively.
They are declared in stdlib.h
2017-03-29 14:00:51 +02:00
DL6ER aa46dfa584 Add "running" argument that tests if another FTL process is running 2017-03-22 17:19:04 +01:00
DL6ER a8a55a3857 Implement rolling 24h as standard behavior of FTL. Can be set to static views of up to 24h (analyzing pihole.log) and up to 48h (analyzing pihole.log.1 in addition) 2017-03-14 18:46:17 +01:00
DL6ER 7c9b1b4195 Add config file parser. First config arguments are
SOCKET_LISTENING=all|local
INCLUDE_YESTERDAY=true|false

If FTL we cannot find or interpret a config variable value, it will skip it and use the default value
2017-03-14 12:20:07 +01:00
DL6ER e70be89073 Remove moving time frame altogether 2017-03-14 10:38:16 +01:00
DL6ER f73ed48dbf Implement FTL garbage collector 2017-03-12 21:03:05 +01:00
DL6ER e303d9e670 New command line arguments: debugclients debugthreads
Also don't return clients or forwards with a count of 0
2017-03-10 14:12:10 +01:00
DL6ER 6ccfeea2da Guarantee FTL's thread safety 2017-03-08 11:47:58 +01:00
DL6ER e930b91b5e Add "tag" command line argument 2017-02-22 09:50:05 +01:00
DL6ER 676947230c Add "version" command line option (print GIT_VERSION and exit immediately) 2017-02-16 23:10:55 +01:00
DL6ER a83ba95b10 Add "test" argument that will let FTL load everything and then shut down immediately 2017-02-06 13:49:24 +01:00
DL6ER b01d6b6194 Interpret command line arguments (use pihole-FTL debug for debug mode) 2017-02-06 13:19:17 +01:00