f82393b983
Merge pull request #889 from adamdunkels/pr/ip64-fix
...
IP64: randomize source ports for all outgoing connections
2014-12-02 18:27:19 +01:00
d21835a61f
Don't do the debug printout if ipaddr is NULL
2014-12-02 17:11:15 +01:00
990682229c
Automatically initialize the resolv process
2014-12-02 17:11:15 +01:00
19c7ae0dcd
Avoid compiler warning about unused variable
2014-12-02 17:11:15 +01:00
769a2f832e
Fix for CERT VU#210620: randomize DNS request IDs for every request
2014-12-02 17:10:50 +01:00
bd4233a953
Cleanup packetbuf: use rime attributes and addresses only when rime is enabled. Saves 32 byte per queuebuf in the non-rime case.
2014-12-02 16:54:58 +01:00
397b15f6db
Merge pull request #864 from simonduq/cleanup-network-config
...
Cleanup network config
2014-12-02 16:40:14 +01:00
ad744c6218
Randomize source ports for all outgoing connections. Fix for CERT VU#210620.
2014-12-02 16:08:56 +01:00
3c7268c979
Merge pull request #859 from simonduq/move-packetqueue
...
Moved packetqueue to core/net/rime, as it is only used by the Rime colle...
2014-12-02 13:17:58 +01:00
415506c3f6
Doxygen fixes
2014-12-02 12:39:16 +01:00
c2ca3e9fdb
Cleanup UIP_CONF_IPV6_RPL configuration
2014-12-02 12:38:55 +01:00
a9cc909794
Network layer configuration: replace UIP_CONF_* with NETSTACK_CONF_WITH_*
2014-12-01 21:02:57 +01:00
e6d758e6f5
Remove now unneeded UIP_CONF_IPV6 guards in net/ipv6 and net/rpl code
2014-12-01 20:13:09 +01:00
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
d3d33c5699
Merge pull request #836 from lebrush/nbr-ll-nup
...
uip-ds6-nbr: consider reachable node if LL-NUD
2014-12-01 18:12:33 +01:00
1b73695c75
Moved packetqueue to core/net/rime, as it is only used by the Rime collect protocol
2014-12-01 17:47:00 +01:00
63563ed8df
Merge pull request #652 from cetic/pr-rpl-rank-and-fw-errors
...
RPL rank and forward errors
2014-12-01 17:41:51 +01:00
0f394b220b
uip-ds6-nbr: consider reachable node if LL-NUD
...
The reachable state might also be considered to keep the reachable
state since we are already not standard complaint. This reduces the
nbr discovery messages if nodes talk to each other periodically.
2014-12-01 17:06:14 +01:00
d160943f16
Bug fix: Stop the DAO lifetime timer in RPL instances when released.
...
Clearing the memory for an active etimer/ctimer might corrupt the
timer list and cause other timers to be lost or infinite loops. The
DAO lifetime timer is only used when RPL route lifetime is not
infinite but then the timer will cause problems if not stopped.
2014-11-29 00:22:34 +01:00
61ec5bf896
Merge pull request #514 from BastianPoe/contiki-mmem1
...
mmem: Prevent duplicate init of mmem
2014-11-28 19:57:17 +01:00
9b90c378e8
Merge pull request #812 from kkrentz/packetbuf-holds-broadcast
...
packetbuf_holds_broadcast()
2014-11-28 19:15:19 +01:00
47096a1bae
Merge pull request #816 from kkrentz/contikimac-framer-fix
...
ContikiMAC framer fix
2014-11-28 19:12:55 +01:00
713d60435a
Merge pull request #875 from joakimeriksson/rtablefix
...
Changed sorting order of routing list (optimization).
2014-11-28 19:09:38 +01:00
6ecbf8af34
ContikiMAC: Retain original copyright
2014-11-25 04:56:09 -08:00
18ee5ce294
ContikiMAC: Added missing length function to contikimac-framer.c
2014-11-25 04:56:09 -08:00
8e1c52b0ba
Changed sorting order of routing list (optimization).
2014-11-24 09:36:54 +01:00
b787b27d5b
Moved thread states from module to header
2014-11-22 15:49:45 +01:00
a8556a7518
Merge pull request #865 from kkrentz/mic-length-fix
...
llsec: Fixed MIC length
2014-11-20 15:11:13 +01:00
e691dec9a4
Merge pull request #828 from oskarnp/pr-ipolite-fix
...
ipolite: stop ctimer and reset queuebuf pointer when canceling old send
2014-11-20 15:10:42 +01:00
eb0676212c
Merge pull request #858 from simonduq/cleanup-ctimer
...
Remove unnecessary list_remove in ctimer.c (list_add automatically remov...
2014-11-18 08:59:41 +01:00
866bb99944
Merge pull request #860 from simonduq/frame802154-align
...
frame802154_t: make sure dest_addr and src_addr are aligned
2014-11-18 08:59:30 +01:00
cba5937bd3
Merge pull request #861 from simonduq/queuebuf-field-order
...
Alignment of field `data` in queuebuf
2014-11-18 08:38:23 +01:00
35e876e8c6
Force NUD on default routers
2014-11-17 09:55:22 +01:00
29f894c07e
Drop forwarding error packet and send back DAO to originating parent
2014-11-14 09:40:05 +01:00
a964380155
Rank error packet should not be forwarded
2014-11-14 09:40:04 +01:00
778d40dab7
Do not trigger global repair when forwarding error is detected
2014-11-14 09:40:04 +01:00
a3b4e8101d
llsec: Fixed MIC length; reject unsupported security levels
2014-11-13 12:34:37 -08:00
fb00a217f5
packetbuf: Use packetbuf_holds_broadcast() all-over
2014-11-13 09:58:08 -08:00
3e44e8b258
packetbuf: Added function "packetbuf_holds_broadcast()" for checking whether the current packet is a
...
broadcast
2014-11-13 09:46:07 -08:00
fb05d22623
Merge pull request #857 from simonduq/fix-queuebuf
...
Added missing memb_free in queuebuf.c
2014-11-13 17:22:44 +01:00
85b494c16b
[doc] Give files a common structure by placing license first (partial)
...
Followed by doxyen file and group tags.
This patch is only a first attempt to make provide a clean structure,
many more files require rework, too.
2014-11-10 23:54:49 +01:00
5a38788944
[doc] llsec moved in net group
2014-11-10 23:53:34 +01:00
81382d0dcf
[core/net/rime] Avoid equal group titles in same group
2014-11-10 23:53:32 +01:00
e9b5899eed
[core/net/mac] Doxygen: Added frame802154 to net group
2014-11-10 23:53:32 +01:00
863b4b54cc
[core/net/rime] Doxygen fixes
2014-11-10 23:53:32 +01:00
0b8769e576
[doc] Various fixes for doxygen grouping etc.
2014-11-10 23:53:32 +01:00
e4db33f560
[doc] updated settings manager documentation
2014-11-10 23:53:32 +01:00
548321e66d
[doc] moved doxygen parts from core/net/simple-udp.c to corresponding
...
header file
2014-11-10 23:53:32 +01:00
cbca2d6604
[doc] fixed some minor typos
2014-11-10 23:53:31 +01:00
6b7017452b
frame802154: move inclusion of linkaddr.h from .h to .c file
2014-11-10 15:43:32 +01:00
df6a435d42
struct frame802154_t: make sure dest_addr and src_addr are aligned
2014-11-10 15:40:24 +01:00
494c397aba
struct queuebuf_data: swap len with data to make sure data is 32-bit aligned
2014-11-10 14:27:17 +01:00
239207c8c6
Remove unnecessary list_remove in ctimer.c (list_add automatically removes first)
2014-11-10 13:41:33 +01:00
c5ec342b8b
Fix deallocation in queuebuf.c, case where QUEUEBUF_STATS is set
2014-11-10 13:24:03 +01:00
928bb49855
Added missing memb_free in queuebuf.c
2014-11-10 12:00:41 +01:00
6ca95ebc0c
Merge pull request #811 from kkrentz/llsec-renaming
...
llsec renaming
2014-11-07 22:20:15 +01:00
b37489b0de
Merge pull request #766 from cetic/pr-6lowpan-frag-timeout
...
Fix too short 6LoWPAN reassembly timeout
2014-11-07 22:16:00 +01:00
5e640411f5
core/net/rime/ipolite: stop ctimer and reset queuebuf pointer when canceling old send
...
Ipolite is used by netflood and route-discovery modules among others. If a route request is yet to be re-broadcasted and a local route discovery is started (interval == 0), the previous queuebuf used is freed but ctimer and queuebuf pointer is left unchanged. This causes corrupt route requests to be sent, invalid routing tables to be formed, memcmp() on NULL pointer on receive, and other undefined behavior.
Signed-off-by: Oskar Nordquist <oskar.nordquist@crlsweden.com>
2014-10-21 15:25:52 +02:00
6fb7dd238e
Merge pull request #648 from cetic/pr-csma-fixes
...
High throughput fixes for csma and sixlowpan
2014-10-21 12:17:03 +02:00
0579e304e4
llsec: Renamed ccm to ccm_star & Renamed llsec regression test
2014-10-16 09:21:56 -07:00
fd47acba09
Merge pull request #808 from adamdunkels/pr/ip64
...
Conversion functions for IPv4/IPv6 addresses (missing from the NAT64 pr)
2014-10-10 00:42:37 +02:00
5a24a781d5
The ip64-addr module converts between IPv4 and IPv6 addresses.
2014-10-09 08:07:34 +02:00
e803a654b4
Merge pull request #684 from SmallLars/2nd-button
...
Enabled 2nd button on platform econotag
2014-10-08 14:05:24 -05:00
0a88764185
Merge pull request #804 from adamdunkels/pr/ip64
...
NAT64 for Contiki (RFC6164, RFC6147)
2014-10-08 19:41:09 +02:00
d891d11324
Merge pull request #557 from kkrentz/llsec-integration
...
Integration of Link Layer Security
2014-10-08 15:45:46 +02:00
24d15ad9a5
core/net/ip: Prevent (tiny) buffer overflow in resolv_found()
...
An off-by-one error in resolv_found() could make an strncat() call
overflow by the terminating null byte.
When building with Clang the following warning was shown:
../../../core/net/ip/resolv.c:1458:17: warning: the value of the
size argument in 'strncat' is too large, might lead to a
buffer overflow [-Wstrncat-size]
sizeof(resolv_hostname) - strlen(resolv_hostname));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../../core/net/ip/resolv.c:1458:17: note: change the argument to
be the free space in the destination buffer minus the
terminating null byte
sizeof(resolv_hostname) - strlen(resolv_hostname));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sizeof(resolv_hostname) - strlen(resolv_hostname) - 1
Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-10-02 12:52:39 +02:00
49cb87025e
README file for the IP64 module
2014-09-14 21:26:33 +02:00
c77bc6d3f1
NAT64 / DNS64 code for Contiki that makes connecting an IPv6 Contiki network to IPv4 networks really easy
2014-09-14 21:26:23 +02:00
7cbd59df03
Add per neighbor packet throttle
2014-08-13 10:11:02 +02:00
91d84a3086
Improve csma debug traces
2014-08-13 10:11:02 +02:00
68b9412776
Drop packet if there are not enough free buffers to perform fragmentation
2014-08-13 10:11:02 +02:00
704e32015b
Fix too short 6LoWPAN reassembly timeout
2014-08-06 16:56:37 +02:00
677c078302
sicslowpan: Fixed too aggresive fragmentation
2014-08-05 05:07:06 -07:00
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
515287ef17
llsec: Removed superseded NETSTACK_ENCRYPT, NETSTACK_DECRYPT, and
...
NETSTACK_ENCRYPTION_INIT macros
2014-08-05 05:07:05 -07:00
c032b67969
llsec: Noncompromise-resilient 802.15.4 security
2014-08-05 05:07:05 -07:00
d8851df858
llsec: Replay protection
2014-08-05 05:07:05 -07:00
41c5dbf961
llsec: Disable duplicate detection when the LLSEC driver provides replay protection anyway.
2014-08-05 05:07:05 -07:00
d161ffcb64
llsec: Allow for sharing CCM*
2014-08-05 05:07:05 -07:00
13d9510715
llsec: Allow for sharing AES-128
2014-08-05 05:07:04 -07:00
07ef46a6e2
llsec: Allow for sharing endianness functions
2014-08-05 05:04:15 -07:00
eaae9f1100
llsec: Calling NETSTACK_LLSEC.on_frame_created()
2014-08-05 05:04:15 -07:00
8659c97fb0
framer-802154: Support for explicit keys
2014-08-05 05:04:15 -07:00
124dde25f3
framer-802154: Conditional compilation of security-related code
2014-08-05 05:04:14 -07:00
fb6d2270ab
framer-802154: Simplification of frame802154_create
2014-08-05 05:04:14 -07:00
11495a011c
framer-802154: Renamed variable for the sake of consistency
2014-08-05 05:04:14 -07:00
1d324e50d2
framer-802154: Sequence number fix
2014-08-05 05:04:14 -07:00
9dc9e4bd9f
framer-802154: Support for setting and accessing the frame type
...
attribute
2014-08-05 05:04:14 -07:00
19c9ef0a95
framer-802154: Support for creating and parsing frames with security headers
2014-08-05 05:04:14 -07:00
be22883724
framer-802154: Introduced mnemonic variable
2014-08-05 05:04:14 -07:00
c9ad9c04bd
framer-802154: Style fixes
2014-08-04 01:09:57 -07:00
a5a9b42457
packetbuf: Made packetbuf_hdrlen applicable to inbound packets, too
2014-08-04 01:09:57 -07:00
bb74fc320f
llsec: Configuration option for defining a constant LoWPAN-wide security level
2014-08-04 01:09:57 -07:00
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
62b8aafb03
Merge pull request #722 from royscheefhals/contiki-fix
...
char * data to void * data parameter in process_start
2014-07-28 22:04:36 +02:00
582bfcb8c6
Merge pull request #696 from sieben/doc
...
Correct several doxygen tags (\file,...)
2014-07-28 11:42:41 +02:00
8c3fa17ec0
Correct several doxygen tags (\file)
2014-07-28 11:11:45 +02:00
1654152193
[core] timer: Added note that timer_reset must not be executed before timer expired
...
Should save some users debugging time while adding no computation overhead
that would be needed for range checks
2014-07-10 11:33:00 +02:00
ccc75404f4
Merge pull request #711 from gebart/upstream-fix-implicit-definitions
...
uip.h missing #include <string.h>
2014-07-02 16:36:03 +02:00
f111058472
Removing trailing whitespaces
2014-06-30 20:01:05 +02:00
02972e6514
Improve RPL hop-by-hop option detection
2014-06-27 09:45:57 +02:00
d45782fbcd
Insert properly Hop-by-Hop option at first hop
2014-06-27 09:45:51 +02:00
2dfe2c377f
Setting uip_ext_len again breaks hop-by-hop option
2014-06-27 09:43:53 +02:00
b6742e5eb5
Sender rank in Hop-by-Hop option has inverted bytes
2014-06-27 09:43:53 +02:00
32a7572f25
Fix SDCC Compile Error
2014-06-17 22:20:49 +01:00
24e260910c
Merge pull request #718 from g-oikonomou/rpl-dodagid-compliance
...
Make DODAG ID selection RFC 6550-compliant
2014-06-13 15:33:56 +02:00
4ce3e4dee8
Merge pull request #701 from tim-ist/routing_fix
...
Re-create a routing table entry if the next hop is changed.
2014-06-13 14:56:56 +02:00
65ef375bdb
Re-create a routing table entry if the next hop is changed.
...
The next-hop address did not get updated in the routing table
in case an entry for the destination already existed.
This patch resolves the issue by removing the entry and
having it re-created from scratch.
The issue causes a routing error triggering reconstruction of
the DODAG through version increase.
In case of somewhat frequent downward traffic in not (yet) stabilized DODAG
a vicious circle is formed: unstable topology means churn, downward
routing under churn causes reconstruction of DODAG. In this situation
the network does not have chance to stabilize.
We encountered a constant churn caused by this bug
in a network of 50 nodes and a periodic traffic (a packet every 5
seconds) generated at the root.
More info and a PCAP demonstrating the issue can be found here:
https://github.com/contiki-os/contiki/issues/496
2014-06-13 13:31:15 +02:00
1058ea986a
Changed the parameter 'char * data' of process_start to the
...
type process_data_t. This was an artifact when the choice was
made to use the void * type for the data parameter in processes.
Changed parameter 'void * data' of process_post_synch to
process_data_t for consistency.
Checked all the uses of process_start() in contiki and fixed casts
of the data parameter.
2014-06-12 13:40:28 +02:00
32bc98b0da
Fix code style in rpl_set_root prototype
2014-06-11 23:59:17 +01:00
cff30a394b
Merge pull request #635 from nfi/linkaddr-size
...
Use LINKADDR_SIZE instead of sizeof(linkaddr_t) to avoid struct padding problems.
2014-06-11 23:18:27 +02:00
eceaf0c59b
Merge pull request #631 from nfi/framer-len
...
Added function to framer that returns the estimated header length
2014-06-11 23:17:47 +02:00
0516927677
Merge pull request #666 from simonduq/rpl-etx-init
...
Set initial link ETX to 2
2014-06-11 22:42:48 +02:00
def57199b9
Merge pull request #511 from ADVANSEE/leds
...
leds: Fixes and enhancements
2014-06-11 22:37:34 +02:00
40d33657a3
Merge pull request #710 from nvt/coffee-filename-fix
...
Coffee: Copy the correct number of bytes in filenames
2014-06-11 18:10:12 +02:00
997aef49d8
core/net/uip.h: Add missing #include <string.h>
...
Fixes implicit definition of memcmp() warnings/errors.
Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-06-11 18:04:34 +02:00
fb4fc312f1
Merge pull request #612 from nfi/assert
...
Undefine the assert macro to avoid compiler warning.
2014-06-11 15:43:17 +02:00
7004355c0f
Do not copy more bytes than the filename string contains.
2014-06-11 14:10:00 +02:00
64f65b4e45
Merge pull request #617 from nfi/extended-radio-api
...
Extended radio API with support for setting channel, pan id, addressing modes, etc
2014-06-03 21:32:53 +02:00
039dc5fb73
Merge pull request #667 from simonduq/ipv6-ndp-in-default-conf
...
Add UIP_CONF_ND6_SEND_NA to contiki-default-conf.h
2014-06-02 10:51:52 +02:00
25c8b0835d
Closing doxygen groups
2014-05-30 11:01:20 +02:00
50481722a8
Enabled 2nd button on platform econotag
2014-05-23 11:50:12 +02:00
443bbd3948
Merge pull request #664 from simonduq/rpl-link-metric-init-fix
...
RPL MRHOF: bypass EWMA when setting a parent's link metric for the first time
2014-05-14 16:42:29 +02:00
8820597cca
Merge branch 'master' of git://github.com/contiki-os/contiki into ds6_period_configurable
2014-05-08 09:27:43 +02:00
5aab392a22
Set default link ETX to 2
2014-05-07 16:27:24 +02:00
f34165bda4
Merge pull request #647 from cetic/pr-select-dag-fix
...
rpl_select_parent: Only check parents belonging to the given dag
2014-05-07 16:13:47 +02:00
812a0299a8
Merge pull request #649 from cetic/pr-dio-preference-fix
...
Add user configuration of DIO preference field
2014-05-07 16:12:56 +02:00
7367eb1829
Add UIP_CONF_ND6_SEND_NA to contiki-default-conf.h
2014-05-05 19:52:52 +02:00
33cfd92475
RPL MRHOF with ETX: bypass weighted moving average when setting a parent's link metric for the first time
2014-04-29 16:25:16 +02:00
3b503da680
Add user configuration of DIO preference field
2014-04-18 16:26:23 +02:00
3fb0d69be6
Remove duplicated configuration parameters definition
2014-04-18 15:37:31 +02:00
446208dc1c
Merge branch 'master' of git://github.com/contiki-os/contiki into ds6_period_configurable
2014-04-18 13:33:01 +02:00
96a70f9ab0
Rename as suggested by g-oikonomou
2014-04-18 13:32:40 +02:00
79537a6dd7
rpl_select_parent: Only check parents belonging to the given dag
2014-04-18 11:39:33 +02:00
a96dc90250
[SPI] Make SPI_FLUSH() more versatile
...
Currently the SPI driver in core/ sets `SPI_FLUSH()` to be a single read
of the spi RX buffer. This is fine for many microcontrollers, but newer
platforms like the CC2538 have a multi-byte FIFO for the RX buffer. In
that case, a single read is not guaranteed to flush the RX. This commit
allows `SPI_FLUSH()` to be platform dependent if needed, but doesn't
change for platforms where it works.
2014-04-15 14:04:42 -04:00
ce2ed95b93
Merge pull request #585 from g-oikonomou/generic-icmp6-in-hooks
...
Generic ICMPv6 input hooks
2014-04-14 16:12:10 +02:00
b1335b08a8
Changed to use LINKADDR_SIZE instead of sizeof() to select between
...
short address and long address as some platforms might use padding in
the struct. This fixes #555 .
2014-04-11 17:24:16 +02:00
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
3829860c3c
Merge pull request #620 from adamdunkels/push/socket-api
...
New TCP and UDP socket APIs
2014-04-09 22:12:59 +02:00
1075effa22
Include udp-socket.h and tcp-socket.h by default in all applications that include contiki-net.h
2014-04-09 22:01:18 +02:00
8ea9cb7693
Split the radio parameter ADDRESS_HANDLER into RX_MODE and TX_MODE.
2014-04-09 21:25:40 +02:00
2284ef5ef2
Enhanced the documentation.
2014-04-08 16:42:16 +02:00
a7dbf46b8e
Merge pull request #608 from nvt/rpl-fixes
...
Minor RPL improvements
2014-04-07 11:13:38 +02:00
529ab761ac
Register generic ICMPv6 handlers for ROLL TM
2014-04-04 00:09:29 +01:00
017697f91d
Register generic ICMPv6 handlers for RPL
2014-04-04 00:09:27 +01:00
1d3da44991
Register generic ICMPv6 handlers for IPv6 ND
2014-04-04 00:09:26 +01:00
af43d2125b
Register generic handlers for ICMPv6 Echo Request / Reply
2014-04-04 00:02:53 +01:00
1d84962e80
Replace old switch-based ICMPv6 type/code management
2014-04-04 00:02:53 +01:00
b6978b30e8
Declare and Implement generic ICMPv6 handler management
2014-04-04 00:02:52 +01:00
5f265ced2f
Added stub for extended radio API for nullradio
2014-04-03 13:38:18 +02:00
Nicolas Tsiftes
Adam Dunkels
Simon Duquennoy
Víctor Ariño
Niclas Finne
kkrentz
Joakim Eriksson
marcas756
Laurent Deru
Enrico Joerns
Oskar Nordquist
Mariano Alvira
Adam Dunkels
Joakim Gebart
Rémy Léone
George Oikonomou
Timofei Istomin
Roy Scheefhals
Lars Schmertmann
Jens Dede
Brad Campbell
George Oikonomou