nanocoap: fixed setting of option length#17
Merged
kaspar030 merged 1 commit intokaspar030:masterfrom Sep 6, 2017
Merged
Conversation
Contributor
Author
|
@kaspar030: ping |
kaspar030
requested changes
Aug 15, 2017
nanocoap/nanocoap.c
Outdated
| unsigned delta = (onum - lastonum); | ||
| *buf = 0; | ||
|
|
||
| unsigned n = _put_opt_len(buf, 1, 4, delta); |
Owner
There was a problem hiding this comment.
this is very confusing. _put_opt_len is used for both encoding the option length and the option delta, right?
Renaming the function is probably a good idea. At least there need to be proper comments.
| int n = _put_odelta(buf, lastonum, onum, olen); | ||
|
|
||
| unsigned delta = (onum - lastonum); | ||
| *buf = 0; |
Contributor
Author
There was a problem hiding this comment.
because the _put_opt_len function does not clear the length field anymore itself.
Contributor
Author
|
better? |
Owner
yes! please squash. |
haukepetersen
force-pushed
the
fix_nanocoap_optlen
branch
from
85ca352 to
b911c65
Compare
Contributor
Author
|
rebased and squashed |
Contributor
Author
|
@kaspar030: are you ok to merge this now? |
Contributor
Author
kaspar030
approved these changes
Sep 6, 2017
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
2 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.
Options with a length > 12 byte did break the CoAP package. This PR fixes this and adapts the option length notation is described in section 3.1 in the RFC.