Commit Graph

465 Commits

Author SHA1 Message Date
Yasuyuki Tanaka
4206761ccf shell: add missing UIP_CONF_IPV6_RPL guard 2018-03-27 17:22:52 +02:00
Yasuyuki Tanaka
49e5cf3c8c sicslowpan: fix debug messages and remove TABs 2018-03-26 20:55:56 +02:00
Simon Duquennoy
146427724a TSCH-RPL: reset link statistics when leaving network 2018-03-25 07:02:32 -07:00
Simon Duquennoy
c6a5819d8d RPL local repair: do not reset link statistics 2018-03-25 06:31:01 -07:00
Simon Duquennoy
35bcaeb828
Merge branch 'develop' into infinite-ka-fix 2018-03-23 19:01:19 +01:00
Tim van der Lee
5b0c5b7007 Changed keepalive callback to avoid sending immediate keepalive when the network is congested 2018-03-23 11:40:05 +01:00
Simon Duquennoy
bc3e37e5e1
Merge branch 'develop' into pr/shell-improvement 2018-03-22 21:21:22 +01:00
Yasuyuki Tanaka
90248b6dc2 shell: minor fix on shell output message 2018-03-22 17:42:21 +00:00
Yasuyuki Tanaka
ecd64846a8 shell: add NULL pointer check 2018-03-22 17:41:54 +00:00
Yasuyuki Tanaka
fb5fa58ec3 shell: replace TAB with spaces 2018-03-22 17:37:14 +00:00
Yasuyuki Tanaka
039d5b4c8d shell: increase buffer size for SHELL_OUTPUT() 2018-03-22 17:36:10 +00:00
Simon Duquennoy
e19a7f1a40 Fix a number of comments in rpl-lite/rpl-timers.c 2018-03-21 09:34:41 -07:00
Joakim Eriksson
0c31f4dd95
Merge branch 'develop' into wip/button-hal 2018-03-21 07:19:51 +01:00
Johan Liseborn
512d648319
Merge branch 'develop' into fix_observer 2018-03-20 10:32:09 +01:00
Simon Duquennoy
eb62a7894c nbr_table_register: make sure not to register a given table twice 2018-03-19 12:09:07 -07:00
Simon Duquennoy
baa02a76f2 nbr_table_is_registered: prevent potential buffer overflow 2018-03-19 12:08:02 -07:00
Simon Duquennoy
fc053b15b9 Rename nbr_table_is_register to nbr_table_is_registered 2018-03-19 12:05:32 -07:00
Simon Duquennoy
850e6fefb3 RPL-Lite: initialize rpl-neighbor module only once, in rpl.c 2018-03-19 11:51:40 -07:00
George Oikonomou
a8c9931257 Add a function to retrieve a button by index 2018-03-18 12:50:37 +00:00
George Oikonomou
180a52b4ff Add a way to retrieve device button count 2018-03-18 12:50:37 +00:00
George Oikonomou
708127dfb8 Change variable to volatile 2018-03-18 00:10:10 +00:00
George Oikonomou
4dc15c0706 Don't manipulete ctimers inside interrupt context 2018-03-17 23:56:14 +00:00
George Oikonomou
d98d8f586f Fix code style 2018-03-17 23:55:00 +00:00
Niclas Finne
9b37e4b7fb Updated IPSO button to use the button HAL pressed/released events.
Removed support for the optional polarity resource to simplify the code.
2018-03-17 22:48:16 +00:00
George Oikonomou
c87aadc390 Change function to get button state to non-static 2018-03-17 22:05:56 +00:00
George Oikonomou
155e2c9b0a Support both old and new button API in common examples
This change is temporary so travis can pass until all platforms have been migrated to the new API
2018-03-14 09:34:47 +00:00
George Oikonomou
934856b4fd Introduce platform-independent HAL for buttons 2018-03-14 09:34:44 +00:00
Simon Duquennoy
7fe4d913b7
Merge branch 'develop' into contrib/build-all 2018-03-12 14:22:34 +01:00
George Oikonomou
c250cf93b7
Merge branch 'develop' into feature/ipv6_over_ble 2018-03-12 08:52:25 +00:00
Simon Duquennoy
a65dcea7ce uip6.c: label 'process' is only used when multicast AND routing are set 2018-03-09 16:29:06 +00:00
Simon Duquennoy
4bfab40a6c
Merge branch 'develop' into contrib/generic-leds 2018-03-02 20:15:19 +01:00
Simon Duquennoy
80c9f9ea1f http-socket.h: include cc.h instead of re-defining MAX 2018-03-02 08:11:22 -08:00
Simon Duquennoy
c1d9be1d01
Merge branch 'develop' into contrib/generic-leds 2018-03-02 17:06:04 +01:00
George Oikonomou
8dea154f81
Merge branch 'develop' into bugfix/tsch/slot-scheduling-d 2018-03-02 14:18:19 +00:00
Simon Duquennoy
aaa8658e8d tsch-log: fixed alignement of the log fields 2018-03-02 04:14:23 -08:00
Simon Duquennoy
a9a972b84a
Merge branch 'develop' into bugfix/tsch/slot-scheduling-d 2018-03-02 13:05:53 +01:00
Simon Duquennoy
b2148b8765 Remove uses of obsolete flag CONTIKI_TARGET_COOJA_IP64 2018-03-02 02:42:11 -08:00
Simon Duquennoy
2e3280b5c5
Merge branch 'develop' into contrib/csma-defaults 2018-03-02 10:06:37 +01:00
George Oikonomou
a1b9ba2630 Migrate to LED HAL (IPSO Objects) 2018-03-01 15:29:30 +00:00
George Oikonomou
e361440326 Introduce new LED Hardware Abstraction Layer 2018-03-01 15:29:28 +00:00
Atis Elsts
a64d5e0c18 Include strings.h for strncasecmp() 2018-03-01 13:34:31 +00:00
George Oikonomou
8f08ff1308 Add missing extern keyword
GCC assumes extern, but other toolchains complain about multiple variable definition at files including this header.
2018-02-28 12:51:26 +00:00
George Oikonomou
1f44c1530e
Merge branch 'develop' into contrib/tsch-print-schedule 2018-02-25 18:48:00 +00:00
George Oikonomou
92cc2843a8
Merge branch 'develop' into contrib/log-enabled 2018-02-25 17:44:32 +00:00
Simon Duquennoy
e30423f6cc
Merge branch 'develop' into contrib/gpio-hal 2018-02-25 18:17:32 +01:00
Simon Duquennoy
075d42ca24 Document LOG_*_ENABLED macros 2018-02-25 06:24:00 -08:00
Simon Duquennoy
ddaacdd41d Only use LOG_*_ENABLED flags from within C 'if' statements 2018-02-25 06:23:42 -08: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
Simon Duquennoy
16c4b2fe6c Removing obsolete flag RPL_NS_LINK_NUM 2018-02-24 15:27:40 -08:00
George Oikonomou
46cf366698
Merge branch 'develop' into contrib/PRI 2018-02-24 15:03:46 +00:00
George Oikonomou
565305d6c3 Introduce new GPIO Hardware Abstraction Layer 2018-02-24 12:50:01 +00:00
Simon Duquennoy
9596a4285e Use PRI macros for safe printf and logs 2018-02-23 10:58:45 -08:00
Atis Elsts
b2eba53df9 TSCH: fix a bug in tsch_schedule_slot_operation scheduling 2018-02-23 14:17:37 +00:00
Simon Duquennoy
8f742a1a62 tsch_schedule_print: use LOG_PRINT instead of printf 2018-02-23 05:56:39 -08:00
Simon Duquennoy
70b43e0bf6 Logging module: added ability to force logging 2018-02-23 05:28:40 -08:00
Johan Liseborn
9aaba942e1 Handle block-wise transfer in observer notifications 2018-02-23 09:41:30 +01:00
Johan Liseborn
22e131bc6d Remove unused list of periodic services
The coap_resource_periodic_services list is no longer used, but it still
breaks the the observer functionality, so it should be removed.
2018-02-23 09:36:35 +01:00
Niclas Finne
309745780e Removed the remaining Contiki Interface declaration macros (CCIF/CLIF) 2018-02-21 01:14:10 +01:00
Simon Duquennoy
8aec2ac030 Fix lwm2m header inclusions 2018-02-02 11:14:53 -08:00
Simon Duquennoy
fe7ded0762 Routing API: add function node_has_joined 2018-02-02 08:51:29 -08:00
Simon Duquennoy
123105ab20 Move source routing state management from RPL Lite and RPL Classic to uip. 2018-02-02 08:51:29 -08:00
Simon Duquennoy
62d128f5c7 RPL Classic: added stub implementations of NS functions when NS is disabled 2018-02-02 08:51:29 -08:00
Simon Duquennoy
f8ddf8c816 Added missing includes for modules that rely on RPL 2018-02-02 08:51:29 -08:00
Simon Duquennoy
229cec630c RPL Classic: use full inclusion paths 2018-02-02 08:50:17 -08:00
Simon Duquennoy
627cb3de9c Homogenize access to RPL non-storing links from external modules 2018-02-02 08:50:17 -08:00
Simon Duquennoy
e1088e59d7 Fix includes for tsch-rpl module 2018-02-02 08:50:17 -08:00
Simon Duquennoy
65cbc45145 Rename routing module flags 2018-02-02 08:50:17 -08:00
Simon Duquennoy
5f4ad6d657 Fix compilation of multicast engines smrf and esmrf 2018-02-02 08:50:17 -08:00
Simon Duquennoy
7adfb92b63 Routing module configuration through netstack.h 2018-02-02 08:50:17 -08:00
Simon Duquennoy
f117770131 Fix inclusion paths 2018-02-02 08:50:17 -08:00
Simon Duquennoy
26d51c15d7 Routing API: added more missing functions, homogenize configuration 2018-02-02 08:50:17 -08:00
Simon Duquennoy
15b81c0fe5 Fix protocol-dependent def of UIP_MAX_ROUTES 2018-02-02 08:48:37 -08:00
Simon Duquennoy
fb8bf3d02d Remove unused define in uip6.c 2018-02-02 08:48:37 -08:00
Simon Duquennoy
b01c2d9802 Fix shell-commands.c 2018-02-02 08:48:37 -08:00
Simon Duquennoy
c9861b0726 Routing API: added neighbor_state_changed 2018-02-02 08:48:37 -08:00
Simon Duquennoy
c6f2364bd8 RPL Classic: fix rpl-ext-headers.c 2018-02-02 08:48:37 -08:00
Simon Duquennoy
dfa7d735ac Added necessary includes 2018-02-02 08:48:37 -08:00
Simon Duquennoy
4ffab13eeb Routing API: drop_route 2018-02-02 08:48:37 -08:00
Simon Duquennoy
eaa3b6ad79 Routing API: added link_callback 2018-02-02 08:48:37 -08:00
Simon Duquennoy
fac66307f6 RPL Lite: enable custom configuration of RPL_CONF_WITH_NON_STORING 2018-02-02 08:48:37 -08:00
Simon Duquennoy
fdbd89d018 Routing API: added ext_header_srh_update 2018-02-02 08:48:37 -08:00
Simon Duquennoy
25e07b7d23 Routing API: added ext_header_hbh_update 2018-02-02 08:48:37 -08:00
Simon Duquennoy
54655335c6 Routing API: added ext_header_update 2018-02-02 08:48:37 -08:00
Simon Duquennoy
4cdf2d4819 Routing API: added ext_header_srh_get_next_hop 2018-02-02 08:48:37 -08:00
Simon Duquennoy
03bab6f119 Routing API: added ext_header_remove 2018-02-02 08:48:37 -08:00
Simon Duquennoy
53facf941e Routing API: added toplogy repair 2018-02-02 08:48:37 -08:00
Simon Duquennoy
4cab396d48 Shell: explicitly include rpl-ns.h when needed 2018-02-02 08:47:46 -08:00
Simon Duquennoy
ab41114727 'rpl_init' is now static, rename to 'init' 2018-02-02 08:47:46 -08:00
Simon Duquennoy
8db37afb28 Adding missing functions in nullrouting.c 2018-02-02 08:47:46 -08:00
Simon Duquennoy
bc73bb3284 Added root_start to routing driver 2018-02-02 08:47:46 -08:00
Simon Duquennoy
83e9414a71 Add root_set_prefix to routing driver 2018-02-02 08:47:21 -08:00
Simon Duquennoy
4c9f62ebe4 Added NETSTACK_ROUTING for routing protocol selection. Only used for init() so far. 2018-02-02 08:47:21 -08:00
Simon Duquennoy
7ddee2c66a Move rpl-lite and rpl-classic to os/net/routing 2018-02-02 08:47:21 -08:00
Simon Duquennoy
14ccd337c9 rpl_dag_root module simplification 2018-02-02 08:47:21 -08:00
Simon Duquennoy
871ee1e34f Added routing module with only routing.h, now included wherever RPL is used 2018-02-02 08:45:02 -08:00
George Oikonomou
63a96752c8
Merge branch 'develop' into contrib/coap-lwm2m-dtls 2018-02-01 00:17:38 +00:00
Joakim Eriksson
3418bc7435
Merge branch 'develop' into nbr-fixes 2018-01-27 23:31:56 +01:00
Simon Duquennoy
8f7c4fb977 Shell: do not disable logging at init 2018-01-27 11:35:37 -08:00
Simon Duquennoy
d9e3abac2f Native BR: add makefile target 'connect-router-cooja' 2018-01-27 08:26:12 -08:00
Joakim Eriksson
50642b3e49 removed unused code and sensors on Sky slip-radio 2018-01-27 14:52:14 +01:00
Joakim Eriksson
1c0e76025b fixed slip-radio config, added shell to NBR and added parsing to no-framer 2018-01-26 22:59:48 +01:00
Niclas Finne
d3613ba10f Updated tinyDTLS submodule to remove some debug output 2018-01-19 13:26:47 +01:00
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