Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-23 01:29:33 +00:00
Code Issues Projects Releases Wiki Activity
11,417 Commits 1 Branch 17 Tags 75 MiB
f065971efc
Commit Graph

2708 Commits

Author SHA1 Message Date
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
ffb10094ab added init value of locked variable 2016-03-26 09:45:39 +01:00
Simon Duquennoy
e1f9369a09 RPL DAO-ACK: move initialization of current ougoing DAO from da_output to dao_output_target_seq 2016-03-26 09:45:38 +01:00
Simon Duquennoy
19b04098d5 Improved RPL debug logs 2016-03-26 09:45:38 +01:00
Simon Duquennoy
6fa3479aa8 RPL: improved debug messages for No-Path DAOs 
Conflicts:
	core/net/rpl/rpl-icmp6.c
 2016-03-26 09:45:38 +01:00
Joakim Eriksson
09c624dcd3 fixed clearing of state flag and avoid starting retransmission timer 2016-03-26 09:45:38 +01:00
Joakim Eriksson
8afe3fb9b7 fixed so that DAO NACK now is either for the path or for RPL root - if from root then do not try to switch parent since that will not help 2016-03-26 09:45:38 +01:00
Joakim Eriksson
13b8c04c6f fixed so that nbr policy for RPL Root do not save room for parents 2016-03-26 09:45:38 +01:00
Joakim Eriksson
1fcef0f90d added function for checking downward route and added configuration for DAO NACK repair - default off 2016-03-26 09:45:38 +01:00
Joakim Eriksson
4246a8fbe6 updated more nbr_add calls 2016-03-26 09:45:37 +01:00
Joakim Eriksson
444015df67 refactored the rpl-nbr-policy to be called from nbr-table module 2016-03-26 09:45:37 +01:00
Joakim Eriksson
be81d1d2c6 added uip_clear_buf to avoid the risk of sending received packets 2016-03-26 09:45:37 +01:00
Joakim Eriksson
01930d4a64 changed default configuration of RPL route lifetime 2016-03-26 09:45:37 +01:00
Joakim Eriksson
cd98b8b40e added periodic debug printout of number of used neighbors and routes 2016-03-26 09:45:36 +01:00
Joakim Eriksson
fa1b70b723 added configuration of DAO route refresh for broadcast DIOs 2016-03-26 09:45:36 +01:00
Joakim Eriksson
3fd8c4db2d added nbr policy for Contiki RPL that avoids thrashing the nbr table with new entries all the time 2016-03-26 09:45:36 +01:00
Joakim Eriksson
d181bd9e6f added config for enabling/disabling removal of oldest route and added support function for checking if lladdress is used as nexthop 2016-03-26 09:28:09 +01:00
Joakim Eriksson
513393db54 added return value so that caller know if a nbr was removed or not 2016-03-26 09:28:09 +01:00
Joakim Eriksson
946be77248 Added support for end-to-end DAO ACK for Contiki RPL. 
This is a fix for Contiki RPL so that it fully supports DAO ACK in
an end-to-end fashion. When DAO is sent it will be forwarded upwards
as before. DAO ACK will be forwarded downwards until it reach the node
that initiated the DAO ACK and unlike before it is not a single-hop
DAO ACK but it is fully reaching the RPL ROOT before any DAO ACK is
sent back. DAO ACK also now fully support different status messages
(success / fail).
 2016-03-26 09:28:08 +01:00
Simon Duquennoy
3057cb3363 TSCH: reset now also flushes all queues and resets backoff exponents 2016-03-15 16:24:04 +01:00
Simon Duquennoy
4b4ea36e9b TSCH: substract RADIO_DELAY_BEFORE_DETECT from ACK timestamp (more accurate timeout for the following busy wait) 2016-03-15 16:23:57 +01:00
Simon Duquennoy
0fd097f821 TSCH: bound max packet size to the system's packetbuf size 2016-03-15 16:23:57 +01:00
Simon Duquennoy
0aa36eaa0a TSCH: explicitly turn radio off after ACK tx 2016-03-15 16:23:57 +01:00
Simon Duquennoy
5e5904d10e Merge pull request #1387 from simonduq/pr/ndfree-rpl-fix 
NDP disabled: also disable uip_ds6_neighbor_periodic
 2016-03-14 16:42:45 +01:00
Simon Duquennoy
bbefd4ab4e Merge pull request #1334 from tadodotcom/1333-resolv-fat-camp 
trims resolv.c by removing unrequired static declarations
 2016-03-14 16:41:33 +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
