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
