interest: fix timeout calculation for suite != NDN-TLV #349
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.
Contribution description
Currently, the lifetime for new interests is read from
pkt->s.ndntlv.interestlifetime
even for packets that have an CCNx encoding. Sinces.ndntlv
is a union in this case, it contains something, but definitely not the correct interest lifetime for CCNx. On the other hand, the CCNx parser does not really parse the interest lifetime hop-by-hop option. This patch adds an abstraction to figure out the suite and return the correct lifetime (s.ndntlv.interestlifetime
for NDN andCCNL_INTEREST_LIFETIME
for CCNx and others).Issues/PRs references
Probably related to #210