Commit Graph

362 Commits

Author SHA1 Message Date
Niclas Finne a18aaa4e26 Show compile information about tinyDTLS license only once. 2018-01-19 06:49:53 +01:00
Niclas Finne 833da8df76 Added compile information about license when including tinyDTLS in build 2018-01-17 20:03:28 +01:00
Niclas Finne 6562b78c6c Updated DTLS support for new logging system 2018-01-17 20:02:40 +01:00
Niclas Finne 8a44da0814 Updated tinydtls submodule 2018-01-17 20:00:18 +01:00
Niclas Finne e746b024f0 CoAP: fixed typo in Doxygen comment 2018-01-12 18:57:14 +01:00
Niclas Finne ee65ba289e lwm2m: moved LWM2M object resource IDs to each object header file.
Added Doxygen groups in CoAP and LWM2M.
2018-01-12 01:25:27 +01:00
Niclas Finne 811a62d8db lwm2m: made LWM2M security object URI and key size configurable + fixed typo 2018-01-12 01:20:53 +01:00
Niclas Finne 2d31c06a1e CoAP: renamed OPTION_MAP_SIZE to COAP_OPTION_MAP_SIZE for consistency 2018-01-12 01:20:53 +01:00
Niclas Finne e37dd179d1 CoAP: added missing UIP_LLH_LEN in buffer size check as described by
Laurent Deru in #242.
2018-01-12 01:20:53 +01:00
Niclas Finne 11b005c7a4 Updated tinydtls submodule to address some Doxygen issues 2018-01-12 01:20:53 +01:00
Niclas Finne 5051b18ac9 LWM2M: changed to 30 sec RD client registration 2018-01-12 01:20:53 +01:00
Niclas Finne c9cafb826d LWM2M: fixed token comparison to use token length 2018-01-12 01:20:53 +01:00
Joakim Eriksson 43466683ff fixed issues with the RD client 2018-01-12 01:20:53 +01:00
Joakim Eriksson 18cd711050 fixed issue with bootstrap and write of security and server object 2018-01-12 01:20:53 +01:00
Niclas Finne 04acccf9a0 Fixed compiler warnings in LWM2M logging 2018-01-12 01:20:53 +01:00
Niclas Finne 770ace0339 Removed reference to unused variable in the logging module 2018-01-12 01:20:53 +01:00
Niclas Finne ffffb0a9ad Fixed compiler warning in CoAP logging 2018-01-12 01:20:53 +01:00
Niclas Finne c9d255b847 Updated LWM2M to use the logging module 2018-01-12 01:20:53 +01:00
Niclas Finne 49d38e6d06 Added LWM2M runtime log level to the logging module 2018-01-12 01:20:53 +01:00
Niclas Finne 4c56184a9b Updated CoAP to use the logging module 2018-01-12 01:20:53 +01:00
Niclas Finne 21d464952b Added CoAP runtime log level to the logging module 2018-01-12 01:20:53 +01:00
Niclas Finne 0731c4f158 Added functions in uiplib to print a IP address to string and normal
output. Changed uip-debug to use the uiplib functions instead of its
own print functions.
2018-01-12 01:20:53 +01:00
Joakim Eriksson 6c729f50d6 added lwm2m-ipso test 2018-01-12 01:20:53 +01:00
Joakim Eriksson c86b763e5d renamed coap packet to coap message - for naming closer to RFC 2018-01-12 01:20:53 +01:00
Niclas Finne a866fcbfad CoAP: replaced coap_send_message() with coap_sendto() that returns
number of bytes sent or error.
2018-01-12 01:20:52 +01:00
Niclas Finne 074391fa7d CoAP: Various updates in coap-uip transport implementation
* Mark endpoint as secure regardless if DTLS peer exists or not
* Drop CoAP transmissions to endpoints that are not connected
* Debug output cleanup
2018-01-12 01:20:52 +01:00
Joakim Eriksson 379a3fac2b LWM2M fixed doxygen compile issues 2018-01-12 01:18:41 +01:00
Niclas Finne 082f4b920c ipso-objects: updated IPSO objects sensor/controllers to latest LWM2M API.
Added macros to setup IPSO sensor and control template data structs.
2018-01-12 01:18:41 +01:00
Niclas Finne ebb329de5c CoAP: added make option to specify CoAP DTLS keystore to use by default.
The currently available options are:

* none   - No keystore registered.
* simple - Keystore using fixed PSK credentials.
* lwm2m  - Keystore based on LWM2M security objects

If an application wants to provide its own keystore, it selects 'none'
and registers its own at startup.
2018-01-12 01:18:41 +01:00
Joakim Eriksson 725e426c61 LWM2M: replace space with dash in endpoint name 2018-01-12 01:18:41 +01:00
Niclas Finne 83446e3f58 Imported ipso-objects from lwm2m-contiki at https://github.com/sics-iot/lwm2m-contiki 2018-01-12 01:18:41 +01:00
Niclas Finne 49d9ec182d Imported OMA LWM2M from lwm2m-contiki at https://github.com/sics-iot/lwm2m-contiki 2018-01-12 01:18:41 +01:00
Niclas Finne ee8d85bde8 Imported CoAP from lwm2m-contiki at https://github.com/sics-iot/lwm2m-contiki 2018-01-12 01:18:41 +01:00
Niclas Finne a0ec1a4065 Added tinyDTLS standalone as submodule 2018-01-12 01:18:41 +01:00
spoerk f8d2c3fa48 code style fixes 2018-01-03 15:52:36 +01:00
spoerk 604e846ff1 Merge branch 'develop' of github.com:contiki-ng/contiki-ng into feature/ipv6_over_ble 2018-01-03 15:27:42 +01:00
spoerk 2a49608af6 link layer problem fixed 2018-01-03 14:51:23 +01:00
spoerk 35c08597e6 BLE L2CAP moved to the other MAC implementations 2018-01-03 14:36:14 +01:00
George Oikonomou bcd75789d5 Make sure we don't add the same item twice
Fixes #254
2017-12-22 16:42:55 +02:00
George Oikonomou fe2c960756 Tidy-up codestyle 2017-12-22 16:42:55 +02:00
George Oikonomou b6aac6b008 Don't define NULL internally 2017-12-22 16:42:54 +02:00
George Oikonomou f56822e968 Include contiki.h to pull in possible configuration 2017-12-22 16:42:54 +02:00
Simon Duquennoy 7f1dd819ef RPL BR: remove platform-specific code for sky. Add putchar with SLIP support to arch, like in other platforms 2017-12-22 05:21:39 -08:00
Simon Duquennoy 91ca67d393 CI: minor printout fix 2017-12-22 05:21:39 -08:00
Simon Duquennoy 6de6e15ce7 Move RPL border router from example to os/services 2017-12-22 05:21:39 -08:00
Simon Duquennoy 84ea0971bc Remove obsolete flag AUTOSTART_ENABLE, as well as .co and .ce files 2017-12-22 05:21:39 -08:00
Laurent Deru c26aed5565 Always select a global address within the DODAG 2017-12-21 10:32:11 +01:00
Simon Duquennoy 836249a8c8
Merge branch 'develop' into fix-ra-rdnss 2017-12-20 12:42:34 +01:00
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
spoerk fd0f0ca4b6 Merge branch 'develop' of github.com:contiki-ng/contiki-ng into feature/ipv6_over_ble 2017-12-15 11:41:27 +01:00
spoerk 7a7c4e0015 added support for IPv6 over BLE communication 2017-12-15 11:20:44 +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