Fix the problem of duplicate nonce; Add APIs to set m_maxRetries and m_defaultTimeout #35
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
tianyuan129
reviewed
May 17, 2024
tianyuan129
requested changes
May 17, 2024
src/consumer.cpp
Outdated
| @@ -270,7 +286,11 @@ Consumer::handleTimeout(const Interest& interest, int nRetrials, | |||
| { | |||
| if (nRetrials > 0) { | |||
| NDN_LOG_INFO("Timeout for: " << interest << ", retrying"); | |||
| m_face.expressInterest(interest, dataCallback, | |||
| auto interestNew = const_cast<Interest&>(interest); | |||
| int factor = (int) std::pow(2, m_maxRetries+1-nRetrials); | |||
There was a problem hiding this comment.
Can you use cast instead? Also m_maxRetries + 1 - nRetrials.
src/consumer.cpp
Outdated
| @@ -270,7 +286,11 @@ Consumer::handleTimeout(const Interest& interest, int nRetrials, | |||
| { | |||
| if (nRetrials > 0) { | |||
| NDN_LOG_INFO("Timeout for: " << interest << ", retrying"); | |||
| m_face.expressInterest(interest, dataCallback, | |||
| auto interestNew = const_cast<Interest&>(interest); | |||
There was a problem hiding this comment.
Not quite understand here. Why make an Interest then cast it into another?
There was a problem hiding this comment.
A const interest's nonce can't be changed
There was a problem hiding this comment.
Then better make a new interest and copy over fields. This cast looks a bit strange to me tbh…solely for getting rid of const
There was a problem hiding this comment.
Yes, I will make a new interest here.
|
Made some changes accordingly and submitted a new commit |
tianyuan129
approved these changes
May 17, 2024
tianyuan129
requested changes
May 17, 2024
src/consumer.cpp
Outdated
| int factor = static_cast<int>(std::pow(2, m_maxRetries + 1 - nRetrials)); | ||
| interestRetry.setCanBePrefix(true); | ||
| interestRetry.setInterestLifetime(ndn::time::milliseconds(m_defaultTimeout*factor)); | ||
| interestRetry.setNonce(std::nullopt); |
There was a problem hiding this comment.
Ideally, you should use refreshNonce()
|
Use refreshNonce() instead now |
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.
#34