gnrc_ipv6: don't recurse into receive for encapsulated IPv6 [backport 2018.10]#10348
Merged
bergzand merged 2 commits intoRIOT-OS:2018.10-branchfrom Nov 8, 2018
Conversation
`_decapsulate()` is called by callees of `_receive()` so the call to the latter function within the first creates a recursion we don't want. Using `gnrc_netapi` instead removes that and provides the added benefit that other subscribers to IPv6 are also informed. (cherry picked from commit 160ccbc)
Otherwise, an encapsulated IPv6 packet is handled twice. Once in the central function, once in the specialized decapsulation. (cherry picked from commit d54ac38)
Member
|
thanks for the backport! |
Member
Author
|
We should however retest some of the GNRC tests in the release specs when this is merged, just to be sure. |
@jia200x for future references: if you give untested ACKs, don't approve, to prevent accidental merges.
Member
Sure ;) |
bergzand
approved these changes
Nov 8, 2018
Member
bergzand
left a comment
There was a problem hiding this comment.
Tested, works here too.
ACK!
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Backport of #10246
Contribution description
_decapsulate()is called by callees of_receive()so the call tothe latter function within the first creates a recursion we don't want.
Using
gnrc_netapiinstead removes that and provides the added benefitthat other subscribers to IPv6 are also informed.
Testing procedure
Send an encapsulated IPv6 packet to a node. It should still be parsed properly.
Issues/PRs references
None, but related to the IPv6 refactoring project(the project is not required for the release ;-))