Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Analyze/show more query types #349

Merged
merged 15 commits into from
Aug 13, 2018
Merged

Analyze/show more query types #349

merged 15 commits into from
Aug 13, 2018

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Aug 9, 2018

By submitting this pull request, I confirm the following (please check boxes, eg [X]) Failure to fill the template will close your PR:

Please submit all pull requests against the development branch. Failure to do so will delay or deny your request

  • I have read and understood the contributors guide.
  • I have checked that another pull request for this purpose does not exist.
  • I have considered, and confirmed that this submission will be valuable to others.
  • I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  • I give this submission freely, and claim no ownership to its content.

How familiar are you with the codebase?:

10

So far, Pi-hole analyzed only A and AAAA queries. We open FTLDNS now for many additional query types, namely PTR, SRV, SOA, TXT, and ANY.

This feature is theoretically ready but intentionally marked as WIP as it needs more testing and reviews by all volunteers.

Screen shot:
screenshot at 2018-08-09 17-59-45

This template was created based on the work of udemy-dl.

DL6ER added 10 commits August 9, 2018 11:46
@DL6ER
Determine query type earlier on
5528505 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Allow all query types (not only A and AAAA) during database import
64a895d 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Be able to return any query type through API
a3ac3bc 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Remove limitation to only analyze A and AAAA queries
124f81e 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Correct comment
835ae44 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Also call FTL_cache(...) for the other query types (so far, we only c…
1edbd99 
…alled the routine for A and AAAA queries)

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Remove more checks that skipped PTR replies
2f4dd87 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Add new reply type: REPLY_DOMAIN
111f160 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Don't forget to GC wildcard blocked entries
1f360dc 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Extend FTL_reply(...). Meanwhile, I removed some code duplication and…
baeceeb 
… fixed the behavior to avoid multiple counting of query types if there are multiple replies (for instance, a PTR query can return multiple host names for a given IP address)

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added the WIP label Aug 9, 2018
@DL6ER
Add RRNAME reply type (needed for TXT queries)
877c81b 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Merge branch 'development' into new/more_query_types
82f5324 
Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	dnsmasq_interface.c
@DL6ER
Add "ANALYZE_ONLY_A_AND_AAAA" config option to obtain pre-v4.1 behavi…
1a242be 
…or (show and record only A and AAAA queries, ignore all others)

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested review from a team August 11, 2018 11:55
@AzureMarker
Copy link
Contributor

Note: This PR also fixes the over 100% block rate bug. 1f360dc

AzureMarker
AzureMarker suggested changes Aug 12, 2018
View reviewed changes
dnsmasq_interface.c Outdated Show resolved Hide resolved
dnsmasq_interface.c Outdated Show resolved Hide resolved
dnsmasq_interface.c Show resolved Hide resolved
dnsmasq_interface.c Outdated Show resolved Hide resolved
@DL6ER DL6ER merged commit 9ac8980 into development Aug 13, 2018
@DL6ER DL6ER deleted the new/more_query_types branch August 13, 2018 10:50
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/where-to-find-queries-by-type-ptr/12528/2

@AzureMarker AzureMarker mentioned this pull request Sep 30, 2018
Closed
3 tasks
@AzureMarker AzureMarker mentioned this pull request Oct 17, 2018
Closed
3 tasks
@sadsfae sadsfae mentioned this pull request Nov 26, 2018
Closed
3 tasks
@walter-exit
Copy link

Good evening lads and lasses,

I see we all noticed this odd behavior. And the amazing folks at Pi-hole seem to have found and fixed the culprit. Perfect! Could this now be released?

The current release still contains this annoying bug. Two agonizing months, since I discovered it, looking at askew percentages bugs me more than I like to admit.

Can we save Christmas this year and release the development fixes so far? Or perhaps just a hot fix for this one? That would sure make my holiday season ;-)

Happy days to you all, in advance.

@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/never-forward-reverse-lookups-for-private-ip-ranges-doesnt-appear-to-be-working-in-4-1-1/15614/2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AzureMarker AzureMarker AzureMarker approved these changes

Assignees
No one assigned
Labels
Enhancement FTLDNS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@DL6ER @AzureMarker @pralor-bot @walter-exit