Simon Duquennoy
|
ab1e2f8d28
|
Merge branch 'release-4.2' into fix/json-buffer-overflows
|
2018-10-24 10:49:37 +02: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 |
|
Jeppe Odgaard
|
e135bf277e
|
Added test to reproduce issue, and proposed fix in rpl-dag, where dag is only freed if dag_id is different.
|
2018-10-22 10:37:56 +02:00 |
|
Joakim Eriksson
|
a2eec4c985
|
fixed csma-security debug output
|
2018-10-20 22:41:02 +02:00 |
|
Joakim Eriksson
|
d3c95c9a6e
|
added llsec shell commands
|
2018-10-20 22:27:19 +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 |
|
Simon Duquennoy
|
9194e82168
|
uip6: sanitize parsing of ext header options
|
2018-10-19 16:13:03 +02:00 |
|
Simon Duquennoy
|
78d16284ae
|
Merge branch 'develop' into bugfix/gpio/64bit
|
2018-10-19 15:46:24 +02:00 |
|
Toshio Ito
|
cb962855a4
|
fix code style for else
|
2018-10-19 22:32:52 +09:00 |
|
Atis Elsts
|
9faa834f57
|
Allow the user to configure COAP_CONF_OBSERVE_REFRESH_INTERVAL and allow it to be zero
|
2018-10-19 13:15:43 +01:00 |
|
Simon Duquennoy
|
1df85a12a4
|
Merge branch 'develop' into bugfix/gpio/64bit
|
2018-10-19 14:08:05 +02:00 |
|
Simon Duquennoy
|
ff825daaea
|
Merge remote-tracking branch 'origin/develop' into wip/uip6-cleanup
|
2018-10-18 20:28:00 +02:00 |
|
Simon Duquennoy
|
655faf0dca
|
Further simplification of uip.h buffers
|
2018-10-18 20:27:30 +02:00 |
|
Simon Duquennoy
|
6c583efa37
|
Rework ext_hdr_options_process
|
2018-10-18 20:27:03 +02:00 |
|
Simon Duquennoy
|
6c11da58d8
|
Rework rpl-ext-header.c
|
2018-10-18 20:27:03 +02:00 |
|
Simon Duquennoy
|
8456c544d8
|
Simplify uip.h definitions
|
2018-10-18 20:26:12 +02:00 |
|
Simon Duquennoy
|
9b66b6931d
|
Removed UIP_IP_BUF_CHAR
|
2018-10-18 20:26:12 +02:00 |
|
Simon Duquennoy
|
ea32ab0f12
|
Removed UIP_LLH_LEN
|
2018-10-18 20:26:12 +02:00 |
|
Simon Duquennoy
|
999e7dc3a7
|
Rework uip6.c
|
2018-10-18 20:26:11 +02:00 |
|
George Oikonomou
|
8014524dd1
|
Merge branch 'develop' into contrib/cc13xx-tsch
|
2018-10-18 15:36:50 +01:00 |
|
Simon Duquennoy
|
aaf06754ea
|
uipbuf_set_len_field
|
2018-10-18 15:50:54 +02:00 |
|
Simon Duquennoy
|
4018b31123
|
Removed need for global uip_ext_opt_offset
|
2018-10-18 15:50:54 +02:00 |
|
Simon Duquennoy
|
d4bc09e002
|
Move function for clearing uip_buf to uipbuf module
|
2018-10-18 15:50:54 +02:00 |
|
Simon Duquennoy
|
b4d45d7f56
|
Removed comment that was no longer necessary
|
2018-10-18 15:50:54 +02:00 |
|
Simon Duquennoy
|
22f4a19994
|
Clean up usage of uip_ext_len
|
2018-10-18 15:50:34 +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 |
|
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
|
56b85b6475
|
uip.h: clarify comment
|
2018-10-17 17:47:57 +02:00 |
|
Simon Duquennoy
|
3384de64b7
|
Rework buffer access in roll-tm.c
|
2018-10-17 17:37:12 +02:00 |
|
Simon Duquennoy
|
0531c555e8
|
Minor enhancements to uip6.c
|
2018-10-17 17:25:04 +02:00 |
|
Simon Duquennoy
|
bbb641a450
|
Rework uip-nd6 buffer access
|
2018-10-17 17:24:53 +02:00 |
|
Simon Duquennoy
|
01b795a4c2
|
Rework uIP6 extension header options access
|
2018-10-17 17:07:17 +02:00 |
|
Simon Duquennoy
|
8152342c11
|
Rework uIP6 extension header access
|
2018-10-17 16:33:48 +02:00 |
|
Simon Duquennoy
|
4035d840dd
|
Rework uip.h buffer definitions
|
2018-10-17 16:25:17 +02:00 |
|
Simon Duquennoy
|
a528395eb2
|
roll-tm.c: removing unused define
|
2018-10-17 16:20:34 +02:00 |
|
Simon Duquennoy
|
59852d33f2
|
Use global uip.h buffer definitions in a number of other modules
|
2018-10-17 16:20:34 +02:00 |
|
Simon Duquennoy
|
86e9790e6e
|
Minor improvement to uip.h
|
2018-10-17 16:20:15 +02:00 |
|
Simon Duquennoy
|
2f9b60215e
|
Removing tcpip and udpip data strcutures, unsafe in cases with IPv6 extension headers
|
2018-10-17 11:22:05 +02:00 |
|
Simon Duquennoy
|
1bd9ac781b
|
Define ICMP, UDP, and TCP buffer pointers globally in uip.h
|
2018-10-17 11:18:32 +02:00 |
|
Simon Duquennoy
|
caa02ae51e
|
Define UIP_IP_BUF globally in uip.h
|
2018-10-17 11:18:32 +02:00 |
|
Simon Duquennoy
|
ee5b722c65
|
uip.h: removed unused define
|
2018-10-17 11:18:32 +02:00 |
|
Simon Duquennoy
|
b56ff259dc
|
uIP: remove leftover IPv4 code
|
2018-10-17 11:18:20 +02:00 |
|
George Oikonomou
|
5b58f6980e
|
Merge branch 'develop' into fix/mqtt-buffer-overflow
|
2018-10-16 22:09:10 +01:00 |
|
Simon Duquennoy
|
7ab140c55e
|
Added missing 'extern' qualifier to tsch_timing_us
|
2018-10-16 15:17:54 +02:00 |
|
Simon Duquennoy
|
963c2d57aa
|
Json library: fix a number of potential buffer overflows
|
2018-10-15 16:36:10 +02:00 |
|
Simon Duquennoy
|
bcebd3afcf
|
MQTT parse_publish_vhdr: added missing check of topic length
|
2018-10-15 14:27:35 +02:00 |
|
Simon Duquennoy
|
3b5369cf2a
|
MQTT parse_publish_vhdr: added missing initialization of topic_pos
|
2018-10-15 14:11:59 +02:00 |
|
George Oikonomou
|
ad03d3a05e
|
Remove obsolete function prototypes
|
2018-10-13 16:02:06 +01: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
|
2a66edfd6b
|
Doxygen clarification to etimer_reset and ctimer_reset
|
2018-10-13 10:20:21 +02:00 |
|
Simon Duquennoy
|
8472cf8bbe
|
stimer_reset: do not do anything if the timer has not expired
|
2018-10-13 10:20:20 +02:00 |
|
Simon Duquennoy
|
163d1241b3
|
timer_reset: do not do anything if the timer has not expired
|
2018-10-13 10:14:24 +02:00 |
|
George Oikonomou
|
d4fd286b34
|
Merge branch 'develop' into contrib/spi-sel-desel
|
2018-10-12 16:24:52 +01:00 |
|
Simon Duquennoy
|
d85cecea34
|
rtimer.h: add return value to RTIMER_BUSYWAIT* macros
|
2018-10-12 09:08:04 +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
|
4567ee303e
|
Merge branch 'develop' into contrib/link-stat-packet-counters
|
2018-10-12 08:19:38 +02:00 |
|
George Oikonomou
|
942d09a83d
|
Merge branch 'develop' into fix/rpl-dag-lifetime-60
|
2018-10-11 16:45:27 +01:00 |
|
George Oikonomou
|
d5f1bd2d4c
|
Merge branch 'develop' into bugfix/gpio/64bit
|
2018-10-11 16:44:22 +01: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
|
4583fff094
|
Radio API: added values/objects for TSCH constants
|
2018-10-03 12:42:06 +02:00 |
|
kkrentz
|
11a2fb14b1
|
radio.h: Added RADIO_PARAM_SHR_SEARCH
|
2018-10-02 07:56:23 -07:00 |
|
George Oikonomou
|
3e9d79ca8c
|
Fix pin to mask conversion macro for 64-bit masks
|
2018-09-30 13:25:44 +01:00 |
|
Simon Duquennoy
|
a01413369d
|
RPL-Lite: fix DAG lifetime, was 60h, now 8h
|
2018-09-29 09:26:29 +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 |
|
Atis Elsts
|
ad577cf77f
|
Add TSCH stats
|
2018-09-27 16:00:36 +01:00 |
|
George Oikonomou
|
e71ef49c04
|
Create platform-independent SPI select and deselect
|
2018-09-26 21:42:06 +01:00 |
|
Atis Elsts
|
8db3c8d3be
|
add const to spi_device_t * parameter in SPI functions, and store ext-flash default config in ROM instead of RAM
|
2018-09-25 14:28:50 +01:00 |
|
Rehan MALAK
|
cc7c2312ec
|
missing header inttypes.h
|
2018-09-21 10:15:43 +02:00 |
|
Simon Duquennoy
|
ba8f8b9bda
|
Merge branch 'develop' into bugfix/mcast-stats
|
2018-09-16 20:03:30 +02:00 |
|
Edvard Pettersen
|
5ea0c80ae1
|
Merge branch 'develop' into contrib/ti-simplelink
|
2018-09-12 09:27:43 +02:00 |
|
Afonso Oliveira
|
1e7e721395
|
correct identation
|
2018-09-10 10:49:06 +01:00 |
|
Afonso Oliveira
|
81429bf499
|
Merge branch 'develop' of https://github.com/contiki-ng/contiki-ng into develop
|
2018-09-10 10:42:48 +01:00 |
|
Atis Elsts
|
b774736f35
|
Add link stat packet counters
|
2018-09-09 21:43:40 +01:00 |
|
George Oikonomou
|
bf9fa6d34f
|
Fix multicast engine stats extension usage
|
2018-09-09 20:25:21 +01:00 |
|
George Oikonomou
|
bce7164827
|
Fix RPL classic compilation for TARGET sky
|
2018-09-09 20:10:53 +01:00 |
|
George Oikonomou
|
92b323c7d1
|
Merge branch 'develop' into validate-dio-before-init-dag
|
2018-09-08 11:27:04 +01:00 |
|
George Oikonomou
|
8e7d75435f
|
Merge branch 'develop' into update-tinydtls
|
2018-09-08 09:59:45 +01:00 |
|
Afonso Oliveira
|
65f34ad893
|
Merge branch 'develop' of https://github.com/contiki-ng/contiki-ng into develop
|
2018-09-08 01:15:21 +01:00 |
|
George Oikonomou
|
84be48ae32
|
Merge branch 'develop' into bug/set-correct-dns-record-expiration
|
2018-09-08 01:00:29 +01:00 |
|
George Oikonomou
|
cb6dd29e4a
|
Merge branch 'develop' into lafka-rpl-probing-guard
|
2018-09-08 00:08:44 +01:00 |
|