Nicolas Tsiftes
c476194004 Merge pull request #1548 from simonduq/pr/traceroute 
uip6, icmp6 and ext header handling fixes: traceroute now working!
 2016-03-11 14:14:26 +01:00
Simon Duquennoy
3fa25eac8c uip6: fix bug that caused the payload of ICMPv6 messages not to match that of the original packet 2016-03-10 12:22:23 +01:00
Simon Duquennoy
06e984a02e uip6: enable sending of "port unreachable" ICMPv6 message 2016-03-10 12:22:15 +01:00
Simon Duquennoy
5886bdea31 uip_icmp6_error_output: remove and add RPL ext header instead of inverting it, so that the payload of the returned ICMP error matches the original packet 2016-03-10 12:22:05 +01:00
Simon Duquennoy
9930756d7c uip6: restore proto after calling remove_ext_hdr 2016-03-10 12:21:55 +01:00
Simon Duquennoy
add5a8be67 Code style 2016-03-10 11:33:40 +01:00
Yasuyuki Tanaka
f83e498978 Fix typos in debug messages 2016-03-09 11:32:24 +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
73fcfa42c2 TSCH: fix compiler warning that shows up when disabling TSCH_LOG_LEVEL 2016-03-07 17:42:17 +01:00
Joakim Nohlgård
e32b46a866 core/lib/gcr.c: fix warning: function declaration isn't a prototype 2016-03-02 07:12:27 +01:00
Joakim Nohlgård
d7d836fda0 core/net/rpl/rpl.h: fix warning: function declaration isn't a prototype 2016-03-02 07:00:57 +01:00
Joakim Nohlgård
52e7ea9cc4 core/net/rpl/rpl-dag.c: fix warning: function declaration isn't a prototype 2016-03-02 07:00:57 +01:00
Joakim Nohlgård
2e47bf9cdc core/net/ipv6/sicslowpan.c: fix warning: function declaration isn't a prototype 2016-03-02 07:00:57 +01:00
Joakim Nohlgård
7c11034ab7 core/lib/trickle-timer.c: fix warning: function declaration isn't a prototype 2016-03-02 07:00:57 +01:00
Joakim Nohlgård
de7850ed58 core/lib/settings.h: fix warning: function declaration isn't a prototype 2016-03-02 07:00:57 +01:00
Nicolas Tsiftes
65caef495a Merge pull request #1354 from tsparber/pr-count-icmp-stats 
uIP Stats: Count sent ICMP6 packets
 2016-02-26 15:16:35 +01:00
Amit Geron
ba6419cc25 Typo 
* route_discovery_expicit_open --> route_discovery_explicit_open
 2016-02-07 11:58:31 +02:00
Simon Duquennoy
daa83ee3ef Merge pull request #1404 from amitgeron/route_discovery_channels 
Add route_discovery_explicit_open()
 2016-02-05 23:12:39 +01:00
Simon Duquennoy
5afdae1399 Merge pull request #1498 from alignan/pull/fix-ip64-warnings 
Fix ip64 warnings and error
 2016-02-05 23:02:39 +01:00
Nicolas Tsiftes
4dce5f6765 Merge pull request #1494 from simonduq/pr/uip6-debug 
Minor debug output fixes
 2016-02-04 13:09:21 +01:00
Antonio Lignan
c924567d86 Fix ip64 warnings 2016-02-04 00:26:54 +01:00
Simon Duquennoy
521cc7600d Minor debug output fixes 2016-02-03 17:10:24 +01:00
Simon Duquennoy
f0d1b6c5bb Fix PRINTF statement in sicslowpan 2016-02-02 17:18:45 +01:00
Joakim Eriksson
6ef8f47764 Style fixes, LLSEC.overhead and MAC_MAX_PAYLOAD 2016-01-19 19:54:27 +01:00
Joakim Eriksson
02e07607a7 removed old HC1 code since it is not expected to be used and removed NH_COMPRESSOR 2016-01-19 15:29:14 +01:00
Joakim Eriksson
d4dc45e096 updated sicslowpan documentation and platform configurations 2016-01-19 15:27:14 +01:00
Joakim Eriksson
d0448df3b8 added support for multiple reassemblies 2016-01-19 15:17:59 +01:00
George Oikonomou
fa40d2b1fc Remove documentation references to the Sensinode platform 
This is part of a set of commits that will obsolete the Sensinode platform
 2016-01-10 15:09:31 +00:00
