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.

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

Fix subnetcache statistics #538

Merged
merged 1 commit into from
Sep 3, 2021

Conversation

tduboys
Copy link

@tduboys tduboys commented Sep 3, 2021

Hi all,
Following d69132b
the subnet module was renamed to subnetcache to improve logging, but stats are not displayed correctly.

see https://github.com/NLnetLabs/unbound/blob/master/edns-subnet/subnetmod.c#L864

Tested on 1.13.2 on Debian Stretch.

The subnet cache worked as expected, the issue was only on statistics (on unbonud-control stats)

Copy link
Member

@wcawijngaards wcawijngaards left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good to me.

@wcawijngaards wcawijngaards merged commit 4c90250 into NLnetLabs:master Sep 3, 2021
wcawijngaards added a commit that referenced this pull request Sep 3, 2021
- Fix #538: Fix subnetcache statistics.
@wcawijngaards
Copy link
Member

Thanks for the additional fixes! That failed string would just make the statistics not work, but not fail compile. Merged it into the code repository.

jedisct1 added a commit to jedisct1/unbound that referenced this pull request Oct 5, 2021
* nlnet/master: (118 commits)
  - Fix to add example.conf note for outbound-msg-retry.
  - Implement RFC8375: Special-Use Domain 'home.arpa.'.
  - Fix crosscompile script for the shared build flags.
  - Fix crosscompile windows to use libssp when it exists. - For the windows compile script disable gost. - Fix that on windows, use BIO_set_callback_ex instead of deprecated
  - Fix crosscompile shell syntax.
  - For crosscompile on windows, detect 64bit stackprotector library.
  - Fix crosscompile on windows to work with openssl 3.0.0 the   link with ws2_32 needs -l:libssp.a for __strcpy_chk.   Also copy results from lib64 directory if needed.
  - Fix more initialisation errors reported by gcc sanitizer.
  - Fix lock debug code for gcc sanitizer reports.
  - Fix initialisation errors reported by gcc sanitizer.
  - Fix root_anchor test to check with new icannbundle date.
  - Fix for NLnetLabs#41: change outbound retry to int to fix signed comparison   warnings.
  - Small fixes for NLnetLabs#41: changelog, conflicts resolved,   processQueryResponse takes an iterator env argument like other   functions in the iterator, no colon in string for set_option,   and some whitespace style, to make it similar to the rest.
  Changelog entry for NLnetLabs#538 - Fix NLnetLabs#538: Fix subnetcache statistics.
  Fix subnetcache statistics
  - Fix tcp fastopen failure when disabled, try normal connect instead.
  - Fix NLnetLabs#533: Negative responses get cached even when setting   cache-max-negative-ttl: 1
  - Fix asynclook unit test for setup of lockchecks before log.
  - Fix compile warning in libunbound for listen desetup routine.
  - Fix RPZ locks. Do not unlock zones lock if requested and rpz find   zone does not find the zone. Readlock the clientip that is found   for ipbased triggers. Unlock the nsdname zone lock when done.   Unlock zone and ip in rpz nsip and nsdname callback. Unlock   authzone and localzone if clientip found in rpz worker call.
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants