Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ContikiMAC framer fix #816

Merged
merged 3 commits into from Nov 28, 2014
Merged

ContikiMAC framer fix #816

merged 3 commits into from Nov 28, 2014

Conversation

kkrentz
Copy link
Contributor

@kkrentz kkrentz commented Oct 10, 2014

The contikimac_framer lacks a length function, which is why it does not currently work.

@kkrentz kkrentz changed the title ContikiMAC fix ContikiMAC framer fix Nov 14, 2014
@nvt
Copy link
Member

nvt commented Nov 17, 2014

👍

This framer is not set anywhere in the source tree, and it is probably not clear to many users when it is needed. Perhaps it should be made the default for those platforms and examples that use Rime over ContikiMAC, since it is often the case that Rime packets are too short for ContikiMAC's strobing mechanism to catch them reliably.

@kkrentz
Copy link
Contributor Author

kkrentz commented Nov 18, 2014

You're right. I've added a note to the wiki page https://github.com/contiki-os/contiki/wiki/Contikimac. Also, I'm now defaulting to this framer when using rime over ContikiMAC. The contikimac_framer became necessary to handle the interplay with the LLSEC layer. Zeroes have to be appended after securing a frame and removed before unsecuring a frame.

@nvt
Copy link
Member

nvt commented Nov 20, 2014

Looks good, but you should probably retain the copyright year of the original ContikiMAC source code in the ContikiMAC framer.

@kkrentz
Copy link
Contributor Author

kkrentz commented Nov 20, 2014

Done

@@ -512,6 +512,10 @@ typedef uint32_t rtimer_clock_t;
#define QUEUEBUF_CONF_NUM 8
#endif

#ifndef NETSTACK_CONF_FRAMER
#define NETSTACK_CONF_FRAMER contikimac_framer
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This setting belongs in the section named "Network Stack Configuration", where the Rime driver is set.

@kkrentz
Copy link
Contributor Author

kkrentz commented Nov 25, 2014

Now the positions of the framer definitions are being preserved.

nvt pushed a commit that referenced this pull request Nov 28, 2014
@nvt nvt merged commit 47096a1 into contiki-os:master Nov 28, 2014
@kkrentz kkrentz deleted the contikimac-framer-fix branch November 28, 2014 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants