Contiki delta

6LBR is based on Contiki Operating System. Altough we try to stay as close as possible to Contiki, some modifications are necessary in order to make 6LBR works. Also we integrates bugfixes before proposing them for integration into the Contiki development tree.

This page list all the known differences and their status.

Known Incompatibilities

The following differences could triggers problems when interconnecting 6LBR and pure Contiki nodes :

• Maximum 802.15.4 frame size : In Contiki, frame size is capped at 102 bytes instead of 127 bytes (see 193 and 4a45a55 and 59961b8 )
• Dodag errors and maintenance : In Contiki, the DODAG is reset when routing error is detected, in 6LBR we tries to apply local repairs instead (See 652, …)
• Fragmentation issues : Several bugs related to 6LoWPAN fragmentation are fixed in 6LBR tree (see 766, 648, …)
• …

apps

To be updated

File	Modification	Merge Contiki	Commit	Comment
apps/er-coap/er-coap.h	Allow configuration of COAP_LINK_FORMAT_FILTERING	Yes
apps/shell/shell-ping.c	Ping trace	No		Needed by post-processing

core

To be updated

File	Modification	Merge Contiki	Commit	Comment
core/lib/memb.c	Add memb_count()	Yes		PR 648
core/lib/memb.h	Add memb_count()	Yes		PR 648
core/net/mac/csma.c	Add CSMA_CONF_MAX_PACKET_PER_NEIGHBOR	Yes		PR 648
	better traces	Yes		PR 648
core/net/queuebuf.c	Add queuebuf_freeslots()	Yes		PR 648
core/net/queuebuf.h	Add queuebuf_freeslots()	Yes		PR 648
core/net/rpl/rpl-dag.c	DAG version stored in NVM	No
	Recalculate Rank in other dag	Yes
	Do not call rpl_process_parent_event() in rpl_add_dag() when root	Yes
	Update parent info when receiving a DIO	Yes
core/net/rpl/rpl-ext-header.c	Restore uip_ext_len after header parsing	No		No longer needed as we use another function in packet-filter to remove ext headers
	Do not trigger global repair when forwarding error is detected	Yes		PR 652
	Rank error packet should not be forwarded	Yes		PR 652
	Drop forwarding error packet and send back DAO to originating parent	Yes		PR 652
core/net/rpl/rpl.c	Add route only if it does not exist	Yes ?
	Purge na	No
core/net/sicslowpan.c	Check on available packet fragments	Yes
core/net/tcpip.c	Addition of tcpip input and output hooks fcts	No ?
	Default router bypass for WSN packets	No
core/net/tcpip.h	Add tcpip_get_outputfunc()	No ?
core/net/uip-ds6-route.c	Add uip_ds6_defrt_list_head()	Yes
core/net/uip-ds6-route.h	Add uip_ds6_defrt_list_head()	Yes
core/net/uip-ds6.c	Allow disabling of RA daemon	No
core/net/uip-nd6.c	Addition of RIO output support	Maybe
	Addition of incoming RIO management	Maybe
	Neighbor Discovery Proxy	No
	On-link flag in RA	No		WSN Prefix can not be onlink
	Prefix in RA notification callback	No ?
	Purge NA management	No
	Drop RA when not in autconf	No
core/net/uip-nd6.h	User configuration of RA related parameters	Yes
core/net/uip6.c	Activation of routing in smartbridge	No
	NDP Proxy passthrough	No
	ICMP ping reply notification	No		Used un test framework

cpu

File	Modification	Merge Contiki	Commit	Comment
cpu/cc2538/dev/cc2538-rf.c	Add last rssi and correlation	Yes	3b000d3c
cpu/cc2538/dev/flash-cca.h	Enable backdoor function RF06 Select btn	No	1f3302d9
cpu/mc1322x/contiki-maca.c	Move MACA result from contiki_maca_send() to contiki_maca_transmit()	?	f6916edd
cpu/mc1322x/tools/mc1322x-load.pl	Add extra delay for extra data	Yes	bf60a066
cpu/mc1322x/watchdog.c	Implement correct watchdog_reboot()	Yes	95f9b62e
cpu/msp430/f1xxx/uart1.c	Allow user configuration of uart buffers	Yes	5fdda024
	Check DMA overflow	Yes	248a9d8a

examples

To be updated

File	Modification	Merge Contiki	Commit	Comment
examples/ipv6/sky-websense/Makefile	Add SMALL=1	No		No longer needed
examples/ipv6/slip-radio/Makefile	Add SLIP_RADIO flag	Yes
	Add platform specific files	Yes
examples/ipv6/slip-radio/project-conf.h	Add target specific handler	Yes
	Disable Contikimac RDC	No
	Disable SLIP tcpip_input	Yes
examples/ipv6/slip-radio/slip-radio-cc2420.c	Add set_mac command	Yes		Missing for mc1322x and rf230
examples/ipv6/slip-radio/slip-radio.c	Add reboot command	Yes

platform

To be updated

File	Modification	Merge Contiki	Commit	Comment
platform/econotag/main.c	Add SLIP_RADIO	Yes
platform/native/contiki-conf.h	Make uip_stats_t int	Yes
	Set default UIP_CONF_IPV6_RPL to 0	No
platform/native/contiki-main.c	Disable default ip configuration	Yes
	Disable stdin callback	No
platform/redbee-econotag/contiki-mc1322x-main.c	User configuration of max tx power	Yes		TODO: move to mc1322x
	Disable default ip configuration	Yes
platform/sky/contiki-sky-main.c	Add support for user configuration of max tx power	Yes		TODO: move to cc2420_init()
	Add SLIP_RADIO	Yes
platform/sky/platform-conf.h	Add PLATFORM_HAS_RADIO	Yes
platform/z1/Makefile.z1	Make SMALL=1 default	Yes
platform/z1/contiki-z1-main.c	Add SLIP_RADIO	Yes
platform/z1/node-id.c	Set buffer to and remove mac	Yes ?
platform/z1/platform-conf.h	Add PLATFORM_HAS_RADIO	Yes

tools

Todo