Commit Graph

293 Commits

Author SHA1 Message Date
Simon Duquennoy
661f4c5023 Use logging module for MAC layers 2017-06-21 17:09:37 +02:00
Nicolas Tsiftes
7e273ff48c Removed servreg-hack. 2017-06-16 15:37:14 +02:00
Simon Duquennoy
880e69f770 Merging csma and nullrdc 2017-05-17 21:50:33 +02:00
Simon Duquennoy
6366ad162e Fix makefiles for native-border-router and sensniff 2017-05-17 15:30:36 +02:00
Simon Duquennoy
d1641530dd Merge branch 'wip/platform-cleanup' into wip/mac-rdc
Conflicts:
	drivers/dev/cc2520/cc2520.c
	drivers/platform/wismote/Makefile.wismote
	drivers/platform/wismote/contiki-conf.h
	drivers/platform/wismote/contiki-wismote-main.c
	drivers/platform/z1/Makefile.z1
	drivers/platform/z1/contiki-conf.h
	drivers/platform/z1/contiki-z1-main.c
	examples/ipso-objects/cooja-example-ipso-objects.csc
	examples/rssi-scanner/Makefile
2017-05-17 15:13:16 +02:00
Simon Duquennoy
aa1191d8f0 Remove RDC layer 2017-05-17 15:09:19 +02:00
Simon Duquennoy
bd6f26963a Fix cc2538-common example makefile 2017-05-17 15:09:07 +02:00
Simon Duquennoy
95323b9ce7 Remove channel_check_interval 2017-05-17 14:34:29 +02:00
Simon Duquennoy
c3559a6df3 slip-radio: use CSMA instead of nullmac 2017-05-17 14:26:53 +02:00
Simon Duquennoy
5a04f1969e Remove explicit configuration of nullrdc as it is the new default 2017-05-17 14:19:14 +02:00
Simon Duquennoy
8cc5e082ac Removing more refs to old platforms 2017-05-17 13:56:30 +02:00
Simon Duquennoy
802e498380 Removed refs to econotag and micaz 2017-05-17 13:49:51 +02:00
Simon Duquennoy
766c0e21dd Removing platform z1 2017-05-17 13:48:01 +02:00
Simon Duquennoy
e7088ec6c4 Removing platform wismote 2017-05-17 13:37:27 +02:00
Simon Duquennoy
35a9984122 Removing the need for nullrdc-noframer 2017-05-16 22:12:40 +02:00
Simon Duquennoy
e8efe98c71 Use nullmac less 2017-05-16 22:12:36 +02:00
Simon Duquennoy
8a988396d7 New default: CSMA over 802.15.4 2017-05-16 22:12:29 +02:00
Simon Duquennoy
a980593bd6 Added framer sub-directory to core/net/mac 2017-05-16 21:05:21 +02:00
Simon Duquennoy
ccbb55de2e Enable code size optimization by default on most platforms 2017-05-16 17:47:59 +02:00
Simon Duquennoy
51beaee1b5 Re-arrange examples, in particular, move platform-specific examples to examples/platform-specific 2017-05-16 17:47:57 +02:00
Simon Duquennoy
54d6756815 Move cpu, dev and platform into a new top-level directory: drivers 2017-05-16 09:04:52 +02:00
Simon Duquennoy
6220aea14a Removing Rime, old platforms, old MAC layers, LLSEC (as a layer), some examples and apps 2017-05-14 01:14:05 +02:00
Wojciech Nizinski
5a0d085451 native-border-router: fix for disappearing timer 'uip_ds6_timer_periodic'
When UIP_ND6_SEND_NS is enabled, I've noticed that unreachable
neighbours still remains in REACHABLE state even if lifetime
(nbr->reachable) expired.

During network init 'tcpip_process' is scheduling
'uip_ds6_timer_periodic' is to tick every 100ms and make necessary
expirations.

