Commit Graph

162 Commits

Author SHA1 Message Date
George Oikonomou 07c646484b
Merge branch 'develop' into contrib/tsch-discard-frames-from-ourselves 2019-03-03 23:40:12 +00:00
Simon Duquennoy 4cc64ea942 TSCH: filter out frames from ourselves 2019-02-24 16:30:57 +01:00
Simon Duquennoy 6debe1b21b Added explicit types for TSCH timeslot timings in usec and ticks 2019-02-24 15:48:56 +01:00
Simon Duquennoy 8c9a06d66a
Merge branch 'develop' into impl-starting-EB-RFC8180 2019-02-18 09:41:10 +01:00
Takeshi Sakoda 855089af8d tsch: fix for https://github.com/contiki-ng/contiki-ng/pull/769#discussion_r247239784 2019-01-15 14:10:59 +09:00
Atis Elsts f9cd3449f3 add tsch_get_network_uptime_ticks() function 2018-12-18 16:40:18 +00:00
Simon Duquennoy a9aad29617 Add missing inclusions of <inttypes.h> 2018-11-22 15:04:10 +01:00
Takeshi Sakoda 3a1d604418 tsch: add start sending EB when a node joins RPL newwork in tsch. 2018-11-21 17:27:35 +09:00
Takeshi Sakoda 666e4263cd tsch-rpl: add tsch_rpl_check_dodag_joined function in tsch-rpl. 2018-11-21 17:27:20 +09:00
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
Toshio Ito 0997932bcb tsch: skip resynchronization when time source has been already changed.
See #712

Plus, now `resynchronize` is a separate function.
2018-10-23 16:31:34 +09: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
George Oikonomou e96a325588
Merge branch 'develop' into tsch-handle-prepare-error 2018-10-19 21:17:50 +01:00
Toshio Ito cb962855a4 fix code style for else 2018-10-19 22:32:52 +09:00
George Oikonomou 8014524dd1
Merge branch 'develop' into contrib/cc13xx-tsch 2018-10-18 15:36:50 +01: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
Toshio Ito fc8ccac560 tsch: report MAC_TX_ERR if prepare() fails
Before this fix, uninitialized mac_tx_status was reported in this case.
2018-10-18 16:05:45 +09:00
Simon Duquennoy 7ab140c55e Added missing 'extern' qualifier to tsch_timing_us 2018-10-16 15:17:54 +02:00
Atis Elsts 5d04147406 CC26xx/CC13xx: Add support for TSCH API for the prop-mode.c radio driver, and unify the radio timer handling between the IEEE and prop modes 2018-10-13 15:38:18 +01: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
George Oikonomou be072a35a4
Merge branch 'develop' into fix/tsch-cca 2018-10-11 13:00:30 +01:00
Simon Duquennoy fac787231d Added TSCH_CONF_ARCH_HDR_PATH for platform-specific TSCH includes 2018-10-10 16:52:33 +02:00
Simon Duquennoy 7c5977d9f7 tsch_init: check that a timeslot timing template is provided 2018-10-04 13:07:25 +02:00
Simon Duquennoy 3ace2b93f6 tsch_init: added missing return in case of failed initialization 2018-10-04 13:07:25 +02:00
Simon Duquennoy 22cbced037 TSCH: timeslot timing templates as const 2018-10-04 13:07:25 +02:00
Simon Duquennoy cc0c70c1b3 TSCH: move 10ms and 15ms timeslot timings to separate files 2018-10-04 10:50:10 +02:00
Simon Duquennoy 5497dc1e20 TSCH: timeslot timings as a structure, for flexible configuration 2018-10-04 10:50:09 +02:00
Simon Duquennoy 665f21592f TSCH: compute TSCH_SLOTS_PER_SECOND based on current timeslot timings rather than default 2018-10-04 10:50:09 +02:00
Simon Duquennoy 572c6725d3 TSCH: configurable byte air time and PHY overhead 2018-10-04 10:50:09 +02:00
Simon Duquennoy e6dec9ee4a TSCH: before associating on an EB, check that the Rx timestamp is sensible 2018-10-03 13:16:59 +02:00
Simon Duquennoy 17c2158229 TSCH: when scanning, set channel periodically regardless of previous channel 2018-10-03 13:16:19 +02:00
Simon Duquennoy ace15d6499 TSCH: when receiving, bound packet duration with MaxTx from timing template 2018-10-03 13:01:21 +02:00
Simon Duquennoy 3ba1b43bd9 TSCH: define SYNC_IE_BOUND from timing in use rather than default 2018-10-03 12:59:52 +02:00
Simon Duquennoy 423412d99c TSCH: set max hopping sequence length to default hopping sequence 2018-10-03 12:47:10 +02:00
Simon Duquennoy 3e83903ee5 TSCH: fix CCA checking logic 2018-09-28 16:16:25 +02:00
Simon Duquennoy 1f4f0c406c TSCH: fix timing variables in CCA code 2018-09-28 16:14:33 +02:00
Simon Duquennoy 9fb7e8bfed TSCH: cleanup flags for CCA configuration 2018-09-28 16:12:28 +02:00
Atis Elsts bc9967dbb0 add TSCH channel selection service 2018-09-27 16:00:36 +01:00