RSVP improvements to tests as well as P2MP support #1267
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
Included are PATH, RESV, PATH ERROR, PATH TEAR and RESV TEAR message types. The pcap contains two sessions, a P2P one and a P2MP one.
The P2MP ID is typically denoted as a single value, either in decimal or in hexadecimal format. The 4-octet notation is quite uncommon and I believe this was just a mistake in the code since the IPv6 version 11 lines above uses a hexadecimal notation instead. I'm also using this opportunity to change the name from "P2MP LSP ID" to "P2MP ID" since that's more correct. The term "LSP ID" has a well-defined meaning in the RSVP protocol and is something else than the P2MP ID. The BGP dissector uses the term P2MP ID as well for the same value (and shows it in hexadecimal format).
The code can just re-use the printer of the P2P ERO and RRO. However, for P2MP the C-Type is 2, which make the check a little cumbersome: We can only do the printing of the sub-objects if either we are dealing with a P2P ERO/RRO having C-Type 1 (indicating IPv4), or if we are dealing with a P2MP ERO/RRO having C-Type 2 (indicating P2MP).
|
The build failure on openbsd-mips64 was a timeout in an ipv6 test which looks to me like a case of flaky test infra instead of being related to my changes. Re-running that build will probably pass, but admin rights are required to initiate that, which I don't have. |
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 PR makes as few improvements in the RSVP dissector.
All three are in separate commits and I suggest merging them separately to the master branch. Steps 2 and 3 are modifying the expected test output added in step 1, illustrating the effect of their changes.
Initially I planned to make 3 separate PRs, but GitHub's stacking support seems to be lacking somewhat, so doing a single PR instead with separate commits. Please indicate if a different commit structure is preferred in your project.