When MAC addres is received from slip-radio (from 'etimer_process'
context), network is "reinitialized" and timer 'uip_ds6_timer_periodic'
is set again with wrong process.
2017-03-21 13:13:10 +01:00
Nicolas Tsiftes
5eb2ac15ff Merge pull request #2073 from cetic/pr-fix-send-na
Fix semantic of UIP_ND6_SEND_NA and add UIP_ND6_SEND_NS
2017-01-20 13:18:43 +01:00
Yasuyuki Tanaka
2d44b47050 Print an entry for the root node as well as other entries 2017-01-19 14:36:59 +01:00
Laurent Deru
12c930893c Fix semantic of UIP_ND6_SEND_NA and add UIP_ND6_SEND_NS 2017-01-16 15:48:14 +01:00
Thanos Tsakiris
92ad29ab33 Minor typo change 2016-12-30 13:13:53 +02:00
Nicolas Tsiftes
f09e84976a Merge pull request #1950 from yatch/pr/update-for-tsch-cooja-mote
Miscellaneous updates for tsch-cooja-mote
2016-12-05 18:40:28 +01:00
Jens Dede
0d3ff7b785 Rm unnecessary uart commands 2016-12-01 15:12:23 +01:00
Yasuyuki Tanaka
87337e12fc Revert coordinator selection based on node-id for Cooja mote
(example/ipv6/rpl-tsch/node.c)
2016-11-26 11:47:59 +01:00
Simon Duquennoy
ecd1d57eec Merge pull request #1661 from yatch/pr-tsch-cooja-mote
TSCH on Cooja mote
2016-11-23 11:59:29 +01:00
Zhitao He
7bb10dc2a0 fix comment with 6LoWPAN typo and break long lines 2016-10-03 15:53:28 +02:00
Nicolas Tsiftes
2d49edfc57 Merge pull request #1849 from MohamedSeliem/patch3
Make UIP_CONF_DS6_ROUTE_NBU and DS6_NBR_NBU, DS6_ROUTE_NBU obsolete
2016-09-12 14:25:59 +02:00
Yasuyuki Tanaka
30ddd97124 TSCH: add a sample .csc file and configuration for Cooja mote 2016-09-06 15:14:10 +02:00
Mohamed Seliem
1d32a00ebd Fix uip-ds.h table configuration comment
this PR to update uip-ds.h comments, this small change is made to ease the track of Tables implementation places

remove definition of UIP_CONF_DS6_ROUTE_NBU

retire 2 old macros DS6_NBR_NBU, DS6_ROUTE_NBU

Update uip-ds6.h

Update contiki-conf.h

Update contiki-conf.h

Update contiki-conf.h

fix doxygen comment

