Commit Graph

28 Commits

Author SHA1 Message Date
Simon Duquennoy
d286854bb4
Merge branch 'develop' into csma-improvements-pr 2018-11-10 15:20:35 +01:00
kkrentz
0c0d7b3e46 CSMA: Assert that n and q are non-NULL in csma-output.c#packet_sent 2018-11-07 03:06:50 -08:00
kkrentz
f71db7cc90 CSMA: Discard frames that come from ourselves 2018-11-02 07:14:25 -07:00
kkrentz
74780d5962 CSMA: Do not parse twice/Acknowledge MAC command frames, too 2018-11-02 07:13:23 -07:00
kkrentz
e4dcba32c9 CSMA: Do not depend depend on sequence numbers to identify packets 2018-11-02 07:13:23 -07:00
Simon Duquennoy
bda7c329ba
Merge branch 'develop' into contrib/csma-llsec 2018-11-02 01:13:14 +01:00
Joakim Eriksson
35123e9dd8 fixed better packet size assumptions 2018-10-30 16:36:55 +01:00
Joakim Eriksson
42dfc81af2 added LLSEC attributes form packetbuf to uipbuf when receiving IP packet, and a few other minor fixes 2018-10-30 16:06:11 +01:00
kkrentz
468a14b528 moved initialization of queuebuf to contikimac-main.c 2018-10-27 07:13:36 -07:00
Joakim Eriksson
008cffe81a fixed compilation issues 2018-10-23 08:12:55 +02:00
Joakim Eriksson
a2eec4c985 fixed csma-security debug output 2018-10-20 22:41:02 +02:00
Joakim Eriksson
c42fae82da added uipbuf attributes for llsec level and key and added payloadlen in mac 2018-10-20 22:25:55 +02:00
Olav Frengstad
df130952c7 Ensure correct setup LLSEC for CSMA
* Add `LLSEC_KEY_INDEX` for switching between implicit/explicit keys
 * Add missing `LLSEC_CONF_*
 * Conditionally include required CSMA setup for IPv6 (enable security
   when calculating frame length)
 * Setup default key
 * Always export `csma_security_set_key/2`
2018-10-18 11:28:58 +02:00
Joakim Eriksson
c5d59843c4 added linklayer security for CSMA 2018-10-18 11:28:58 +02:00
Simon Duquennoy
4097883229 CSMA: simplify routine that waits for ACK 2018-10-12 09:08:04 +02:00
Simon Duquennoy
b80d113253 Add a common set of portable RTIMER_BUSY_WAIT functions 2018-10-12 09:08:03 +02:00
Simon Duquennoy
c5e8c2097f Remove leftover COOJA_IP64 flags 2018-04-20 05:24:07 -07:00
George Oikonomou
e1816115be
Merge branch 'develop' into fix/csma 2018-04-05 23:12:52 +01:00
Simon Duquennoy
9dfcb2ebb6 Various logging improvements 2018-04-05 20:47:02 +02:00
Simon Duquennoy
c56d11502b CSMA: fix configuration bug 2018-04-05 20:44:04 +02:00
Simon Duquennoy
9630245cda CSMA: reset collision count to 0, not CSMA_MIN_BE 2018-04-05 20:43:51 +02:00
Simon Duquennoy
d526323ce2 CSMA for Cooja motes: increase backoff_period 2018-02-25 06:02:36 -08:00
Simon Duquennoy
61880704b1 CSMA: adopt default values from IEEE for CSMA_MIN_BE and CSMA_MAX_BE 2018-02-25 06:02:36 -08:00
Joakim Eriksson
1356994795 added support for usage of the transmission count attirbute in uipbuf 2017-12-09 10:22:19 +01:00
Atis Elsts
a211cb6e31 Allow to set a different number of MAC retransmissions for different classes of packets 2017-11-17 14:13:20 +00:00
George Oikonomou
8de3ffbc2e Don't initialise the queuebuf unconditionally
Currently, it is only used by 6LoWPAN when fragmentation is enabled, by TSCH and by CSMA. Platforms that disable fragmentation and choose a different MAC layer (e.g. NULLMAC) will unnecessarily end up with the module linked in the image, wasting flash and/or RAM space.
2017-10-29 23:18:36 +00:00
Simon Duquennoy
0f92c6ebfd Include contiki.h instead of contiki-conf.h so as to ensure consistent inclusion of contiki-default-conf.h 2017-09-08 14:20:59 +02:00
Niclas Finne
2c86194ef8 Renamed core to os 2017-09-01 15:29:00 +02:00