Nicolas Tsiftes
ac869185c0
Refactored header management.
2011-12-02 15:55:07 +01:00
Nicolas Tsiftes
5c0100c979
Use rpl headers.
2011-12-02 15:54:49 +01:00
David Kopf
74aa63de43
Add optional correction for phase drift of receiver.
2011-12-01 10:02:37 -05:00
Nicolas Tsiftes
220e6f7b88
Minor documentation improvements.
2011-12-01 14:40:54 +01:00
Nicolas Tsiftes
7c808081d6
Coding style
2011-11-23 14:36:50 +01:00
nvt
e11b7d4fb6
Removed redundant code
2011-11-22 14:18:32 +01:00
Nicolas Tsiftes
cef95ebf9b
Inverted DAG ID check
2011-11-21 15:50:19 +01:00
Nicolas Tsiftes
2b1549bfe8
Continued merge with sf master
2011-11-21 15:25:13 +01:00
Nicolas Tsiftes
0e32956a63
Merge remote-tracking branch 'sf/master' into rpl-patch
2011-11-21 14:59:31 +01:00
Nicolas Tsiftes
ea73f1d767
Do not force DIO reset on certain events where it is not needed.
2011-11-16 09:49:22 +01:00
Nicolas Tsiftes
b405571e32
Update next-hop address for existing routes.
2011-11-16 09:05:34 +01:00
Nicolas Tsiftes
ef0ce944e5
Split management of extension headers into a separate file and fixed coding style.
2011-11-16 09:00:19 +01:00
Nicolas Tsiftes
63afff5436
Removed debug output and fixed coding style.
2011-11-16 08:56:56 +01:00
Nicolas Tsiftes
e716ce25a1
DEBUG off.
2011-11-16 08:50:01 +01:00
Niclas Finne
63e40d195e
Restore packetbuf before mac callback (earlier commit was accidental reverted)
2011-11-15 16:59:12 +01:00
David Kopf
8e47694597
Add RDC_CONF_HARDWARE_CSMA, RDC_CONF_HARDWARE_ACK, RDC_CONF_MCU_SLEEP, CONTIKIMAC_CONF_SHORTEST_PACKET_SIZE for use with hardware having those modes.
...
Default behaviour should be unchanged.
2011-11-14 12:02:47 -05:00
Joakim Eriksson
5281e7c59c
made linkable with IAR linker - avoiding multiple defs of rime_sniffer, etc
2011-11-08 11:57:17 +01:00
David Kopf
a547b2259e
Avoid infinite loop when printing garbled packets
2011-10-27 11:13:26 -04:00
David Kopf
659d30c6c2
Fix sd6 typo
2011-10-27 09:24:05 -04:00
Joakim Eriksson
2a94b3ce82
added debug callbacks
2011-10-27 12:32:16 +02:00
Niclas Finne
b01cbb996d
Fixed to restore packetbuf before mac callback
2011-10-21 17:52:31 +02:00
Joakim Eriksson
1b0af2a21d
fixed powertrace attribution for 6lowpan traffic
2011-10-20 12:37:56 +02:00
Joakim Eriksson
2399689bbd
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-10-17 14:16:57 +02:00
Joakim Eriksson
17bbb1f1c1
fixed so that rpl avoids sending no-path DAOs when changing parent when in NO_DOWNWARD mode of operation
2011-10-17 14:16:19 +02:00
David Kopf
8ebd7a65a4
Add missing includes, remove unimplemented function declaration.
2011-10-13 11:23:53 -04:00
Joakim Eriksson
cf61e522a8
added powertrace to IPv6 including an example
2011-10-13 15:09:40 +02:00
nvt
d711887a1b
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-10-10 22:11:52 +02:00
nvt
6611291dd0
Ensure that packet metric is always set.
2011-10-10 22:10:21 +02:00
simonduq
a2073db715
Removed ContikiMAC burst dependency to phase optimization
2011-10-04 10:29:40 +02:00
Joakim Eriksson
e0ae036a69
added static on the list send functions to get less compiler errors with IAR compiler
2011-10-03 15:17:30 +02:00
simonduq
222f9bd3af
Include string.h
2011-09-29 15:07:00 +02:00
simonduq
dd8576830e
Added bursts support in CSMA/ContikiMAC, and CFS-swapping in
...
queuebuf. Exemplified in examples/udp-stream.
2011-09-27 16:47:03 +02:00
Joakim Eriksson
ab049ec704
some fixes to cut some extension headers before TCP processing
2011-09-22 17:22:59 +02:00
nvt
ab0c04b041
Move 16-bit integer conversion operations into functions, as is done already with 32-bit ops.
2011-09-06 17:28:39 +02:00
nvt
942ba1f7bd
Removed const qualifier to conform with the rest of the Rime interface.
2011-09-05 22:05:41 +02:00
Niko Pollner
84105f4e47
Improved multihop/mesh route discovery.
...
Packetbuffer is now saved before route discovery and resent when a
route is found.
This solves the following problems:
- First packet sent to a certain node is corrupted.
- Packet to be forwarded that triggers route discovery is lost.
2011-09-05 21:27:38 +02:00
Adam Dunkels
3fa14d3cd5
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-09-05 20:45:24 +02:00
Adam Dunkels
13853b2cfd
Set default RDC wakeup rate to 8 hz
2011-09-05 20:42:38 +02:00
nvt
644f1c627d
Initialize the DIO object in case options are missing. Updated the terminology regarding options.
2011-09-05 20:28:50 +02:00
Adam Dunkels
f7a3a8476f
Added a safeguard to fragmentation reassembly: if there are additional bytes in the final fragment, we shave them off in the spirit of being 'liberal in what we accept'
2011-09-05 14:26:48 +02:00
Joakim Eriksson
7b50b87e12
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-09-05 11:40:22 +02:00
Joakim Eriksson
62705a17ea
Send DAOs if dtsn differs instead of only when larger than last dtsn in DIO
2011-09-05 11:36:53 +02:00
Adam Dunkels
bd951031ef
Cleanup of the ContikiMAC code; removed the old an unused announcement code
2011-09-02 14:06:29 +02:00
Adam Dunkels
61ef9b6fc3
Cleanup of the ContikiMAC code; removed the old an unused announcement code
2011-09-02 14:06:27 +02:00
Adam Dunkels
9b53b3aa8e
Small spelling bugfix
2011-09-02 13:51:28 +02:00
Adam Dunkels
2da65385a0
Added a SICSLOWPAN_CONF_COMPRESSION_THRESHOLD that can be used to set a threshold under which header compression should not be used. Below this threshold, headers are not compressed but sent as full IPv6 packets. This is useful for RDC layers, such as ContikiMAC, which set a lower bound for packet size.
2011-09-02 13:51:09 +02:00
Adam Dunkels
3cb42ceb10
Made the ContikiMAC header configurable from contiki-conf.h
2011-09-02 13:37:46 +02:00
Adam Dunkels
9e30f0f7c6
Minor code style fixes
2011-09-02 08:16:50 +02:00
Adam Dunkels
6220e231a2
Fixed previously erroneously fixed include
2011-09-01 09:11:46 +02:00
Adam Dunkels
4cf82b2764
Fixed includes
2011-09-01 08:45:18 +02:00
Adam Dunkels
d6508cf3c0
Made the number of phase neighbors configurable
2011-08-31 20:54:21 +02:00
Adam Dunkels
81e098d2da
Added some defensive programming
2011-08-31 20:53:48 +02:00
Adam Dunkels
7ce313eef6
A significantly simpler API for sending UDP packets
2011-08-29 21:30:21 +02:00
David Kopf
11efc33d2c
Make comparison endian-safe, thanks Ivan.
2011-08-18 14:01:20 -04:00
David Kopf
df70b21c70
gcc 4.4.1 - 4.6.0 compiler bug workaround.
2011-07-31 15:36:01 -04:00
Vincent Brillault
d7c114dbd8
RPL prefix handling fix : Change IP on DODAG change, delete IP when leaving DODAG.
2011-07-13 10:42:59 +02:00
Vincent Brillault
d8d9494168
uip : When creating a route with a "state" field, clear it (It's possible that the process responsible for this creation doesn't handle the state field)
2011-07-13 10:31:22 +02:00
Vincent Brillault
4f76130a77
Changed Instance structure in order to decrease memory waste.
2011-07-13 10:28:56 +02:00
Vincent Brillault
286cf002bc
Clean nd6 debug output (use uip-debug instead of local code)
2011-07-11 16:53:36 +02:00
Vincent Brillault
f4b804ed9f
Add support of RPL Option ( http://tools.ietf.org/html/draft-ietf-6man-rpl-option-03 ):
...
- Auto-insersion when forwarding messages
- Delete messages with 2 rank errors
Not supported yet :
- Routing depending on InstanceID
- DAO inconsistency loop recovery
- Full UDP or TCP support (Bugs in µIPv6)
- Real Option Type (TBD by IANA)
2011-07-11 16:53:02 +02:00
Vincent Brillault
dc9cbe647d
Changes in RPL implementation :
...
- Structural modification of RPL data storage.
- Support multiple gateways (multiple DODAG-ID with a unique InstanceID)
- Use Lollipop counters
- Add leaf-only configuration option for RPL
Bugfix :
- Correctly send "Grounded" flag in DIO
2011-07-11 16:52:45 +02:00
Vincent Brillault
2ac91d53b5
Add (dangerous) feature : use layer 2 acks instead of NUD in the IPv6 layer.
...
(Decrease packet numbers but dangerous if neighbors change their ips (not a problem in standard RPL with EUI-64 based addresses))
2011-07-11 14:19:14 +02:00
Vincent Brillault
6ddd0bb190
Allow to completely desactivate DAD (useless in route-over LLN as implemented, see http://tools.ietf.org/html/draft-ietf-6lowpan-nd-15#section-8.2 )
2011-07-11 13:51:38 +02:00
Vincent Brillault
b0907f0344
Cleaning old .h :
...
- Delete unimplemented function and unused structures
- Remove misleading configuration options
- Transfer some comments from 6lowmac to framer-802154
(doc/uip6-doc.txt should be cleaned as well)
2011-07-11 13:20:30 +02:00
Nicolas Tsiftes
77a44c560a
The flags field got widened to 9 bits.
2011-06-28 17:49:32 +02:00
Nicolas Tsiftes
b1fea35e47
Fixed issues with propagation of the route lifetime configuration. Removed deprecated configuration parameters.
2011-06-28 17:08:44 +02:00
David Kopf
c48b7ab78d
Add RPL nodes and border router to minimal-net platform (cygwin only)
2011-06-28 08:19:48 -04:00
Nicolas Tsiftes
6749281a87
Rediscover lost routes when forwarding packets. Also refresh route entries when sending packets through them. Patch from Jaroslav Meduna.
2011-06-23 14:45:11 +02:00
Niclas Finne
28b0479c06
Added optional address filtering
2011-06-15 17:51:57 +02:00
Niclas Finne
e8a96dc202
Bug fix: update packet attributes in queued packets in CSMA instead of doing a full packetbuf copy after transmissions. The lower layers often add their own headers to packetbuf.
2011-06-15 16:10:07 +02:00
Niclas Finne
154f971b2b
collect_send() should return 0 if the packet could not be enqueued to be sent
2011-06-07 19:45:41 +02:00
dak664
580efaa412
Fix compiler warning for unused variable
2011-05-18 11:22:25 -04:00
Joakim Eriksson
2432a8ee7d
set expected reception sequence no to zero - to get initial connection to avoid having ack-number other than zero
2011-03-11 14:27:23 -05:00
Salvatore Pitrulli
4fb433ac1f
'if' statement replaced by a preprocessor directive.
2011-05-12 21:50:47 +02:00
Joakim Eriksson
695c7d74b8
fixed bug in 6lowpan compression when compressing
2011-05-09 09:57:37 +02:00
nvt
e00508472c
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-05-03 18:18:50 +02:00
nvt
15ee0a6414
Send No-Path DAOs correctly.
2011-05-03 17:50:24 +02:00
Adam Dunkels
dfaf4afc8e
Rime sniffers must be called for all transmissions, even if they failed, to get energy attribution right. This means that rime output sniffers now also must take the MAC transmission status as an argument.
2011-05-02 15:06:34 +02:00
Zhitao He
cae8ef206a
fixed excessive retransmissions of junk packets after runicast timeout
...
fixed stuck packet ID for next packet after runicast timeout
2011-04-27 19:12:46 +02:00
nvt
4b5d380c74
Announce MAX_PATH_COST if we don't have a preferred parent.
2011-04-25 22:37:25 +02:00
Adam Dunkels
74f1754d88
Bugfix: energy consumption for retransmissions was miscounted
2011-04-13 14:10:39 +02:00
Adam Dunkels
af4ce9ba9e
Bugfix: idle power consumption was sometimes misestimated for transmissions, when a duty cycle rtimer fired in the middle of a transmission
2011-04-13 14:10:02 +02:00
Oliver Schmidt
07f3df45be
Converted scope-local variables into function-local variables.
...
The 6502-specific LC implementation doesn't allow for scope-local vaiables between PT_BEGIN/PROCESS_BEGIN/PSOCK_BEGIN and PT_BEGIN/PROCESS_END/PSOCK_END.
2011-04-12 14:12:09 +02:00
Joakim Eriksson
5a054c82d2
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-04-07 17:46:01 +02:00
Joakim Eriksson
02fcf5835a
fixed RPL to handle inifinite rank better
2011-04-07 17:44:07 +02:00
Niclas Finne
5a4a39afb3
changed etx to metric
2011-04-07 09:46:37 +02:00
Joakim Eriksson
d8e54ca585
fixed for compilation with IAR compiler
2011-04-06 20:14:30 +02:00
Joakim Eriksson
26f0a6e88e
changed ext to link_metric
2011-03-28 16:17:53 +02:00
Joakim Eriksson
c9af578eab
added psock function for reading specified number of bytes
2011-03-09 02:40:53 -05:00
Joakim Eriksson
2baa6cf1b5
fixed so that ] is accepted as end of IPv6 address
2011-03-08 23:11:06 -05:00
Joakim Eriksson
590b0a1696
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-03-22 10:46:46 +01:00
Joakim Eriksson
90ae09c7e5
fixed parsing of address to handle [<addr>]
2011-03-22 10:42:38 +01:00
nvt
55c4df8ee7
Slight generalization to make it easier to switch metric.
2011-03-17 20:29:38 +01:00
nvt
cdaf58f892
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-03-17 20:23:53 +01:00
nvt
8078ef7705
ROOT_RANK is now a macro function.
2011-03-17 20:21:56 +01:00
Nicolas Tsiftes
c461266524
Made the code more conforming to the Contiki style.
2011-03-16 13:35:44 +01:00
Nicolas Tsiftes
65366d10c1
Update the metric container correctly. Use only one ETX initializer.
2011-03-16 13:29:01 +01:00
Nicolas Tsiftes
eee9a68b12
Simplified. Removed the need for an initial guess.
2011-03-16 13:26:52 +01:00
Joakim Eriksson
6554e87c00
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-03-15 14:15:55 +01:00
Joakim Eriksson
5f4d4550fc
fixed RPL statistics bug and added parent switch stats
2011-03-15 14:14:41 +01:00
nvt
4739143126
Generalized MRHOF and added partial support for energy objects in DAG metric containers.
2011-03-15 01:16:20 +01:00
dak664
a883c9bcbc
Add PRINTA so direct calls to debug routines will always print
2011-03-13 11:57:39 -04:00
Joakim Eriksson
340c86e401
reverted to byte-based iid check
2011-03-07 22:02:43 +01:00
Joakim Eriksson
4599284110
minor cleanup of 16-bit compressable macro and comment
2011-03-07 14:50:29 +01:00
Joakim Eriksson
972c1992d2
16-bit addr compression fix
2011-03-06 22:34:16 +01:00
nvt
a7addf990f
Avoid hysteresis check if neither p1 nor p2 is the preferred parent.
2011-03-04 16:40:40 +01:00
Fredrik Osterlind
499c13a357
removed execute flag of source files (avoids diff problems with egit)
2011-03-01 18:16:42 +01:00
Joakim Eriksson
fa0fbf5dab
fixed format of transit subopt
2011-03-01 12:33:34 +01:00
dak664
7f3c198a78
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-02-28 16:32:48 -05:00
dak664
105f581d86
Use AVR program flash for uip-debug.h printfs.
2011-02-28 16:23:05 -05:00
Mariano Alvira
e826ccd3b9
add NULLRDC_CONF_802154_AUTOACK_HW for radios that only pass-up NOACK
...
status but not the actual ack packet.
2011-02-23 15:19:44 -08:00
Mariano Alvira
a8f9119ace
pass up a RADIO_NOACK to the MAC layer.
2011-02-23 15:19:43 -08:00
Joakim Eriksson
3cd7835f5c
made DIO parameters configurable
2011-02-22 18:24:05 +01:00
Joakim Eriksson
68e9fb2a5c
added annotate when setting root and joining dag
2011-02-22 16:19:42 +01:00
nvt
e9234a8404
Error: the value was printed before setting it
2011-02-22 02:01:15 +01:00
Adam Dunkels
733aaa546f
Made the number of MAC sequence numbers to remember configurable; fixed bug with power attribution to the idle state.
2011-02-21 14:11:32 +01:00
Adam Dunkels
24af4888bc
Made the number of MAC sequence numbers to remember configurable
2011-02-21 14:11:17 +01:00
Lionel Debroux
5cb49e8b07
Several compiler warning fixes:
...
* msp430: fix "implicit declaration of function" warnings in clock.c, by including watchdog.h;
* sky: fix a couple pointer target signedness warnings;
* core: fix several signed/unsigned comparison warnings;
* framer-802154: "const static" -> "static const" to fix compiler warnings;
* core: comment or remove unused variables and function definitions.
Signed-off-by: Lionel Debroux <lionel_debroux@yahoo.fr>
Signed-off-by: Mariano Alvira <mar@devl.org>
2011-02-20 19:28:14 -05:00
nvt
01b7a4f7f2
Replaced ROOT_RANK with a macro that allows for other min_hoprankinc parameters than the default. Also made some minor style improvements.
2011-02-20 20:15:40 +01:00
Mariano Alvira
bb1baffc79
change FIX2ETX -> NEIGHBOR_INFO_FIX2ETX in some debug prints.
2011-02-17 20:54:57 -05:00
Nicolas Tsiftes
93a7280a1a
Replaced old description
2011-02-15 18:10:15 +01:00
nvt
99d0387a8e
Merge branch 'master' of github.com:adamdunkels/contiki-2.x
2011-02-15 01:13:41 +01:00
nvt
a093c262ee
Improved objective function API so DAG metric containers can be generated cleanly. The packet generation now asks the OF to provide a fresh logical presentation of the metric container, which is then translated to raw packet format.
2011-02-15 01:13:30 +01:00
Adam Dunkels
db37e38156
Make sure we don't remove the preferred parent
2011-02-14 23:01:11 +01:00
nvt
cbe4513bf4
basic support for parsing metric containers in DIOs
2011-02-13 23:17:56 +01:00
nvt
539ff33104
Turn off debugging
2011-02-13 21:36:07 +01:00
nvt
0df450f0dc
Add the NEIGHBOR_ATTR prefix to a macro name
2011-02-13 21:34:59 +01:00
nvt
5ec2f19dc9
Remove only the worst parent if the table is full when processing a DIO.
2011-02-13 21:33:47 +01:00
Adam Dunkels
432928d000
Changed the name of macros defined in neighbor-info.h to have the NEIGHBOR_INFO prefix.
2011-02-13 21:29:59 +01:00
Adam Dunkels
acb5480aa9
Changed the name of macros defined in neighbor-info.h to have the NEIGHBOR_INFO prefix.
2011-02-13 21:21:14 +01:00
Adam Dunkels
ed3995960d
Changed the name of macros defined in neighbor-info.h to have the NEIGHBOR_INFO prefix.
2011-02-13 21:21:13 +01:00
Adam Dunkels
15bf73ba08
Use DAG_RANK() macro to compute rank
2011-02-13 19:01:15 +01:00
Adam Dunkels
e980072817
Don't add neighbor as a potential parent if its rank is too high.
2011-02-13 18:05:28 +01:00
Adam Dunkels
2a96835c05
Don't remove all parents that have a worse rank than an incoming DIO: we may inadvertently remove our preferred parent. Instead, remove parents with a rank that is worse than our preferred parent. If we are lucky, this will give us enough space for the new parent.
2011-02-13 14:16:15 +01:00
Adam Dunkels
f1ac94e415
Slight code complexity reduction
2011-02-13 14:14:49 +01:00
Adam Dunkels
3a824d0ed6
Added a hysteresis when choosing a new parent: don't switch parent unless the ETX is significantly better (1.5 ETX better).
2011-02-13 14:14:16 +01:00
Joakim Eriksson
48fb9dda9e
fixed of0 to respect min hop rank increase
2011-02-13 11:25:53 +01:00
nvt
20171985c6
Split the RPL header into a private and a public header.
2011-02-11 16:21:17 +01:00
Adam Dunkels
706045120f
Changed the variable name local_confidence to etx to better reflect what it was used for
2011-02-11 14:18:57 +01:00
Adam Dunkels
ba6bf7dd6b
Rewrote the parent selection to favour parents with a low ETX and a good rank. The old parent selection would always favour parents with a lower rank, regardless of their ETX, which in some cases lead to suboptimal parent selections. Also, the old code was buggy in that it would always pick the worst parent (the one with the highest ETX).
2011-02-11 14:17:26 +01:00
Adam Dunkels
bb8377dfee
Set the end-of-stream flag on the TCP FIN packet
2011-02-10 22:47:45 +01:00
Joakim Eriksson
d24c63c0f1
fixed so that minhoprankinc is configurable
2011-02-10 19:44:12 +01:00
Adam Dunkels
8d55a68ebe
Added a PACKETBUF_ATTR_STREAM_END packet flag
2011-02-08 22:20:07 +01:00
Adam Dunkels
46348d9013
Added the low-power streaming mode where frequent channel checks are performed when streaming is on. Enabling this will (by setting WITH_STREAMING to 1), however, significantly slow down Cooja/MSPsim simulations.
2011-02-08 21:57:46 +01:00
Joakim Eriksson
d518c84471
made rank calculation depend on selected parent when joining DAG
2011-02-08 19:59:50 +01:00
Nicolas Tsiftes
aeca16d01f
Just update the node rank and let rpl_process_parent_event take care of the rest
2011-02-07 17:29:23 +01:00
Nicolas Tsiftes
e3638d2791
Updated to the minrank-hysteresis OF
2011-02-04 15:46:01 +01:00
joxe
389a4f9220
added rpl-all-nodes multicast address to nodes mcast addresses
2011-01-25 22:41:30 +00:00
adamdunkels
09c223f549
Updated Contiki X-MAC to use hardware acks, which allows for tighter timing and results in a lower duty cycle. Hardware acks also make X-MAC more robust against packet losses, as there is a direct way for the CSMA layer to detect loss of data packets. Before, Contiki X-MAC only detected loss of strobes.
2011-01-25 14:31:09 +00:00
adamdunkels
d51e99a3dd
Updated streaming mode to use only about 20% radio. Made guard time more conservative due to problem report by Ricklef Wohlers.
2011-01-25 14:29:46 +00:00
adamdunkels
fa524fabd7
Bugfix: q->buf was not tested for NULL, as it should be. Fix by Simon Duquennoy.
2011-01-25 14:24:38 +00:00
joxe
e79c0ab1ee
fixed rpl so that it sends and receives on the rpl-all-nodes multicast address
2011-01-25 09:55:12 +00:00
joxe
3a643fa0c6
added address macros for rpl-all-nodes
2011-01-25 09:54:03 +00:00
adamdunkels
4b4b8fad56
More recent packet entries. Allow 4 queue entries to be dedicated to generated packets.
2011-01-18 16:05:53 +00:00
adamdunkels
808c21fbfa
Bugfix: default should be 3 MAC-level retransmissions if collissions or loss occurs
2011-01-18 16:03:57 +00:00
adamdunkels
affba785b5
Enabled phase-lock only for channel check rates of 32 Hz or lower
2011-01-18 16:03:19 +00:00
adamdunkels
26e3b6fdc0
Bugfix by Simon Duquennoy: don't transmit packet until previous packet has been sent by the RDC layer.
2011-01-13 19:06:22 +00:00
adamdunkels
81d23a3a36
Minor bugfixes pertaining to queue handling: if a packet was explicitly dropped, the packet would later be acknowledged despite it never being received; added a limit on how many queue entries that can be used for packets that are being forwarded, to allow for originated packets even if the forwarding queue is filled.
2011-01-10 15:10:43 +00:00
adamdunkels
70f9f075a0
Safeguard against NULL arguments
2011-01-10 15:08:52 +00:00
adamdunkels
148bd60fe1
Bugfix: the defensive retransmission timer setting must be made before the packet is transmitted, otherwise the retransmission timer will always be for the defensive retransmit
2011-01-09 23:49:27 +00:00
adamdunkels
50a3e6ea23
Increased the max ETX to allow for longer paths even with the initial conservative ETX estimate; made collect use announcements by default
2011-01-09 23:48:33 +00:00
adamdunkels
acf45ec648
Bugfix: memory wasn't freed when a neighbor was dropped from the list. Also increase the max age to 180 minutes to allow for regular beacons to refresh the neighbor before it is dropped.
2011-01-09 21:20:05 +00:00
adamdunkels
90dc0ceebf
Replaced default link estimator with an exponential weighted moving average, which reduces memory consumption per neighbor.
2011-01-09 21:14:22 +00:00
adamdunkels
4e91d9303e
Added safeguard timer if the MAC layer would fail to call back after transmission.
2011-01-09 21:13:20 +00:00
adamdunkels
a0960154ba
Cleaned up parts of the code; added comments
2011-01-09 21:07:01 +00:00
nvt-se
30f5e29db7
dos2unix conversion
2011-01-05 17:01:03 +00:00
joxe
65048c519c
removed some void * casts in uip code
2011-01-04 22:11:37 +00:00
nvt-se
7a43b7d832
Configuration of the objective function made easier. Updated OF0 to the new rank calculation.
2011-01-04 20:43:28 +00:00
joxe
b2296e462b
removed void * + changed ux_t to uintx_t
2011-01-04 20:22:21 +00:00
dak664
3c3cd868cd
Allow shorter UIP_CONF_WAIT_TIMEOUT for more aggressive power saving modes.
2010-12-24 00:39:04 +00:00
dak664
322d835fee
Fix avr-gcc compiler warnings
2010-12-18 22:12:53 +00:00
nvt-se
8f76c82433
Improved DAO management.
2010-12-17 15:24:25 +00:00
adamdunkels
4914739e5d
Revived the timesynch module, which has been switched off since the introduction of the new radio API after Contiki 2.4. The new code uses explicit timestamp messages instead of piggybacking timestamps on every transmission. It is also significantly better in terms of exactness.
2010-12-16 22:47:38 +00:00
adamdunkels
10fb99a89d
Reduced the value of the max depth, so that a count-to-infinity loop will not count too long before hitting the maximum value. This is important when a network loses its sink, so that packets are not forwarded around the network for ever.
2010-12-16 22:46:34 +00:00
adamdunkels
19e930e6f2
Changed the behaviour of retransmissions to work better with the in-order CSMA code. The retransmission timer is now set when the packet is known to be sent by the MAC layer.
2010-12-16 22:45:15 +00:00
adamdunkels
4a89cc9db3
Rework of the new CSMA in-order code that fixes a number of smalllish bugs in the in-order code.
2010-12-16 22:44:02 +00:00
adamdunkels
79f2c25dae
Rework of the phase-lock optimization mechanism. There were several bugs in the existing code, such as the phase-lock would lose synchronization when a packet was lost.
2010-12-16 22:43:07 +00:00
adamdunkels
01c28ab502
Added explicit timestamp packet type, for the revived timesynch support
2010-12-16 22:41:43 +00:00
nvt-se
dae3dc22f3
Corrected a comment that was accidentally overwritten in a previous commit
2010-12-15 19:57:40 +00:00
nvt-se
cd08939b38
Corrected the reported ETX in the initial callback, and fixed the coding style
2010-12-15 14:35:07 +00:00
nvt-se
79ae813f88
Improved macro definitions and removed obsolete declarations.
2010-12-15 13:37:34 +00:00
nvt-se
542bbd4b31
Increased the width of dio_next_delay to avoid possible wrappings
2010-12-15 12:24:00 +00:00
nvt-se
486f202d09
Fixed problem with too large values for the DIO timer.
2010-12-15 12:12:27 +00:00
dak664
a026c94467
Fix compiler warnings
2010-12-14 22:45:22 +00:00
dak664
0a4a0ffb32
Add SICSLOWPAN_CONF_ACK_ALL for hardware autoack testing
2010-12-14 22:18:20 +00:00
dak664
240d478c1f
Allow platform to specify COLLECT_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME
2010-12-14 22:14:33 +00:00
adamdunkels
952dfc9384
Rework of the CSMA layer: instead of using one timer per packet, the module now uses one central timer and a queue of outgoing packets. This helps to keep packets in order, which is extremely useful for TCP transfers, and reduces the amount of congestion since consecutive packets now are spaced in time if there is a collision. Based on the observations and ideas of Simon Duquennoy.
2010-12-14 07:57:14 +00:00
dak664
0e60c99e80
Add defines to set stateful address prefixes.
2010-12-13 23:27:40 +00:00
dak664
9c66df6de1
Fix ancient RAND_MAX compiler warning
2010-12-13 16:52:02 +00:00
joxe
3e293e6cfc
updated rpl dio message format to be compliant with latest version
2010-12-13 10:59:37 +00:00
nvt-se
c9cc87ef25
Added support for Mode of Operation flags in DIOs. Removed obsolete destination advertisement flags.
2010-12-13 10:54:25 +00:00
joxe
b66da85392
fixed comments and initialize flags in dio_output to zero
2010-12-13 09:59:46 +00:00
joxe
aa1795d5c2
removed route annotation from rpl - moved to ds6
2010-12-10 22:48:31 +00:00
joxe
2c30b3c6ba
added annotation for showing routes and default route during simulation
2010-12-10 22:46:58 +00:00
adamdunkels
af21afa750
Make sure that the cycle timing is exact
2010-12-10 13:36:06 +00:00
adamdunkels
e4cf633215
Put parenthesis around user-supplied options. Patch by Roger Larsson
2010-12-07 23:33:17 +00:00
adamdunkels
c19a967973
Bugfix: with the recent bugfixes, it was no longer possible to turn duty cycling back on after it had been turned off
2010-12-07 23:12:54 +00:00
joxe
e1fbb9bba0
changed neighbor state callbacks to occur only at add and remove
2010-12-07 10:36:03 +00:00
nvt-se
b2a28e6fc3
Fixed error reported by Pieter Agten. The reachable time is specified in milliseconds, and must thus be divided by 1000.
2010-12-06 09:48:48 +00:00
adamdunkels
4c9793f428
Let ContikiMAC remember the state that the radio should have when duty cycling is turned off. This fixes a bug in which the radio was turned on after sending, even when NETSTACK_RDC.off(0) was enabled.
2010-12-06 09:08:22 +00:00
dak664
f34e5ec798
Convert implicit printf to PRINTF
2010-12-04 21:06:04 +00:00
dak664
e54d7d6f9c
Fix compiler warnings
2010-12-02 15:55:17 +00:00
adamdunkels
6d556d5c13
Fixed bug with link-layer ACKs. Refactored the ACK reception code.
2010-11-25 08:44:34 +00:00
adamdunkels
2f66db3ded
Added a debug mode that keeps track of where individual queuebufs are allocated, which is useful when debugging queuebuf leakage problems.
2010-11-25 08:43:59 +00:00
nifi
3bd78893e5
Renamed nullrdc to nullrdc-noframer and nullrdc-framer to nullrdc.
...
nullrdc (previously nullrdc-framer) is now a RDC implementation that
does not do any radio duty cycling but supports link layer addresses
and frame format via framer (for example 802.15.4). nullrdc can now be
used in the same way as contikimac, xmac, etc.
nullrdc-noframer (previously nullrdc) is a null RDC implementation
that does not do any radio duty cycling, does not add any header of its
own to the packets, and does not support link layer addresses.
2010-11-23 18:11:00 +00:00
dak664
62d7832fff
Fix compiler warning and possible bug
2010-11-13 16:37:42 +00:00
nifi
05d78522d3
Added MAC-layer duplicate message suppression when using 802.15.4 auto ack
2010-11-12 12:53:16 +00:00
adamdunkels
8f745a6ea6
Added a function for obtaining the current parent
2010-11-06 14:32:10 +00:00
adamdunkels
9750eb93bf
Turn off debug messages
2010-11-03 15:41:23 +00:00
adamdunkels
a891a2ffe8
Bugfix: allow ICMPv6 to send packets larger than those whose length fits in one byte. Bugfix by mathieupouillot
2010-11-03 11:56:11 +00:00
adamdunkels
b7df18a96a
Turned off streaming by default to save code space; made guard time a little more conservative
2010-11-02 11:00:08 +00:00
adamdunkels
1b5001b226
Bugfix: out-of-order fragments were not handled correctly. minor style fixes
2010-11-02 10:56:57 +00:00
adamdunkels
5230e64112
Use the new shared ND-packet queue buffers
2010-10-29 05:36:07 +00:00
joxe
9a1f902881
made rank use full resolution when using OF-ETX
2010-10-28 20:39:06 +00:00
adamdunkels
f5031861ac
When IPv6 ND kicks in, the packet that caused the ND can either be dropped or saved in a buffer to be send when the NS reply returns. This commit reimplements the buffer management to avoid having one buffer per neighbor, but instead use a buffer pool from which buffers can be allocated for different neighbors.
2010-10-28 15:42:56 +00:00
adamdunkels
677575fc8c
Rewrote proactive link estimator to be invoked randomly instead of triggered by an empty queue; this makes network bootups because nodes are not synchronized
2010-10-28 15:36:02 +00:00
joxe
932fed8cc7
improved ETX calculation
2010-10-28 08:54:54 +00:00
nifi
25ceab07d2
Update annotation when removing preferred parent.
2010-10-27 12:27:57 +00:00
nifi
d2a3f1f257
We found that the preferred parent should be reset in the rpl_remove_parent function.
2010-10-27 12:20:35 +00:00
nvt-se
d528039f9a
Created a separate function for local repair. Added a statistics structure. Improved the control of malformed packets.
2010-10-27 00:46:40 +00:00
nvt-se
c2c0505402
Increased alpha to 85 in order to get slower changes in the ETX. Put back the start guess to 3.
2010-10-27 00:45:24 +00:00
joxe
43023ab425
made number of transmissions configurable
2010-10-26 13:25:32 +00:00
nvt-se
1fbc651bf3
Lowered the first guess for the ETX of a link.
2010-10-25 20:06:17 +00:00
nvt-se
127c87efcc
Fixed debug printfs. Added control of max_rankinc parameter.
2010-10-25 20:03:37 +00:00
nvt-se
19d7543267
Added detection of loops in DAO forwarding.
2010-10-25 19:49:12 +00:00
adamdunkels
9ecc0437f4
Left-over debug printf removed
2010-10-25 12:25:39 +00:00
adamdunkels
42f37ca1d3
Bugfix: removed old leftover code statement
2010-10-25 11:59:09 +00:00
adamdunkels
3bbd6a00a9
Replace old neighbors according to an LRU policy when a new neighbor needs to be added
2010-10-25 11:58:07 +00:00
adamdunkels
e680276954
ARP fix for multicast transmissions. (Patch by Robert Quattlebaum.)
2010-10-24 22:29:39 +00:00
adamdunkels
a8848517dd
UDP checksum is mandatory with IPv6. (Patch by Robert Quattlebaum.)
2010-10-24 22:28:43 +00:00
adamdunkels
77ecfb0366
Rewrote parts of the retransmission logic so that collect is robust against the situation where the MAC layer will fail to callback after a packet has been transmitted.
2010-10-24 21:08:19 +00:00
adamdunkels
8fa7bf6c31
Always restore the queuebuf to the packetbuf before calling the upper layers. Reduce the waiting time between successive MAC layer retransmissions.
2010-10-24 21:07:00 +00:00
adamdunkels
73f5535754
Made the guard time slightly more conservative - found an occasion where this was needed
2010-10-24 21:06:17 +00:00
adamdunkels
8f8741c7f0
Small style fixes
2010-10-24 21:05:42 +00:00
nvt-se
00a000cca0
Print the rank correctly in the debug output.
2010-10-22 15:40:10 +00:00
nvt-se
86823a84fb
Export fix-point representation of the ETX. Make RPL temporarily use the same representation as before.
2010-10-22 13:50:13 +00:00
joxe
804d23e9f4
made DIS Interval configurable
2010-10-22 13:13:40 +00:00
joxe
e414c8c5a4
added function for retrieving link etx to neighbor
2010-10-22 11:34:24 +00:00
nvt-se
6e28b1d3fb
Reduced ETX_LIMIT in order to avoid overflows. Removed ETX_LOSS_PENALTY and set packet_etx to ETX_LIMIT instead upon packet loss.
2010-10-21 19:46:21 +00:00
adamdunkels
9cb830ed37
Timing bugfix in the waiting period between channel samples to check if the coast is clear before sending a packet.
2010-10-20 22:25:24 +00:00
adamdunkels
3ffcff0656
Added mechanisms for explicit de-synchronization of synchronized neighbors. Added link-layer ACKs. Fixed bugs with MAC-layer interaction. Now seems to work somewhat (didn't work at all before, in some cases), but there are still problems with packet loss.
2010-10-20 15:23:43 +00:00
adamdunkels
5585d72c86
A simple but substantial change: uIP used the htons()/HTONS() macro
...
functions for converting between host and network byte order. These
names are the de facto standard names for this functionality because
of the original BSD TCP/IP implementation. But they cause problems for
uIP/Contiki: some platforms define these names themselves (Mac OS,
most notably), causing compilation problems for Contiki on those
platforms.
This commit changes all htons to uip_htons instead. Same goes for
htonl, ntohs, and ntohl. All-caps versions as well.
2010-10-19 18:29:03 +00:00
adamdunkels
34cba78ca8
Bugfix: bump advertisements only when a parent changes, not because of an upstream parent change
2010-10-19 07:34:29 +00:00
nifi
e2b4956a7f
Bug fix: release the packet and notify the sender if RDC returned an error
2010-10-14 19:08:39 +00:00
oliverschmidt
2f89e69ff7
Fixed build for platforms which use the default value for QUEUEBUF_NUM.
2010-10-12 19:51:28 +00:00
adamdunkels
020da4e8ba
Added a function for obtaining beacon intervals
2010-10-11 23:44:24 +00:00
adamdunkels
ec716ea62d
Do not reduce transmission interval, unless explicitly told so with the bump flag
2010-10-11 23:43:01 +00:00
adamdunkels
37adf130b4
Rewrite of the congestion logic. A node now report it being congested
...
when half the transmission queue is full. When a neighbor is heard to
be congested, the rtmetric of that node is inflated to avoid sending
more traffic in its direction.
Fixed problems with beacon intervals: intervals are now not reduced
when a path gets significantly worse, only when they get better.
2010-10-11 23:42:01 +00:00
adamdunkels
d821ba5e22
Added a lifetime for link estimates: if they are too old, they are
...
reset so that a new probing period can produce more up-to-date
estimates. Added a congestion mechanism whereby a neighbor can be
marked as being congested for a period of time, during which the ETX
for the neighbor will be artificially inflated.
2010-10-11 23:38:46 +00:00
adamdunkels
5eb4a0fe8d
Rewrote the initial link estimate logic: link estimates are now
...
computed only over the actual samples, not over the entire
buffer. Also, the initial link estimate is much more conservative now
(16 transmissions) to favor links that have been probed, and which
therefore are likely to have better ETXs.
2010-10-11 23:34:02 +00:00
adamdunkels
0cabe483c3
Don't call sink recv function for zero-size packets, since these most likely are link estimate probes or keepalive packets. Explicitly set eseqno to zero when opening a new connection.
2010-10-07 15:52:28 +00:00
adamdunkels
ad35c54473
Bugfix: when a node's rtmetric was lower than SIGNIFICANT_RTMETRIC_PARENT_CHANGE, its beacon timers would always be bumped to its lowest value
2010-10-05 20:06:47 +00:00
adamdunkels
52e9a6f1fb
Turned the DRAW_TREE debug flag off by default
2010-10-04 22:36:47 +00:00
adamdunkels
65d640ac53
Several bugfixes to the proactive link estimate maintenance code, which is now enabled by default. Simplified DRAW_TREE code for drawing routing graph in Cooja. Added routing metric penalty to parents that are congested or that drop packets.
2010-10-04 20:27:50 +00:00
adamdunkels
212e73faa6
Removed old netsim code. Added a function for obtaining the packet attributes of a queuebuf packet.
2010-10-04 20:26:01 +00:00
joxe
4f3fc1c404
fixed xmac to use new channel check define name
2010-10-03 22:46:53 +00:00
adamdunkels
ceebd7020a
Bugfix: the return value sometimes was wrong when a collision was detected.
2010-10-03 20:39:24 +00:00
adamdunkels
ae88ed04f1
Moved the definition of the channel check rate used by the radio duty
...
cycling layer. This definition was previously held in net/mac/mac.h,
with the name MAC_CONF_CHANNEL_CHECK_RATE. But since the rate is used
by the radio duty cycling layer, it makes more sense to change its
name to reflect this. Also, the configuration option should be tied to
the netstack configuration instead.
So the new configuration option is called
NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE.
2010-10-03 20:37:32 +00:00
adamdunkels
40583fe112
Removed the polite announcement code, since it was not used, and enabled the broadcast announcement code by default. Increased the default intervals for broadcast announcements.
2010-10-03 20:10:22 +00:00
adamdunkels
605392522f
Bugfixes and improvements: rtmetrics are now 16-bit clean. Added experimental feature that proactively probes neighbors that have not yet been tried out, in order to get an initial ETX for them.
2010-10-03 20:08:44 +00:00
adamdunkels
d0579c8a81
Cleaned up the collect neighbor management code
2010-10-03 20:07:10 +00:00
adamdunkels
b23a364397
rtmetric values should always be computed as 16-bit values
2010-10-03 20:06:25 +00:00
adamdunkels
32ba90ea4c
Bugfix: make sure that neighbor exists before attempting to update tx
...
count.
2010-09-28 06:53:02 +00:00
joxe
77c5187a2e
fixed bug where context is null but still referenced
2010-09-23 19:57:50 +00:00
joxe
494d2a3073
only compare with global addresses when selecting source for a specific destination
2010-09-23 18:17:27 +00:00
adamdunkels
eed22a6f3c
A number of changes to the collect code:
...
* Added an optional "keep alive" mechanism whereby an idle network is
periodically probed by dummy packets to maintain a recent quality
metric when there is no traffic.
* Bugfix in when new routing metrics should be advertised
* Rewrote the ACK logic so that a queuebuf is not allocated for each
ack, only for those acks generated by the sink node.
* Updated the wrap-around logic for sequence numbers: when a sequence
number wraps, it won't go back to 0. Instead, it wraps to 128. This
allows us to understand when a node has rebooted: when its seqno is <
128, it has recently rebooted.
2010-09-22 22:08:08 +00:00
adamdunkels
2cae71e89b
Added a function for obtaining the link estimate and rtmetric for a neighbor
2010-09-22 22:04:55 +00:00
adamdunkels
46b2451969
Made the initial link estimate explicit
2010-09-22 22:03:21 +00:00
joxe
1dc5366b15
fixed buggy comment
2010-09-21 13:15:25 +00:00
joxe
f1d19a5f9a
no callback to rpl if rpl is not used
2010-09-21 13:13:09 +00:00
joxe
63ab1ffce0
clear default route when neighbour is removed
2010-09-20 15:30:12 +00:00
nvt-se
58db04ee64
Set a high penalty for packet losses.
2010-09-15 15:59:52 +00:00
nvt-se
098f4001e0
Use fixed point arithmetic in the calculations of the ETX EWMA
2010-09-15 15:10:25 +00:00
nvt-se
adf6961a85
Various bug fixes and adjustments for rpl-11
2010-09-15 13:22:22 +00:00
adamdunkels
18e31f33b9
Minor tweaks. Removed debug output from CVS.
2010-09-14 06:48:36 +00:00
adamdunkels
eb58968459
Added a timer to each phase structure that keeps track of for how long
...
a particular receiver has not ACKed packets. After some time
(currently 16 seconds), the sender will begin sending full strobe
periods again.
2010-09-13 13:39:05 +00:00
adamdunkels
591766e663
Significant improvements to the Collect protocol:
...
* Loop detection and untangling. Now uses in-band loop detection that
works.
* Link quality estimation. Now starts with a conservative /
pessimistic estimate for new links.
* Retransmissions. MAC layer and network layer retransmissions are now
decoupled.
* Loss handling. Deals better with losses now.
* Concurrent applications. Each connection now maintains its own
neighbor table with separated cost to sink estimates for each
connection.
2010-09-13 13:28:14 +00:00
adamdunkels
4e0744954a
Rewrite of important parts of the Collect logic: link estimation
...
calculation and parent selection. This fixes a severe bug that caused
loops when packets were erroneously retransmitted due to ACK loss.
2010-09-08 19:21:45 +00:00
nifi
f05952c926
Changed packet id to use 8 bit instead of 4 bit
2010-08-31 13:14:49 +00:00
dak664
12479c32bc
Fix compiler warnings
2010-08-01 21:18:07 +00:00
nvt-se
11760059d3
The second predicate is not needed.
2010-07-03 23:52:02 +00:00
nvt-se
007d4a4001
Improved logic for processing DIOs
2010-06-28 14:51:23 +00:00
nifi
30db4eff52
Made QUEUEBUF_STATS configurable
2010-06-24 09:48:21 +00:00
nifi
e965b74cf5
added missing include
2010-06-18 08:28:56 +00:00
nifi
4741b95858
added missing include
2010-06-16 10:10:10 +00:00
nifi
21828ad782
Changed the retransmission time to be based on the configured MAC channel check rate when the RDC has no channel check interval.
2010-06-16 10:08:30 +00:00
adamdunkels
7647cbd8aa
Use the list_item_next() API
2010-06-15 19:22:25 +00:00
adamdunkels
560c84a2fe
Added a function for getting the first global IPv6 address
2010-06-15 19:16:22 +00:00
nifi
01b1359b1f
removed unused (and slightly problematic) code
2010-06-15 14:19:22 +00:00
adamdunkels
3fa8ffda1a
Moved the modules packetbuf, queuebuf, and packetqueue from net/rime to net/, since they are not Rime-specific
2010-06-14 19:19:16 +00:00
adamdunkels
951fd78f6c
ctimer moved from net/rime to sys/
2010-06-14 18:58:45 +00:00
nvt-se
fad2b1def9
Clarified the function naming for neighbor information callbacks - names now indicate where the information is from.
2010-06-14 18:35:04 +00:00
nifi
adc38568ad
Minor optimization: replaced init loops with memset to reduce code size
2010-06-14 13:51:13 +00:00
nifi
7499939c94
removed debug output
2010-06-14 13:07:09 +00:00
nvt-se
e000b1abf3
A major update to ContikiRPL resulting in a reduced code footprint by
...
300 bytes, as well as cleaner protocol logic.
* Made parent management uniform.
* Simplified the DIO processing.
* Improved the Objective Function API and its documentation.
* Removed redundant code at various places.
* Improved identifier naming.
* Switched visualization from candidate parents to preferred parents only.
* Made DAO ACK transmissions configurable.
* Improved initial ETX guess by using a cached local confidence value.
* Added a periodical rank recalculation function to reduce
the maximum stack depth.
* Increased the Trickle redundancy constant to ensure faster
topological updates.
2010-06-14 12:44:37 +00:00
adamdunkels
a890cd3d49
Moved ctimer.[ch] from their old and illogical location in core/net/rime to a more appropriate place in core/sys
2010-06-14 11:33:58 +00:00
adamdunkels
8f8393aadc
Moved ctimer.[ch] from their old and illogical location in core/net/rime to a more appropriate place in core/sys
2010-06-14 07:34:36 +00:00
adamdunkels
baa62e9314
Addresses are not const
2010-06-14 06:55:26 +00:00
adamdunkels
2647f879c2
Bugfix: select the best parent if current parent is NULL
2010-06-14 06:54:47 +00:00
adamdunkels
8d1680fed5
Filter duplicate packets
2010-06-14 06:52:41 +00:00
adamdunkels
a6bd51f361
If a packet is lost due to NOACK or TXERR, we count the number of transmissions and we add an additional loss penalty (currently one)
2010-06-14 06:51:58 +00:00
joxe
1095997b66
made DIOs and OCP 09 compliant
2010-06-12 10:55:46 +00:00
nvt-se
75b624eb71
Refactored the code, removed void pointer arithmetic, and fixed invalid list removal after freeing of memb object.
2010-06-11 12:32:48 +00:00
nvt-se
8a43743a42
Updated declaration for rpl_alloc_dag.
2010-06-08 21:41:02 +00:00
nvt-se
b1521e4950
Check correctly if a DAG already exists in the same instance.
2010-06-08 21:37:22 +00:00
adamdunkels
296c828ac2
Removed instant reaction to packet loss. Previously, a neighbor was dropped if no MAC layer ack was received.
2010-06-08 19:25:40 +00:00
nvt-se
4a08f545c9
Make the distinction between incoming and outgoing DTSN clear.
2010-06-08 16:21:54 +00:00
nvt-se
b8848f29eb
Replaced invalid attempt to switch preferred parent when its DS6 neighbor entry got purged.
2010-06-08 15:40:50 +00:00
nvt-se
4e61d69a49
Removed redundant code, moved the control of acceptable rank increases into a separate function.
2010-06-07 14:01:22 +00:00
nvt-se
c6c6760838
Validate incoming DTSN value
2010-06-07 13:40:05 +00:00
nvt-se
e5fd1f47fa
Copy the DTSN from the DIO when joining a DAG.
2010-06-07 11:36:02 +00:00
nvt-se
f0afbb69ab
Fixed typo
2010-06-06 21:48:15 +00:00
nvt-se
3748f782c5
Added basic functionality for DAO ACKs and DTSN. Randomized DAO timer.
2010-06-06 21:42:50 +00:00
joxe
f4508cc1e2
minor fixes + improved debug-printout
2010-06-06 12:45:55 +00:00
joxe
e75c77937e
fixed bug that caused problems when uncompressing unspecified address
2010-06-06 12:44:12 +00:00
joxe
17209e8fa4
moved code for autoconfiguring global address into join_dag
2010-06-03 18:37:47 +00:00
nvt-se
c201058325
Purge all routes related to a DAG being freed. Do not send no-DAOs when doing a global repair.
2010-06-03 15:20:56 +00:00
joxe
ba2bf31c20
changed DAOs to be formatted according to the rpl-08 specification
2010-06-03 14:49:15 +00:00
nvt-se
f52e97111f
Made the remove_parents function more powerful by adding a flag that indicates whether no-DAOs should be sent or not. Fixed some style issues and a possible NULL pointer dereference.
2010-06-03 12:55:09 +00:00
nvt-se
352fb4e74d
Restrict the rank to INFINITE_RANK
2010-06-03 12:12:20 +00:00
joxe
62abed8347
fixed a minor bug causing too low rank during global repair
2010-06-02 16:54:59 +00:00
joxe
941443878b
fixed rank calculation bug in of-etx
2010-06-02 16:23:08 +00:00
joxe
f069320ca9
removed sequence_number and replaced with version - fixing global repair functionality
2010-06-02 11:59:51 +00:00
joxe
fec0e8df69
changed RPL to be more 08 compliant - DIO and DIO options are formatted as in RPL-08
2010-06-01 22:30:02 +00:00
joxe
7887559d56
fixed bug in ttl decompression
2010-06-01 12:37:54 +00:00
joxe
518f9c1a00
refactoring and cleanup
2010-05-31 20:42:27 +00:00
nifi
b54c6e673b
Updated API for uiplib and resolv to use uip_ipaddr_t instead of uint16_t for compability with IPv6
2010-05-31 15:22:08 +00:00
nvt-se
c13bb8666b
Better validation of incoming DIOs. Added a reset function to the OF API.
2010-05-31 14:22:00 +00:00
oliverschmidt
126ea40994
Removed UIP_CONF_PLAIN_BUFFER again now that the pointer indirection to uip_buf was removed again.
2010-05-30 09:46:12 +00:00
nvt-se
f135105567
Added support for multiple objective functions.
...
Extended the objective function API with a callback function that receives link-layer neighbor information.
Throttled DAO transmissions to one per DEFAULT_DAO_LATENCY period.
Added support for an ETX objective function (hysteresis control still lacking though).
Fixed a leak of routes installed by DAOs.
Control that dst_adv_supported is set before sending DAOs.
Improved debugging output.
2010-05-29 22:23:21 +00:00
nifi
f6e0b46f38
* Made Chameleon header processing module configurable (CHAMELEON_CONF_MODULE)
...
* Removed the unused init function from header processing modules
* Added option CHAMELEON_CONF_WITH_MAC_LINK_ADDRESSES to specify that
MAC link addresses should be used instead of Chameleon's own encoding
of sender and receiver. This avoids encoding the link addresses twice
when the MAC RDC has its own addresses.
2010-05-28 06:18:39 +00:00
nifi
b7b2c8fcde
Added macro to identify address attributes for use in header processing modules
2010-05-27 20:28:29 +00:00
nifi
ac9b862cd0
Added configurable support for 802.15.4 autoack
2010-05-26 14:12:33 +00:00
nvt-se
320fa820ca
Renamed neighbors to parents. Removed redundant code. Corrected the logic for max rank increase.
2010-05-25 21:58:54 +00:00
joxe
34b8313fb6
added experimental support for disseminating autoconf prefix via DIO suboption
2010-05-25 19:19:43 +00:00
nvt-se
6c4bf93141
Handle MAC_TX_ERR notifications.
2010-05-25 15:29:51 +00:00
nvt-se
c5d1c3ea27
Improvements to local repair and DAO handling.
2010-05-24 16:38:56 +00:00
nvt-se
f882901bf6
Remove unreachable neighbors immediately, rather than using an ETX threshold that leads to slow topological repairs. ETX information should later be stored even for removed neighbors if there is room.
2010-05-24 16:38:17 +00:00
joxe
16c212798f
cleanup of the code, removing dead core + adding local vars to save some space.
2010-05-24 14:28:56 +00:00
joxe
2d447502d4
changed uip_buf to a union for 32-bit alignment
2010-05-24 10:07:34 +00:00
joxe
9db7f06368
fixed compiler warnings
2010-05-24 09:57:20 +00:00
joxe
56a3a71108
added include of string.h since memcpy are used
2010-05-19 16:16:57 +00:00
joxe
5c30aed814
removed nd llao option struct since not naturally aligned - replaced struct fields access with array based access
2010-05-19 12:21:45 +00:00
nvt-se
4411807b29
Fixed bug in DAO input. Made printfs more portable.
2010-05-18 16:43:56 +00:00
nifi
ed4debe285
Changed neighbor notification to be default on when using RPL
2010-05-11 10:02:29 +00:00
nifi
7aeb206840
Added isinfinite to uip_ds6_defrt_t to handle infinite life time
2010-05-10 13:46:35 +00:00
joxe
058ef029e4
replaced hardcoded value with constant for route lifetime
2010-05-10 11:16:35 +00:00
joxe
c0c7cea3ce
fixed bug that caused select_src to set a non legal address - now sets unspecified if no address found
2010-05-10 11:10:27 +00:00
joxe
6f66d36d67
avoid sending DAO when address is tentative
2010-05-09 19:12:47 +00:00
joxe
adb00ed932
factored out function for getting link local address in ds6 and made use of it in rpl for checking state of lladdress as DIOs should not be sent when tentative
2010-05-09 17:52:37 +00:00
oliverschmidt
e5665fb968
The recent change turning uip_buf from an array to a pointer seems a quite heavyweight way to have the uip_buf alligned to a 32-bit boundary. Contiki is - still - supposed to be portable across a wide range of toolchains - therefore it i.e. intentionally doesn't use C99 features. From that perspective it seems questionable if all toolchains are able to optimize away the overhead imposed by an "unnecessary" indirection to access uip_buf - and uIP consists mostly of accesses to uip_buf. Even if the future is supposed to bring support for multiple uip_bufs which would turn the uip_buf pointer from a mere workaround to an neceesary element on can still presume that there will be targets with resources limited in a way prohibiting the use of several uip_bufs. So at least for those targets will still be a usecase for a "plain", not indirected uip_buf.
...
Therefore it seems reasonable to allow to stay with the "plain" uip_buf at compile-time.
2010-05-08 07:23:55 +00:00
oliverschmidt
dec19626e8
Adjusted UIP_CONF_EXTERNAL_BUFFER to apply to actual buffer only.
2010-05-07 20:45:16 +00:00
fros4943
bc0ea1f81d
bug fix: dag pointer may be NULL
2010-05-07 13:51:34 +00:00
joxe
cd5dfa9692
added const for the uip_buf pointer for more efficient and smaller uip code and fixed same construct for the sicslowpan code
2010-05-05 13:07:45 +00:00
nvt-se
361e210751
Improvements to style and commentary.
2010-05-04 22:55:32 +00:00
joxe
01881f92a8
added missing include
2010-05-04 14:41:55 +00:00
joxe
790819e701
allocate uip_buf as uint32_t to avoid risk for unaligned uip_buf on 32 or 16 bit architectures
2010-05-04 09:19:41 +00:00
joxe
7d235841b3
always include the RPL route state to allow compilation of rpl code
2010-05-03 14:12:03 +00:00
nifi
6c86398778
Added check to not copy or create too large packets
2010-05-02 14:59:11 +00:00
nifi
a04372adc4
Fixed conversion of packetbuf address type to address index and corrected return value
2010-05-02 12:21:34 +00:00
joxe
f72bd5572c
added initialization of RPL
2010-05-01 13:04:31 +00:00
joxe
0531d9bd82
moved RPL routing state struct into uip-ds6
2010-05-01 12:02:25 +00:00
nvt-se
9a4a9b9437
Removed return value in function that should not return a value.
2010-04-30 23:13:58 +00:00
nvt-se
ecada2d1ac
*** empty log message ***
2010-04-30 23:10:45 +00:00
nvt-se
b8a3a4109e
Adjusted the code so as to remove compilation warnings.
2010-04-30 22:18:12 +00:00
nvt-se
b822dbb25e
Addressed compilation warnings.
2010-04-30 15:04:47 +00:00
nvt-se
4106f4d798
Increased minimum DIO interval from 1024 ms to 4096 ms in order to more calm in duty-cycled networks.
2010-04-30 15:03:55 +00:00
joxe
168a65d989
added ContikiRPL - an implementation of IETF ROLL RPL
2010-04-30 13:43:53 +00:00
joxe
167b0d636e
added icmp_send function and moved rpl input function signature
2010-04-30 13:22:21 +00:00
joxe
dc1a5f70ff
added uip-debug utilities
2010-04-30 13:20:57 +00:00
nvt-se
7e0e2fe284
Removed obsolete rime-route code for IPv6
2010-04-30 12:43:37 +00:00
joxe
cc9914a4f3
fixed uip to use UDP_BUF instead of TCP_BUF when setting udp ports - minor cleanup
2010-04-30 08:46:27 +00:00
adamdunkels
3d10dedecf
Added a safety measure against a problem where a node in rare situations would turn itself into a sink. Not entirely sure why this happens, but the safety measure should at least avoid the results of the problem. Added more debug messages.
2010-04-30 07:33:51 +00:00
adamdunkels
0859d4b95f
Avoid turning off the radio in the middle of a packet reception
2010-04-30 07:32:39 +00:00
adamdunkels
e606c674c2
Rewrote LPP so that it uses 802.15.4 headers. A number of bugfixes with respect to alignment. Avoid turning off the radio in the middle of packet reception.
2010-04-30 07:31:44 +00:00
adamdunkels
55b6129bd2
Debug printout fix
2010-04-30 07:29:31 +00:00
adamdunkels
e523c36cdf
Removed the (unused) header packet of the queuebuf. Added a function for accessing address attributes in the queuebuf
2010-04-30 07:29:08 +00:00
adamdunkels
3c735fcea4
Added a packetbuf flag that indicates if the link layer acks should be used or not
2010-04-30 07:25:51 +00:00
adamdunkels
798f1c63bd
Make it possible to receive multicast UDP packets
2010-04-30 07:19:33 +00:00
fros4943
18e5718c97
avoid freeing queuebuf multiple times, and free buffer after cancelling connection
2010-04-27 13:08:55 +00:00
fros4943
12b6f35ce7
PRINTF()ed debugging output
2010-04-27 12:56:35 +00:00
nifi
85d6f6c514
removed unused variable
2010-04-26 22:41:50 +00:00
nifi
875ad7ffda
Fixed to not change the header if the header allocation fails
2010-04-26 22:05:40 +00:00
nifi
b26f45a35b
code cleanup
2010-04-26 17:55:11 +00:00
nifi
d761b6e89a
Added MAC header to handle padding
2010-04-26 17:46:21 +00:00
nifi
14b1bb9f57
Fixed to only use leds when DEBUG is set
2010-04-20 11:41:16 +00:00
nvt-se
2e5d97366a
ensure matching format and type in debug printf
2010-04-09 16:21:07 +00:00
adamdunkels
3670fac618
Bugfix: timing fixed
2010-04-08 18:23:24 +00:00
adamdunkels
f2bf8965d5
MAC sequence number attribute
2010-04-08 09:46:30 +00:00
adamdunkels
91ff8574ad
Improved handling of duplicate packets
2010-04-08 09:32:56 +00:00
nvt-se
ac4ba199bc
Turn off DEBUG mode by default.
2010-04-06 21:37:54 +00:00
nvt-se
75dd41601b
Added a macro for checking if an address is link local.
2010-04-06 16:47:18 +00:00
adamdunkels
497111bcc9
Added an optional rate limit for broadcast transmissions
2010-04-06 11:57:43 +00:00
adamdunkels
e06a30fdb0
Added MAC-layer duplicate message suppression, which is very helpful when running with duty cycling turned off
2010-04-05 19:28:07 +00:00
adamdunkels
c68ee6e577
Bugfix: memory from the wrong memb was freed.
2010-04-04 21:02:09 +00:00
adamdunkels
a4c328785a
Small timing tweaks
2010-04-04 21:01:24 +00:00
adamdunkels
62039a530d
Removed non-existant cooja-debug.h include
2010-04-04 12:31:47 +00:00
adamdunkels
7d6ff0289e
Fiddled more with the timing: the phase seems stable now at least. Still bugs left though...
2010-04-04 12:28:29 +00:00
adamdunkels
be117afe04
After a lot of tweaking and twiddling with the timing of the ContikiMAC code and the mechanisms in the CC2420 driver, things seem to work somewhat stable now - knock on wood!
2010-04-04 07:49:30 +00:00
adamdunkels
83eaa70f03
Added pending flag
2010-04-03 13:34:20 +00:00