kkrentz
81765746ad AES-128: Resolved #ifdef issue 2016-01-04 00:28:26 +01:00
kkrentz
e5babded4b AES-128: Deleted the function aes_128_padded_encrypt 2016-01-04 00:28:26 +01:00
kkrentz
4013cd0f58 netstack: Fix missing llsec init 2016-01-04 00:28:26 +01:00
Simon Duquennoy
4302e23ddc Merge pull request #1285 from simonduq/pr/tsch 
TSCH + Basic 6TiSCH
 2015-12-07 14:29:10 +01:00
Simon Duquennoy
6df9f886f8 Make get_bits_in_byte() static 2015-12-07 13:17:25 +01:00
Simon Duquennoy
cc58384b40 jn516x: remove temporary adjustements for compilation in a 802.15.4e-free Contiki 2015-12-07 11:51:50 +01:00
Atis Elsts
d79ce957a1 Adaptive time synchronization for TSCH 2015-12-07 11:51:41 +01:00
Benoît Thébaudeau
6166693a11 Merge pull request #1133 from bkozak-scanimetrics/cc-gcc 
put gcc specific stuff into seperate .h
 2015-12-05 00:39:59 +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
2ca7a1a79f TSCH security: port to new ccm-star and llsec APIs 2015-12-04 15:21:56 +01:00
Simon Duquennoy
b0f936263e Added IEEE 802.15.4e TSCH (TimeSlotted Channel Hopping) MAC layer 2015-12-04 15:21:52 +01:00
Simon Duquennoy
1e0adbbf24 New radio interface parameters: Rx poll mode, last packet timestamp, last packet rssi, last packet lqi. Implementation of these parameters for cc2420, with, in addition, runtime configuration of CCA before Tx, auto-ack and frame filtering 2015-12-04 15:21:51 +01:00
Simon Duquennoy
ecba49c282 Add support for IEEE 802.15.4e Information Elements (IEs). All IEs used by TSCH are currently included. 2015-12-04 15:21:50 +01:00
Simon Duquennoy
5cf9871d5b Added support for IEEE 802.15.4 frame version 2 2015-12-04 15:21:50 +01:00
Simon Duquennoy
f86494c6aa Added missing include (needed for type uip_ipaddr_t) 2015-12-04 15:21:49 +01:00
Simon Duquennoy
dfd61b6cc9 uip-ds6-route: make nbr_routes global 2015-12-04 15:21:48 +01:00
Simon Duquennoy
77d8322da8 uip-ds6-route: added callback for next hop addition and removal 2015-12-04 15:21:47 +01:00
Simon Duquennoy
08bcfd6972 RPL: added callback for parent switches 2015-12-04 15:21:46 +01:00
Simon Duquennoy
b6d599b712 RPL: added callback for DIO interval update 2015-12-04 15:21:45 +01:00
Simon Duquennoy
2112dff217 Added ringbufindex module 2015-12-04 15:21:44 +01:00
Simon Duquennoy
8780bd2ce0 Rime Chameleon fix for 32-bit platforms: use BITOPT_HDR_SIZE rather than sizeof(struct bitopt_hdr) 2015-12-04 10:18:24 +01:00
Atis Elsts
b5d17bb620 ContikiMAC: use RTIMER_GUARD_TIME #define to avoid accidentally scheduling a rtimer in the past on platforms with fast rtimer ticks 2015-12-03 17:37:26 +01:00
Nicolas Tsiftes
35fb0614de Merge pull request #1406 from simonduq/pr/fix-rpl-multi-dag 
RPL multiple DAG bugfix
 2015-12-02 11:19:37 +01:00
Simon Duquennoy
94c26b90d0 Merge pull request #1091 from simonduq/rpl-loop-repair 
Enhanced RPL loop repair
 2015-12-01 15:36:53 +01:00
Simon Duquennoy
27fd590b51 Merge pull request #1228 from bkozak-scanimetrics/contikimac_replace_function_pointer_cast 
Replaced function pointer cast in contikimac
 2015-12-01 15:35:28 +01:00
Nicolas Tsiftes
064a431bb8 Merge pull request #1381 from simonduq/pr/rpl-dao-debug 
Improved RPL debugging
 2015-12-01 09:41:33 +01:00