Update uip-ds6.h
2016-09-05 20:59:36 +02:00
Yasuyuki Tanaka
8bca703282 Remove RPL_CONF_WITH_NON_STORING definition 2016-08-12 14:05:14 +02:00
Simon Duquennoy
21387b954f Merge pull request #1493 from simonduq/pr/add-missing-ext-hdr
Insert RPL ext header before sending ICMP, UDP and TCP messages
2016-07-25 14:56:25 +02:00
Sumankumar Panchal
6dfd358821 TSCH port for CC2538 based platforms. 2016-07-22 09:38:25 +05:30
Simon Duquennoy
7a1576815e rpl-tsch example: use RPL non-storing mode 2016-06-30 18:15:23 +02:00
Simon Duquennoy
3e987ec138 Border router: include RPL links in HTTP reply when non-storing mode is enabled 2016-06-29 17:07:00 +02:00
Yasuyuki Tanaka
ca3a4726d1 Rename two macros related to multicast, which are not user configuration
- UIP_CONF_IPV6_MULTICAST -> UIP_IPV6_MULTICAST
- RPL_CONF_MULTICAST      -> RPL_WITH_MULTICAST
2016-06-20 16:35:09 +02:00
Sumankumar Panchal
373fda46f7 TSCH port for Zolertia ReMote/Zoul. 2016-06-12 16:37:01 +05:30
Simon Duquennoy
b32b3f6666 RPL non-storing: add compile-test to also check for warnings 2016-06-08 14:03:22 +02:00
Simon Duquennoy
1a7133bbf2 Simplified configuration of RPL non-storing mode 2016-06-08 14:03:21 +02:00
Simon Duquennoy
2fe2a28439 Make some of the rpl examples configurable in non-storing mode 2016-06-08 14:03:10 +02:00
Simon Duquennoy
64679642f2 Saving ROM and RAM 2016-06-03 16:44:06 +02:00
Simon Duquennoy
26bf33c762 Merge pull request #1550 from thomas-ha/tsch-cc2538-port
Port of TSCH for CC2538
2016-06-02 21:33:55 +02:00
Nicolas Tsiftes
be13fc7d23 Merge pull request #1605 from tonnenpinguin/pr_fix_slip_config
Add typecast to native border router switch statement
2016-04-20 12:51:43 +02:00
Bernhard Hackl
2ad3d85d41 Fix slip config switch statement 2016-04-20 08:14:08 +00:00
kkrentz
4a88e9e537 llsec: Removed TSCH_SECURITY_CONF_LEVEL and TSCH_SECURITY_LEVEL 2016-04-13 09:16:08 -07:00
kkrentz
10d8b05bc6 llsec: Permit dynamic security levels 2016-04-13 07:54:46 -07:00
thomas-ha
a7b43de535 add comment, use spaces 2016-04-06 16:54:45 +02:00
Joakim Eriksson
12ac02650b fixed a bug in nbr policy and DAO retransmission handling and added new wismote simulation 2016-03-26 09:45:39 +01:00
Joakim Eriksson
ee97dc4bcd tuned configuration for rpl-collect and micaz platform 2016-03-26 09:45:39 +01:00
Joakim Eriksson
f4255fad0f updated rpl-udp example with scalability test 2016-03-26 09:45:36 +01:00
thomas-ha
199b1b5316 remove define for SFD interrupt
not needed anymore when using MAC timer
2016-03-23 09:10:19 +01:00
Simon Duquennoy
4bf868fd99 Fix a number of leftover mentions of aaaa as a prefix (now fd00) 2016-03-14 13:56:00 +01:00
Simon Duquennoy
cd981b23d5 Merge pull request #1297 from simonduq/pr/default-prefix
Change the default IPv6 prefix from aaaa::/64 to fd00::/64
2016-03-13 20:39:16 +01:00
thomas-ha
45c7477650 original node.c 2016-03-11 11:02:43 +01:00
thomas-ha
57a47bb12f node_id on cc2538dk 2016-03-10 18:36:47 +01:00
thomas-ha
a4ccce8dac enable 32 kHz crystal oscillator for TSCH 2016-03-08 15:54:03 +01:00
thomas-ha
b32ad0dbbd define for SFD timestamp on cc2538 2016-03-07 18:37:03 +01:00
Simon Duquennoy
dea04c67d7 Change the default IPv6 prefix from aaaa::/64 to fd00::/64 2016-03-07 17:47:44 +01:00
Simon Duquennoy
8b63b41b96 TSCH-security: disable TSCH logs to save ROM, relax checks in 21-z1-rpl-tsch-security.csc accordingly 2016-03-07 17:43:25 +01:00
Michael Klemm
c03b05c702 Fixed loading SerialSocketServer plugin in Cooja using FQDN 2016-01-16 12:25:42 +01:00
Simon Duquennoy
7eabf8d391 TSCH: latest update from https://github.com/EIT-ICT-RICH/contiki 2015-12-04 15:21:58 +01:00
Simon Duquennoy
f225ff43d3 Added TSCH+RPL example, with support for link-layer security and Orchestra scheduling 2015-12-04 15:21:54 +01:00
Rémy Léone
f2440235b5 Fix CSC & XML export to match .gitattributes 2015-10-22 16:05:40 +02:00
Simon Duquennoy
2daa3d7377 Merge pull request #1269 from tadodotcom/tmp-uip-fallback-iface
More flexibility for the fallback interface
2015-10-20 11:33:14 +02:00
Simon Duquennoy
10bd49a71a Merge pull request #756 from sieben/dos2unix
dos2unix fix
2015-10-18 20:26:07 +02:00
Konrad Krentz
2059b6559e llsec: Let llsec_drivers define their own framer 2015-10-14 08:21:40 -07:00
Víctor Ariño
76e293c289 Fixes ret value for output fallback iface in tun-bridge.c 2015-09-22 12:53:04 +02:00
Víctor Ariño
561e70b18e Updated current fallback_interface(s) to return int. 2015-09-22 12:53:04 +02:00
Rémy Léone
7a5071dd30 Adding a gitattributes and correcting line-endings
https://help.github.com/articles/dealing-with-line-endings/
2015-09-07 15:40:02 +02:00
Laurent Deru
1784338b2e Add uip_clear_buf() macro and replace all instances of uip_len = 0; with it 2015-06-15 11:10:51 +02:00
George Oikonomou
11a5e0a49a Merge pull request #1051 from simonduq/fix-warning
Fixed a number of compiler warnings
2015-05-13 00:52:40 +01:00
Simon Duquennoy
4a93f5148d Fixed a number of compiler warnings 2015-05-08 09:07:20 +02:00
Simon Duquennoy
290fc829ea Consistently use PACKETBUF_ATTR_MAC_SEQNO for MAC sequence number, both input and output. Disable PACKETBUF_ATTR_PACKET_ID in the non-Rime case. 2015-05-06 16:34:44 +02:00
Simon Duquennoy
bb76bb8beb Remove unused flag SICSLOWPAN_CONF_ACK_ALL. Include packetbuf attribute PACKETBUF_ATTR_RELIABLE only when RIME is compiled. 2015-05-06 16:34:26 +02:00
Michael Richardson
5699127c9a additional edits to further clarify interface between native-border-router and slip-radio 2015-02-07 10:51:41 -05:00
Michael Richardson
a0ac6bceb6 added some documentation of native-border-router and slip-radio relationship 2015-02-03 11:05:13 -05:00
Simon Duquennoy
c2ca3e9fdb Cleanup UIP_CONF_IPV6_RPL configuration 2014-12-02 12:38:55 +01:00
Simon Duquennoy
74f6ae3751 slip-radio: remove unneeded definition of NETSTACK_CONF_WITH_RPL (now set from makefile with CONTIKI_WITH_RPL) 2014-12-01 21:04:25 +01:00
Simon Duquennoy
a9cc909794 Network layer configuration: replace UIP_CONF_* with NETSTACK_CONF_WITH_* 2014-12-01 21:02:57 +01:00
Simon Duquennoy
722b3258d1 Cleanup of the Contiki network layer configuration. Now using CONTIKI_WITH_IPV6, CONTIKI_WITH_IPV4, and CONTIKI_WITH_RIME in makefiles, and UIP_CONF_IPV6, UIP_CONF_IPV4, UIP_CONF_RIME in c code. Now only the stacks that are used are compiled (via makefile MODULES). Make IPv6 the default network stack. 2014-12-01 20:13:09 +01:00
Joakim Gebart
1e03cdd553 examples/ipv6/rpl-border-router: Add -DUIP_CONF_TCP=1 to CFLAGS
The example used to rely on the default value being set to 1 which
caused build failures on platforms which have a default UIP_CONF_TCP=0

Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-11-26 19:05:32 +01:00
Adam Dunkels
d891d11324 Merge pull request #557 from kkrentz/llsec-integration
Integration of Link Layer Security
2014-10-08 15:45:46 +02:00
Joakim Gebart
d4179a0a0c examples/rpl-border-router: Fix two minor warnings.
- Remove unused variable i in generate_routes.
 - Add cast to unsigned long for printf(..%lu..) in generate_routes.

Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-10-04 18:05:38 +02:00
kkrentz
2cf7d98cad ContikiMAC: Create and parse ContikiMAC header in special framer; Expanded framer interface
to allow for creating and securing frames in advance; Create and secure frames in advance when sending bursts; Do neither recreate nor resecure frames that come from phase
2014-08-05 05:07:06 -07:00
kkrentz
c396a85364 llsec: Added a layer in between NETSTACK_MAC and NETSTACK_NETWORK for implementing link layer security 2014-08-04 01:09:57 -07:00
Rémy Léone
911f3aa07c SkyByteRadio was replaced by Msp802154Radio 2014-07-23 15:42:59 +02:00
George Oikonomou
a9e7bea675 Make DODAG ID selection RFC 6550-compliant
Some calls to `rpl_set_root` select a hardcoded DODAG ID
(0x1111, 0x1100, 0, 0, 0, 0, 0, 0x0011)

