Simon Duquennoy
7286491c16
Merge branch 'develop' into fix-ra-rdnss
2017-12-20 11:37:55 +01:00
Simon Duquennoy
8b14fc8d4a
Merge branch 'develop' into fix-non-router-compilation
2017-12-20 11:37:06 +01:00
Laurent Deru
425b463df8
Fix logic of RA flags related to RDNSS
2017-12-20 10:23:16 +01:00
Laurent Deru
4b43e4971b
Fix compilation error when not in Router mode
2017-12-20 10:14:11 +01:00
George Oikonomou
e87e3850c4
Add circular, doubly-linked list library
2017-12-13 16:38:50 +00:00
George Oikonomou
09d6b123ab
Add doubly-linked list library
2017-12-13 16:38:50 +00:00
George Oikonomou
b82ca1a5ef
Add circular, singly-linked list library
2017-12-13 16:38:50 +00:00
George Oikonomou
9dab37eae4
Add queue library
...
This commit adds a queue library as a wrapper around the list library
2017-12-13 16:38:50 +00:00
George Oikonomou
8356183907
Add stack library
...
This commit adds a stack library as a wrapper around the list library
2017-12-13 16:38:50 +00:00
Simon Duquennoy
b938ad9aa7
Merge branch 'develop' into fix-icmp-error-source
2017-12-12 19:33:04 +01:00
Simon Duquennoy
a7e5cf85cf
Merge branch 'develop' into fix-rpl-ext-header-remove
2017-12-12 19:02:14 +01:00
Simon Duquennoy
6125637e40
Merge branch 'develop' into fix-rpl-classic-addr-autoconf-root
2017-12-12 18:05:01 +01:00
Simon Duquennoy
980a420b44
Merge branch 'develop' into fix-rpl-classic-multi-dodag-probing
2017-12-12 16:54:44 +01:00
Laurent Deru
3b24a57ad2
Move to next header when encountering DESTO instead of aborting the loop in rpl_ext_header_remove()
2017-12-12 16:17:20 +01:00
Laurent Deru
5bf06d851d
rpl_ext_header_remove() should only remove RPL Hop-by-Hop extention header
2017-12-12 16:17:20 +01:00
Simon Duquennoy
efb1f13c9e
Merge branch 'develop' into fix-missing-llhlen
2017-12-12 16:12:20 +01:00
Laurent Deru
aae6276b56
Add missing UIP_LLH_LEN
2017-12-12 16:06:45 +01:00
Simon Duquennoy
118912d681
Merge branch 'develop' into fix-update-proto-remove-ext-hdr
2017-12-12 15:38:48 +01:00
Simon Duquennoy
66de2395fe
Merge branch 'develop' into fix-sicslowpan-llhlen
2017-12-12 13:54:59 +01:00
Simon Duquennoy
d609fb9eec
Merge branch 'develop' into fix-sicslowpan-llhlen
2017-12-12 13:49:16 +01:00
Laurent Deru
74efdf688e
Always try to find the best dag
2017-12-12 13:35:29 +01:00
Simon Duquennoy
eadb9ea219
Merge branch 'develop' into fix-rpl-classic-addr-autoconf-root
2017-12-12 12:07:27 +01:00
Laurent Deru
a79fa13805
Additional cleanup when becoming DODAG Root (rpl-classic)
2017-12-12 09:27:27 +01:00
George Oikonomou
7be2524e1b
Merge branch 'develop' into contrib/uipbuf
2017-12-11 21:48:20 +00:00
George Oikonomou
79450eb10a
Merge branch 'develop' into fix-multicast-llhlen
2017-12-11 21:47:18 +00:00
Laurent Deru
a97148abd4
Make multicast route lifetime identical to unicast routes
2017-12-11 18:00:36 +01:00
Laurent Deru
ebb1f5475e
Always use uip_ds6_select_src when sending back an icmp error
2017-12-11 17:49:26 +01:00
Laurent Deru
b782cda837
Do RPL probing on all the known DAG
2017-12-11 17:48:16 +01:00
Laurent Deru
52f7e4a9f5
Don't autoconfigure address on RPL Root
2017-12-11 17:45:55 +01:00
Laurent Deru
2bf9031b02
Update proto field in remove_ext_hdr()
2017-12-11 16:10:37 +01:00
Laurent Deru
418d792a4b
Sicslowpan uses twice UIP_LLH_LEN for IPPAYLOAD_BUF
2017-12-11 16:08:43 +01:00
Laurent Deru
ed239372c1
Use UIP_LLH_LEN in multicast engines and add more traces
2017-12-11 15:40:18 +01:00
Joakim Eriksson
bd6de2401f
added some documentation
2017-12-10 21:17:37 +01:00
Atis Elsts
5caff5290c
Readd back 'uip_stat' if UIP_STATISTICS is enabled
2017-12-10 20:04:14 +00:00
George Oikonomou
7cd076a199
Add mutex API and generic implementation
2017-12-09 17:09:57 +00:00
George Oikonomou
1b89bba47e
Add library for critical section entry/exit
2017-12-09 17:09:57 +00:00
George Oikonomou
a6dbc589a1
Add an API for memory barriers
2017-12-09 17:09:56 +00:00
George Oikonomou
21809648ad
Add a master interrupt manipulation API
2017-12-09 17:08:31 +00:00
Joakim Eriksson
85eff304be
set MAX_MAC_TRANSMISSION to undefined in uipbuf clear
2017-12-09 10:22:19 +01:00
Joakim Eriksson
52e012d3c1
optimized flash usage due to fit sky
2017-12-09 10:22:19 +01:00
Joakim Eriksson
1356994795
added support for usage of the transmission count attirbute in uipbuf
2017-12-09 10:22:19 +01:00
Joakim Eriksson
941ddf35b8
IPv6: added uipbuf attributes similar to packetbuf
2017-12-09 10:22:19 +01:00
George Oikonomou
05c65f3c4a
Update documentation
2017-12-08 17:07:33 +00:00
Simon Duquennoy
e795517750
Merge branch 'develop' into contrib/stack-guard
2017-12-05 15:16:54 +01:00
Atis Elsts
f9516eae73
Add stack check library and example
2017-12-01 13:35:06 +00:00
Joakim Eriksson
646b3bcbe8
Merge branch 'develop' into contrib/logging-custom-prefix
2017-12-01 07:21:01 +01:00
Niclas Finne
91e3fa37d7
Added comment to the custom module prefix function in the logging module.
2017-11-30 22:40:09 +01:00
Niclas Finne
11b50009e9
Extend the logging module to support custom module prefix
2017-11-30 16:19:39 +01:00
Simon Duquennoy
4a790b8904
Merge branch 'develop' into contrib/coap-fix
2017-11-29 20:26:48 +01:00
Simon Duquennoy
a24a05f269
Fix CoAP bug with option parsing
2017-11-29 08:39:10 -08:00
George Oikonomou
1ba2eac5cb
Use slip_write to slip_send
2017-11-24 12:31:21 +00:00
George Oikonomou
f9e17a6c76
Document slip_write
2017-11-24 12:31:20 +00:00
George Oikonomou
3e93e21646
Change return type of slip_send to void
...
The return value was not checked anywhere in the code
2017-11-24 12:31:20 +00:00
George Oikonomou
38df9fdfb2
Change slip_write return type and use it where possible
2017-11-24 12:31:20 +00:00
George Oikonomou
8f2fa80401
Make SLIP stats properly configurable
2017-11-24 12:31:20 +00:00
George Oikonomou
7fd76dc23e
Change variables to static
2017-11-24 12:31:20 +00:00
George Oikonomou
4522b5b942
Tidy-up file structure and code style
2017-11-24 12:31:20 +00:00
George Oikonomou
24b17e58b1
Remove dead code and obsolete comments
2017-11-24 12:31:20 +00:00
George Oikonomou
80bfbe67e8
Include headers unconditionally
2017-11-21 15:13:57 +00:00
Joakim Eriksson
a5039634d5
fixed rpl-classic bug and moved the two lifetime loops into one
2017-11-17 11:58:17 -08:00
Simon Duquennoy
cbdc3e4569
RPL non-storing mode: increase routing state lifetime by one period (60s) so as to ensure no link espired before its avertised lifetime
2017-11-17 11:58:17 -08:00
Simon Duquennoy
faf526b441
Merge branch 'develop' into contrib/remove-mt
2017-11-17 19:40:06 +01:00
Simon Duquennoy
83fb4b68b5
Merge branch 'develop' into contrib/traceroute
2017-11-17 17:26:17 +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
Simon Duquennoy
0bd107b0a0
uIP6 forwarding: clearer log messages
2017-11-14 10:04:31 +01:00
Simon Duquennoy
071f542078
uIP6: check MTU, check and update TTL even in the case of routing header forwarding
2017-11-13 16:37:23 +01:00
Xenofon (Fontas) Fafoutis
f206ee6fe6
Bugfix in HAL for LEDs. Static variable leds removed.
...
Bugfix in HAL for LEDs. Inline function show_leds removed.
2017-11-13 15:10:23 +00:00
Xenofon (Fontas) Fafoutis
828ed7a9c6
Bugfix in HAL for LEDs. Static variable leds did not get updated.
2017-11-13 13:05:08 +00:00
Simon Duquennoy
0952960b91
Removing multi-threading support
2017-11-11 15:28:11 +01:00
Simon Duquennoy
80ddae94d0
Merge branch 'develop' into develop
2017-11-09 16:13:15 +01:00
Simon Duquennoy
1a4efcd38d
TSCH: when not sending KA, issue LOG_ERR rather than LOG_INFO
2017-11-09 16:13:00 +01:00
Simon Duquennoy
f5511dfbd5
Doxygen: add more descriptions in rpl-lite/rpl-types.h
2017-11-07 15:46:36 +01:00
Simon Duquennoy
ae9aaf7632
Doxygen: fix glitch that caused some of the rpl-lite not to be included in the documentation
2017-11-07 15:46:36 +01:00
Michael Karlsson
c33c10540a
Avoid tsch crash when loosing timesource
2017-11-07 01:43:54 +01:00
Niclas Finne
36362a49d3
Added energest configuration to viewconf
2017-11-02 00:10:56 +01:00
Simon Duquennoy
1275c4cb9e
Merge pull request #139 from nfi/contrib/energest-deep-lpm
...
New energest type for deep sleep plus configurable type for Energest time source
2017-10-31 23:24:12 +01:00
George Oikonomou
73544572cf
Change all calls to adhere to new prototype
2017-10-31 21:56:38 +00:00
George Oikonomou
e1df7be496
Change slip_arch_init prototype
...
All current platforms ignore the ubr argument, so we remove it
2017-10-31 21:56:38 +00:00
Niclas Finne
e6ba2664b8
energest: removed include of energest from contiki.h to avoid circular dependency
2017-10-31 22:18:17 +01:00
Niclas Finne
cffe0c59f2
energest: activate energest type CPU at init
2017-10-31 22:18:17 +01:00
Niclas Finne
1c4622bad6
energest: Added new energest type ENERGEST_TYPE_DEEP_LPM to support
...
energy estimations of both sleep and deep sleep CPU modes.
Added configurable type ENERGEST_TIME_T to re-add support for clocks with
wrapping time as energest time source.
2017-10-31 22:17:30 +01:00
Simon Duquennoy
d9ae1118ef
Merge pull request #137 from simonduq/pr/logging-fixes
...
Minor logging fixes
2017-10-31 22:04:46 +01:00
Simon Duquennoy
d494ee85c7
Fix logging in uip-ds6.c
2017-10-31 16:16:04 +01:00
Simon Duquennoy
3bb8123038
Fix RPL log message
2017-10-30 21:49:02 +00:00
George Oikonomou
d6872f8cd9
Extend documentation
2017-10-29 23:18:39 +00:00
Simon Duquennoy
0321da5e88
Main: initialize modules only after phase three
2017-10-29 23:18:39 +00:00
Simon Duquennoy
56d1f795ff
Minor fixes to platform initialization
2017-10-29 23:18:38 +00:00
George Oikonomou
5cbb82b9e0
Remove definition of old startup verbosity macros
2017-10-29 23:18:38 +00:00
George Oikonomou
66aa99d78e
Use the logging module (Main)
2017-10-29 23:18:37 +00:00
George Oikonomou
e9509be98c
Extend the logging module to support the common main + platform-specific hooks
2017-10-29 23:18:37 +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
George Oikonomou
adbe10881f
Return a value in our main()
2017-10-29 23:18:36 +00:00
George Oikonomou
5d95f8bd54
Hand main()'s arguments over to the platform
2017-10-29 23:18:36 +00:00
George Oikonomou
c3c5668ccd
Update documentation to use \os
2017-10-29 23:18:36 +00:00
George Oikonomou
f2ee2c706c
Call startup sequence stage 3 later
2017-10-29 23:18:36 +00:00
George Oikonomou
f89da621d9
Allow our main to accept arguments
2017-10-29 23:18:36 +00:00
George Oikonomou
d776ba035b
Allow the platform to provide its own main loop
2017-10-29 23:18:35 +00:00
George Oikonomou
476e311ea7
Initialise watchdogs in the common main
2017-10-29 23:18:35 +00:00
George Oikonomou
0ca938245f
Add implementation of the common main routine
2017-10-29 23:18:35 +00:00
George Oikonomou
9c20dc37c2
Add header file and documentation for a common main
2017-10-29 23:18:34 +00:00
George Oikonomou
21f5ff8edf
Fix RPL configuration in mcast scenarios
2017-10-28 21:46:46 +01:00
Simon Duquennoy
0f1dd71124
nbr-table: fix default value for NBR_TABLE_MAX_NEIGHBORS
2017-10-26 16:29:04 +02:00
George Oikonomou
521d5c5aec
Make logging module/level prefix optional
2017-10-18 01:11:06 +01:00
Simon Duquennoy
882be25428
Merge pull request #94 from simonduq/pr/misc
...
Miscellaneous fixes
2017-10-14 09:24:45 +02:00
Simon Duquennoy
4d8277366d
Merge pull request #97 from sics-iot/contrib/cleanup-energest
...
Made energest more configurable
2017-10-14 09:24:14 +02:00
Simon Duquennoy
12a953cd88
Merge pull request #98 from nvt/remove-arg-module
...
Remove obsolete argument buffer module
2017-10-14 09:19:45 +02:00
Joakim Eriksson
7af63c740c
Merge pull request #96 from sics-iot/contrib/remove-radio-sensor
...
Removed obsolete radio-sensor API
2017-10-13 18:54:43 +02:00
Simon Duquennoy
40e6b4be61
Fix typo in comment
2017-10-13 16:55:59 +02:00
Nicolas Tsiftes
d0c7c7c0ec
Remove obsolete argument buffer module.
2017-10-13 14:38:29 +02:00
Niclas Finne
c845ea7453
Removed obsolete library procinit
2017-10-13 13:23:23 +02:00
Niclas Finne
358385b450
Removed obsolete radio-sensor API
2017-10-13 01:06:47 +02:00
Niclas Finne
18b5f6d667
energest: made energest more configurable
...
* energest time defaults to rtimer but can be configured via
ENERGEST_CONF_CURRENT_TIME and ENERGEST_CONF_SECOND.
* Additional energest types can be added by platform and application
using ENERGEST_CONF_PLATFORM_ADDITIONS and ENERGEST_CONF_ADDITIONS.
* Energest times are now 64 bit and thereby non-wrapping in most systems.
* Removed unused energest types for serial and sensors.
2017-10-13 00:17:30 +02:00
Niclas Finne
888a04e70f
energest: removed support for ENERGEST_CONF_LEVELDEVICE_LEVELS
2017-10-13 00:05:31 +02:00
Niclas Finne
7317316942
energest: removed energest type ENERGEST_TYPE_IRQ
2017-10-12 23:57:38 +02:00
Niclas Finne
8b930bfa06
energest: removed energest types for reading/writing flash
2017-10-12 23:53:31 +02:00
Niclas Finne
68a8a0c445
energest: removed energest types for LEDs
2017-10-12 23:52:03 +02:00
Simon Duquennoy
663d1f121d
Autoconfigure Orchestra whenever the module is included
2017-10-12 18:32:19 +02:00
Simon Duquennoy
81fe587574
Shell-commands: RPL commands are only compatible with rpl-lite. Disable them when rpl-lite is not used.
2017-10-12 17:09:29 +02:00
Simon Duquennoy
623fdf4a96
Shell tsch-set-coordinator: enable setting security
2017-10-12 17:09:26 +02:00
Simon Duquennoy
d26e5fb489
TSCH: automatically leave the network when setting as coordinator/node
2017-10-12 17:09:23 +02:00
Simon Duquennoy
741a1d5816
Shell: stop tsch_log at init
2017-10-12 17:09:13 +02:00
Simon Duquennoy
f14d6d4afe
Shell: added command tsch-set-coordinator
2017-10-12 17:09:10 +02:00
Simon Duquennoy
9590b21888
TSCH: default Max EB period to 16s
2017-10-12 17:09:07 +02:00
Simon Duquennoy
c320717d9a
tsch-log: fix autoconfiguration of TSCH_LOG_PER_SLOT
2017-10-12 17:09:01 +02:00
Simon Duquennoy
27e0357595
Shell: do not use tsch-logs when not enabled
2017-10-12 17:08:58 +02:00
Simon Duquennoy
a89df3b279
TSCH-RPL: configure callbacks automatically
2017-10-12 17:08:55 +02:00
Simon Duquennoy
1b97641e7f
rpl-lite: simplify SRH insertion
2017-10-12 17:08:51 +02:00
Simon Duquennoy
02f5929ade
insert_srh_header: return 0 when failing to insert SRH due too packet too long
2017-10-12 17:08:48 +02:00
Simon Duquennoy
a1f74d6568
Shell: start automatically whenver the module is included
2017-10-12 17:08:42 +02:00
Simon Duquennoy
bf8cc69252
contiki-default-conf.h: unfold definitions for more readable 'viewconf'
2017-10-12 08:42:45 +02:00
Simon Duquennoy
77cae0f45c
Shell: prefix all lines with '#'
2017-10-11 17:43:26 +02:00
Simon Duquennoy
4c7d2a4bfc
Minor changes to shell-commands
2017-10-11 17:26:39 +02:00
Simon Duquennoy
48997bb3ad
Use 802.15.4 frames v2 by default only for TSCH, else fall back to v1
2017-10-11 17:26:08 +02:00
Simon Duquennoy
df01ebc219
Minor logging fixes
2017-10-11 17:25:07 +02:00
Simon Duquennoy
9d77bad2c2
sicslowpan: set SICSLOWPAN_COMPRESSION from .h file rather than .c, for integration with viewconf
2017-10-11 17:23:36 +02:00
Simon Duquennoy
c4f89ee44d
Minor changes to contiki-default-conf.h
2017-10-11 17:22:13 +02:00
Simon Duquennoy
9087448dc4
Removing from contiki-default-conf.h configuration flags that are now set from Makefile exclusively
2017-10-10 21:04:36 +02:00
George Oikonomou
163ccafcba
Fix erroneous comment
2017-10-08 17:03:04 +01:00
George Oikonomou
ab7b4676e0
Make CoAP more configurable
2017-10-08 17:00:37 +01:00
George Oikonomou
3a90439778
Make serial line special char values configurable
2017-10-08 17:00:37 +01:00
Simon Duquennoy
e81864e8d8
NullNet: move buffer variables from examples to os/net module
2017-10-08 14:56:47 +02:00
Simon Duquennoy
32e9c5067e
Fix netstack.h comment
2017-10-08 14:50:07 +02:00
Simon Duquennoy
fb0de6dd7a
Various fixes to netstack config
2017-10-08 14:47:34 +02:00
Joakim Eriksson
1143d6f5aa
addressed some of the suggestions on the PR - naming and netstack MAC
2017-10-08 00:44:02 +02:00
Joakim Eriksson
761d19dafc
fixed nullnet to work with new network interface
2017-10-08 00:44:02 +02:00
Joakim Eriksson
8cf65ed01a
changed NETSTACK configuration on network layer
2017-10-08 00:44:02 +02:00
Joakim Eriksson
1b2b043f24
fixed nullnet and its examples
2017-10-08 00:44:02 +02:00
Joakim Eriksson
f73454071f
added an example for packet processing - and added uipbuf module for header processing
2017-10-08 00:44:02 +02:00
Joakim Eriksson
0f9207640b
added netstack-ip-processor
2017-10-08 00:44:02 +02:00
Joakim Eriksson
ac12496e6d
added output function to network layer
2017-10-08 00:44:02 +02:00