Simon Duquennoy
ebc8d9fb1c Merge pull request #1344 from tsparber/fix-doxygen 
doxygen: Fixed all warnings
 2015-11-30 22:07:15 +01:00
Simon Duquennoy
ecc16645ad RPL: do not return from rpl_process_dio after adding a DAG 2015-11-30 19:21:18 +01:00
Amit Geron
1b8c889e41 Add route_discovery_explicit_open() 
For route discovery connections, 2 logical channels are used:
One channel for netflood messages, and one for unicast.
When opening a route discovery connection using
route_discovery_open(), only the netflood channel number is
specified, and the unicast channel number is hard-coded to be the
next channel (+1).
This commit adds an alternative function for opening
route-discovery connections, allowing the user to specify both
channels independently, to gain improved control and readability.
 2015-11-30 11:13:32 +02:00
Simon Duquennoy
c679046d7a RPL: improved debug messages for No-Path DAOs 2015-11-26 11:36:05 +01:00
Simon Duquennoy
298ff6db76 uip-ds6-route: fix debug annotation of removed routes 2015-11-26 11:36:03 +01:00
Pablo Corbalán
588e170eb1 Improved log output in IPv6 modules 2015-11-25 15:39:27 +00:00
Antonio Lignan
d31ba8dfdc Replaced tabs leftover in previous commit 2015-11-24 10:21:23 +01:00
Antonio Lignan
e2cf8f9868 Made ContikiMAC more configurable (on uknoblic behalf) 2015-11-23 14:03:51 +01:00
George Oikonomou
41ea0308a3 Merge pull request #1390 from tsparber/fix-doxygen-whitespace 
Cleanup some trailing spaces and convert tabs to spaces
 2015-11-22 11:53:01 +00:00
Simon Duquennoy
8369ee3ce5 Merge pull request #1194 from atiselsts/rime_chameleon_bit_endian 
Fix Rime attribute serialization in chameleon-bitopts for big endian systems
 2015-11-21 00:19:04 +01:00
Simon Duquennoy
92840e7adc Simplify uip-ds6-nbr module further when NDP is disabled. Avoids known issue https://github.com/contiki-os/contiki/issues/1380 of neighbors in non-REACHABLE state. 2015-11-20 22:40:19 +01:00
Simon Duquennoy
33f8db0dd3 RPL: clearer naming and documentation of DAO delay constants 2015-11-18 14:06:18 +01:00
Tommy Sparber
938a425949 Cleanup trailing spaces and convert tabs to spaces 
This commit removes trailing spaces and converts
tabs to spaces in all files affected by fix-doxygen PR.
 2015-11-18 11:09:43 +11:00
Tommy Sparber
938d17576b doxygen: Fix many warnings 
This commit fixes nearly all of the reported doxygen warnings.

I tried to not clutter the log with removed trailing spaces.
Removed whitespace and converted tab/spaces for all files affected by this commit
are in a separate branch.
 2015-11-18 11:07:58 +11:00
Nicolas Tsiftes
e642dfc671 Merge pull request #1311 from arurke/dis-config 
Add configuration of DIS start delay and interval in RPL conf.
 2015-11-17 17:48:18 +01:00
Simon Duquennoy
79c436ac03 rpl_verify_header: sanity-check 'sender' before updating rank 2015-11-16 11:15:36 +01:00
Simon Duquennoy
586f4a4ae3 sicslowpan.c: warning-free compilation even with fragmentation disabled 2015-11-11 11:46:18 +01:00
Simon Duquennoy
fbd78a7e3b Merge pull request #1293 from simonduq/pr/fix-warnings 
Fix a number of compiler warnings and enable -Werror in Travis
 2015-11-10 08:49:11 +01:00
Tommy Sparber
0e0bf33d31 uIP Stats: Count sent ICMP6 packets 
The sent ICMP6 packets (for example from RPL) are currently
not counted towards the sum of sent ip and icmp packets.

Is there any reason behind this or is it just a bug?
Looking at the code I found no side effects of adding these two lines.

Debug output:
```
uip_stat.ip .recv 10 .sent 23 .forwared 0 .drop 0
uip_stat.icmp .recv 10 .sent 11 .drop 0
uip_stat.udp .recv 0 .sent 12 .drop 0
```
(Sum of ip.sent matches icmp.sent and udp.sent)
 2015-11-03 15:10:22 +11:00
Andreas Urke
857d69a338 Remove stray stars in comments 2015-11-02 13:23:40 +01:00