This is against what RFC 6550 says. We change these calls
to select a DODAG ID corresponding to a routable v6 address
corresponding to the root
2014-06-12 00:09:53 +01:00
Niclas Finne
68730566a3 Added method to framer that returns the header length if the framer
would create a header with the current packet information.

This allows sicslowpan to calculate the max payload size without
consuming a sequence number or clearing/restoring the packet buffer.
2014-04-11 17:03:23 +02:00
Adam Dunkels
d397e97e74 Minor code style fixes 2014-03-05 20:31:18 +00:00
George Oikonomou
0bbb574689 IPv6 Multicast Example 2014-03-05 20:31:17 +00:00
Adam Dunkels
45265249fc Changed the name of the rimeaddr module to linkaddr 2014-01-29 20:12:24 +01:00
Adam Dunkels
0fe08205e1 Moved the rimeaddr.[ch] code from the core/net/rime module to the core/net module, as it is used not only by rime code 2014-01-26 23:20:36 +01:00
Adam Dunkels
4cfe6c4a5e Moved the sht11 driver to its own module 2014-01-26 23:20:30 +01:00
Adam Dunkels
0b805e4763 Moved the cc2420 driver into a separate dev/cc2420 module 2014-01-26 23:20:27 +01:00
Adam Dunkels
5f3fe7f7c7 Updated include paths for the moved files under net/ 2014-01-26 23:20:23 +01:00