Pi-hole FTL v4.2.2 #510
Merged
Pi-hole FTL v4.2.2 #510
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ed for on-the-fly resizing of the nested structs Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
If we are unable to create or resize shared memory then there is no point in continuing execution. Further interactions with shared memory may result in crashes which are hard to debug. As a result of this change, there is no need to check if the returned shared memory object pointer is null, because if the function succeeded, the operation was successful. Signed-off-by: Mcat12 <newtoncat12@yahoo.com> Signed-off-by: DL6ER <dl6er@dl6er.de> Conflicts: shmem.c
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
There is now no case where the overTime ID is invalid. GC will run before the overTime slots run out. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
…ata to zero Signed-off-by: DL6ER <dl6er@dl6er.de>
…rom the long-term database Signed-off-by: DL6ER <dl6er@dl6er.de>
…onfig.c where an uninitialised value was created by a stack allocation and used in getline() Signed-off-by: DL6ER <dl6er@dl6er.de>
Also removed the overTime client prefix macro, and clarified order of operations when calculating overTime memory size Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
getOverTimeID returns `unsigned int` Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
…-1 to ensure we're not accidentially accessing other memory Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
…et up correctly Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
…g earlier to properly align to a full hour Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
This ensures that all queries which do not fit within the shifted overTime intervals are removed. Previously, there were warnings about queries being too old to fit in the new overTime slots: ``` WARN: overTime timeidx correction failed (0: 5 / 6) ``` Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
AzureMarker
reviewed
Feb 16, 2019
AzureMarker
previously approved these changes
Feb 16, 2019
AzureMarker
added a commit
to pi-hole/docs
that referenced
this pull request
Feb 16, 2019
The maximum value will be changed with FTL v4.2.2. Therefore, do not merge this commit until it is released. FTL v4.2.2 release PR: pi-hole/FTL#510 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
DL6ER
requested review from
bcambl,
diginc,
dschaper,
jacobsalmela,
pralor-bot and
PromoFaux
dschaper
previously approved these changes
Feb 16, 2019
jacobsalmela
previously approved these changes
Feb 17, 2019
…rting dnsmasq_main as it will be done again, shortly after. Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
…n one pihole-FTL instance is logging into the same file Signed-off-by: DL6ER <dl6er@dl6er.de>
PromoFaux
previously approved these changes
Feb 17, 2019
DL6ER
dismissed stale reviews from PromoFaux, jacobsalmela, dschaper, and AzureMarker
via
50ab1dd
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
AzureMarker
approved these changes
Feb 17, 2019
jacobsalmela
approved these changes
Feb 17, 2019
dschaper
approved these changes
Feb 17, 2019
PromoFaux
approved these changes
Feb 17, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This release simplifies the handling of the
overTimedata structures. These structures store the data of the queries over time (permitted / blocked) as well as the client-specific data needed to compute the following two graphics on the dashboard:To allow for this simplification, we fixated the length rolling to 24 hours. The option
MAXLOGAGEcan still be loaded to specify how much should be read from the database but can not be used any longer to, e.g., enlarge the displayed window. The change was long overdue and is necessary to keep the code maintainable. Some users have been suffering from a breakdown of the previously used fully dynamic memory handling. This release fixes these errors.