DHCP6: use lease_type to key lease map in addition to iaid_duid
#8492
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
AdSchellevis
requested changes
Apr 3, 2025
| @@ -148,7 +148,7 @@ def parse_lease(lines): | |||
| elif len(line) > 1 and line[0] == '}' and len(cur_lease) > 0: | |||
| cur_lease.append(line) | |||
| parsed_lease = parse_lease(cur_lease) | |||
| last_leases[parsed_lease['iaid_duid']] = parsed_lease | |||
| last_leases[parsed_lease['lease_type'], parsed_lease['iaid_duid']] = parsed_lease | |||
There was a problem hiding this comment.
Suggested change
| last_leases[parsed_lease['lease_type'], parsed_lease['iaid_duid']] = parsed_lease | |
| last_leases["%s,%s" % (parsed_lease['lease_type'], parsed_lease['iaid_duid'])] = parsed_lease |
I prefer to use single value keys for debugging, the suggested change should have the same result as you're looking for.
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.
Description
Currently,
get_leases6misreports clients that request an address and a prefix delegation. Adding the lease type to the map key prevents this.Testing
Request an address and a PD from the same client (same DUID) and verify that the address appeared in the output of
/api/dhcpv6/leases/searchLease/and that the delegated prefix appeared in/api/dhcpv6/leases/searchPrefix/.Fixes: #8472