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
d381ee7bbf
Merge branch '6lowpan-16bit-fix'
2011-03-07 22:17:39 +01:00
Joakim Eriksson
340c86e401
reverted to byte-based iid check
2011-03-07 22:02:43 +01:00
Niclas Finne
e348cf7fc6
removed unnecessary include
2011-03-07 20:20:29 +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
dd7cec737d
removed obsolete leds_[color]() functions, replaced by leds_{on,off}()
...
allow LEDS_[COLOR] to be configured by platform-conf
2011-03-03 17:48:32 +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
François Revol
777518d653
Fix some typos.
...
Signed-off-by: François Revol <revol@free.fr>
Signed-off-by: Mariano Alvira <mar@devl.org>
2011-02-18 11:01:43 -05: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
20bf23cf06
Replaced ifdef with if, as salvopitru suggested
2011-02-14 15:53:08 +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
4125c38808
missing word
2011-02-13 21:34:29 +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
Fredrik Osterlind
3bf99ca040
LEDS_ALL configurable
2011-02-09 15:29:41 +01:00
Nicolas Tsiftes
774aa3984a
Use a more understandable name
2011-02-09 15:17:25 +01:00
Nicolas Tsiftes
c77cb63df1
ifdef -> if
2011-02-09 15:13:50 +01:00
Nicolas Tsiftes
39ea9405bb
Added a function for setting the I/O semantics on a Coffee file descriptor. Changed the configuration parameters slightly and updated the platform definitions to reflect this change.
2011-02-09 15:03:57 +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
nvt-se
faab7229c9
Must check the storage boundary in find_contiguous_pages.
2011-01-25 18:39:09 +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
nvt-se
28421f1fe2
Removed watchdog calls from Coffee
2011-01-18 14:06:33 +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
cea299d79a
Call upper layers even if packet reception failed - this allows the RDC layer to shut off the radio even if a malformed packet was received.
2011-01-09 21:09:28 +00:00
adamdunkels
a0960154ba
Cleaned up parts of the code; added comments
2011-01-09 21:07:01 +00:00
nifi
f3d22e6287
dos2unix conversion
2011-01-07 11:55:36 +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
8b5577eca2
Patch from Roger Larsson to answer mac address request, for testing autoconfigure.
2010-12-23 22:38:47 +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
adamdunkels
d267b5ca94
Re-added timestamp support for outbound packets that was removed when switching to the new radio API
2010-12-16 22:40:52 +00:00
adamdunkels
417c7f8c70
Added parenthesis around addresses to allow expressions as arguments
2010-12-16 22:39:50 +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
404230a047
Added a macro for portable watchdog calls.
2010-12-15 14:01: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
adamdunkels
433d42e170
Bugfix: if the cc2420_cca() function wasn't able to turn on the radio properly, it should turn it off again if it was off before.
2010-12-05 00:14:24 +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
nvt-se
1168703506
Minor clarifications in the code and comments. Integrated atches from Frederic Sureau: 1. copy_buf is now an ordinary char pointer. 2. Read directly from a file that is not modified. This reduces the code size when COFFEE_MICRO_LOGS is set to 0. 3. Update the file end value each time it is changed in case a log merge operation occurs later. 4. Avoid possible alignment problem in reading from the dummy_space area when calling cfs_readdir.
2010-11-11 13:08:23 +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
2a885a476d
Bumped version number
2010-11-02 10:55:32 +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
adamdunkels
fd4c0e64aa
Removed old unused files rand.[ch]. By default, Contiki uses the libc implementations of the rand() and srand() functions.
2010-10-24 21:02:23 +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
06123fefe2
Defensive programming: make sure that a process is actually running before we try to kill it.
2010-10-20 22:24:46 +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
nvt-se
909569f834
Must check if load_file succeeded
2010-10-01 20:14:14 +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
nifi
e242fb28bf
Reverted radio API change in CC2420 (not yet fully integrated with Contiki core)
2010-09-23 08:26:06 +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
adamdunkels
40ee35e8c8
Rewrote all busy waits with a new macro, which has a built-in timeout to ensure that busy waits won't hang the CPU
2010-09-22 22:01:53 +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
dak664
b9a9e7695d
Add option to remove process name strings to save RAM
2010-09-14 18:55:04 +00:00
adamdunkels
18e31f33b9
Minor tweaks. Removed debug output from CVS.
2010-09-14 06:48:36 +00:00
nifi
095f700b63
Moved down inclusion of rtimer-arch.h to allow rtimer_clock_t to be used in rtimer-arch.h
2010-09-13 20:46:02 +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
3ae774c91a
Added a way to for specifying lists as parts of structs. These lists
...
must be initialized with a special LIST_STRUCT_INIT() call before
using.
2010-09-13 13:31:00 +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
oliverschmidt
a0b8927777
Allow to exit the process owning the foreground window by pressing ctrl-c. This is especially useful if there's no closebutton on the window frames (or no windows at all).
2010-09-09 20:21:26 +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
nifi
d06a1ecc0c
corrected include path
2010-08-25 18:35:52 +00:00
dak664
12479c32bc
Fix compiler warnings
2010-08-01 21:18:07 +00:00
oliverschmidt
89f6235c13
Using wherex() to determine the length of the string printed with cputsn() fails if the right edge of the screen was reached as wherex() then returns 0.
...
Therefore we rather count the chars actually printed in cputsn() and return that value thus avoiding usage of wherex() in those scenarios altogether.
2010-07-20 22:19:23 +00:00
nvt-se
11760059d3
The second predicate is not needed.
2010-07-03 23:52:02 +00:00
nifi
3e6113be72
removed debug output
2010-06-30 09:03:20 +00:00
nvt-se
007d4a4001
Improved logic for processing DIOs
2010-06-28 14:51:23 +00:00
nifi
c44cf73e4f
Adapted to new SPI and CC2420 naming
2010-06-24 11:25:55 +00:00
nifi
f609cb0f7c
Added macro to read from CC2420 RAM
2010-06-24 11:25:07 +00:00
nifi
30db4eff52
Made QUEUEBUF_STATS configurable
2010-06-24 09:48:21 +00:00
nifi
49a2ca6b1e
Fixed naming of CC2420 macros
2010-06-24 09:28:38 +00:00
nifi
fb3c2e75cf
removed obsolete definitions
2010-06-24 09:28:12 +00:00
nifi
c6b6b6625c
removed obsolete header file for CC2420
2010-06-24 09:20:28 +00:00
joxe
f7a82a9145
split SPI code into generic and CC2420-related and renamed constants in CC2420
2010-06-23 10:15:28 +00:00
joxe
bc398ca546
removed platform dependent loop-count from cc2420 - moved to platform config instead
2010-06-21 19:48:00 +00:00
joxe
a5d7b197eb
added support for the Z1 platform and its 8Mhz
2010-06-21 19:09:35 +00:00
joxe
1f0a43bf01
fixed timer bug - did not do equality comparison
2010-06-21 19:07:24 +00:00
joxe
546504516b
changed timer comparison to avoid crashing mspgcc4
2010-06-21 09:41:49 +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
adamdunkels
a84cc7c8a0
Added a function for obtaining the next item on the list. This makes list iterations nicer, as the ->next pointer now is hidden within the list abstraction.
2010-06-15 18:54:27 +00:00
nifi
01b1359b1f
removed unused (and slightly problematic) code
2010-06-15 14:19:22 +00:00
nifi
46f9f7e6c0
corrected include path
2010-06-15 13:31: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
97708d6235
Documentation group set accordingly
2010-06-14 07:35:53 +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
nvt-se
8c3ed291bb
Preserve the file offset if a seek operation fails.
2010-05-13 18:24:55 +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
e4187b2fc8
Made pointers constant and thereby reduced the code size slightly.
2010-05-05 12:35:39 +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
adamdunkels
a1f69138d1
Avoid adding elements twice
2010-04-30 07:18:24 +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
fros4943
ce1374087b
allow elf loader memory configuration at compile time
2010-04-26 14:02:07 +00:00
nifi
14b1bb9f57
Fixed to only use leds when DEBUG is set
2010-04-20 11:41:16 +00:00
nvt-se
f9ca4a546d
Introduced append-only mode for systems with little available code space left, but which require basic FS support. Removes about 1.5kB ROM when the mode is enabled, i.e., COFFEE_CONF_APPEND_ONLY=1
2010-04-12 13:20:55 +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
anthony-a
694e1498f4
merge change from branch into mainline. <fingers crossed>
2010-04-06 19:10:21 +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
a637ddaf4e
Flush the rxfifo when turning off the radio instead of when turning it on. This seems to fix a bug that was seen in mspsim and seemed to appear on real hardware too.
2010-04-03 16:01:00 +00:00
adamdunkels
83eaa70f03
Added pending flag
2010-04-03 13:34:20 +00:00
adamdunkels
121ca946e1
Improved phase lock behaviour when neighbor is not duty cycling: senders notify receivers via the 802.15.4 pending bit that they are not duty cycling. Neighbors then will start sending packets immediately and not wait for neighbors' phase. Tweaking of ContikiMAC timers to make it more reliable.
2010-04-03 13:28:30 +00:00
joxe
6ae86d001d
made number of phase neighbors configurable
2010-04-01 17:17:36 +00:00
fros4943
59357e8b75
PRINTF():ed debugging output
2010-04-01 11:08:36 +00:00
adamdunkels
cc11c9d3f2
Added missing #define
2010-04-01 10:56:00 +00:00
adamdunkels
a8d8b6d31d
Improved parent management: parent neighbor is retained until a better neighbor is found (with 1 ETX less than parent). Don't drop parent neighbors when loop is detected (loops are transient anyway).
2010-04-01 10:45:21 +00:00
adamdunkels
d7457bc340
Improved parent management: parent neighbor is retained until a better neighbor is found (with 1 ETX less than parent). Don't drop parent neighbors when loop is detected (loops are transient anyway).
2010-04-01 10:03:19 +00:00
adamdunkels
add426de4b
Bugfixed stream mode: node listens 100% for 0.5 seconds in stream mode. Naming change: is_listening changed is_snooping.
2010-04-01 10:02:04 +00:00
adamdunkels
5b121b4829
Set stream bit only on non-FIN TCP segments
2010-04-01 10:01:01 +00:00
adamdunkels
b43f7830b3
Fine-tuned the timing and phase lock optimization
2010-03-31 20:27:15 +00:00
adamdunkels
c9ca5d61e2
Rewrote the pending_packet() function to check the FIFOP pin instead of the 'pending' variable - works must better on real hardware and is now supported by the latest mspsim
2010-03-31 19:08:56 +00:00
adamdunkels
4e33112d3e
Guard against malformed broadcast announcements
2010-03-31 12:17:24 +00:00
adamdunkels
877eb2fbe9
Fiddled with the timing
2010-03-31 11:54:38 +00:00
fros4943
3bd07ea55a
bugfix: refresh correct source route
...
+
refreshing gateway route whenever data is received via a gateway
2010-03-31 09:38:42 +00:00
adamdunkels
bcfa80102d
Had previously not included the waiting time that the CC2420 introduces when sending a packet. Also increased the smallest packet size, just to be on the safe side.
2010-03-30 23:01:32 +00:00
adamdunkels
4d5f112960
New return value for invidating a link-layer collision
2010-03-30 23:00:22 +00:00
adamdunkels
5e7f99a2c0
Reverted the removal of the code that checked the FIFOP pin before reading a packet - checking FIFOP is the correct way to do it. Also added TXONCCA for now, including new radio.h return values to indicate a link-layer collision.
2010-03-30 23:00:05 +00:00
adamdunkels
226abb8ec3
Removed non-existant include file
2010-03-29 22:10:03 +00:00
adamdunkels
4e3268e2e2
Added function that removes the header
2010-03-29 21:53:04 +00:00
adamdunkels
4c3b69dc07
Configuration parameter for number of MAC-layer retransmissions
2010-03-29 21:52:25 +00:00
adamdunkels
9c58768b59
Extend packet size after creating 802.15.4 header; prepare radio chip with packet before waiting for neighbor phase to make phase wait time deterministic
2010-03-29 21:51:36 +00:00
adamdunkels
b4b7e942b6
Back off a guard time for every non-ack packet
2010-03-29 21:50:01 +00:00
oliverschmidt
315e446584
Adjusted formal parameter to single existing actual parameter.
2010-03-29 20:26:14 +00:00
fros4943
0fcbfae836
updated function: has_value argument was missing
2010-03-29 12:13:35 +00:00
fros4943
671629dea0
moved packet_sent function, it was in a HC06-specific unit
2010-03-29 11:48:09 +00:00
fros4943
b952f97799
stopping watchdog during find_file
2010-03-29 11:31:35 +00:00
joxe
bd6cd03c1d
moved prefix to avoid compiler warning
2010-03-26 15:12:57 +00:00
nifi
9508d2c4d7
* Added configurable default number of transmissions for CSMA to use when not specified using packetbuf attributes (CSMA_CONF_MAX_MAC_TRANSMISSIONS).
...
* Renamed packetbuf attribute PACKETBUF_ATTR_MAX_MAC_REXMIT to PACKETBUF_ATTR_MAX_MAC_TRANSMISSIONS where value 0 (attribute not set) means that default number of transmissions should be used.
2010-03-26 12:29:29 +00:00
joxe
bec1ccc57d
added support for all UDP port compressions in hc06
2010-03-26 10:28:51 +00:00
nifi
0ec8d499e4
Bug fix: only call subscriber if set
2010-03-25 19:30:44 +00:00
adamdunkels
a4f9e62295
Added a parameter to collect_open() that specifies whether or not the node should be a router for packets, or only an originator of packets. Updated the collect module to the new annoucement API.
2010-03-25 08:51:07 +00:00
adamdunkels
2559e27414
API change to the announcement module: an annoucement can now be registered without a value. Such announcements are never transmitted to neighbors, until the announcement's value is set.
2010-03-25 08:49:56 +00:00
adamdunkels
4d68bdf74b
Bugfix and addition by Dogan Yazar: psock_readbuf() shouldn't wait for a full buffer (which might never happen); a new function for sending strings that batches data and sends full buffers instead of individual strings.
2010-03-24 21:03:32 +00:00
nifi
c623616afd
Neighbor state notification also when adding new neighbors
2010-03-24 16:29:45 +00:00
nifi
052c8db9f9
Added option for neighbor state changed notifications
2010-03-24 16:16:33 +00:00
joxe
4a6c6b0534
added route_rm_by_nexthop and small code cleanup
2010-03-23 14:21:04 +00:00
fros4943
4833c6555e
moved inclusion of rtimer-arch.h to top of rtimer.h, to avoid circular rtimer_clock_t dependencies
2010-03-23 13:35:00 +00:00
fros4943
5eb391dbe1
allows rtimer_clock_t to be defined from contiki-conf.h
2010-03-23 13:24:38 +00:00
fros4943
95e870cc46
bugfix: structs should be declared static
2010-03-22 11:32:29 +00:00
fros4943
3394a3ef23
make sure not to add an already existing list element, as it breaks the list iteration functions
2010-03-22 11:29:58 +00:00
nvt-se
0eae63b29a
Set a higher start ETX. Avoiding adding a neighbor after a failed packet transmission.
2010-03-19 16:55:29 +00:00
adamdunkels
9d06d84255
Renamed the neighbor module to collect-neighbor, as it is only used by the collect module and is not a generic neighbor module
2010-03-19 13:25:15 +00:00
adamdunkels
49009e9cbd
Extend the length of announcement packets if they are too short
2010-03-19 13:24:58 +00:00
adamdunkels
2e8bfa5d9a
Include new broadcast-announcement and renamed collect-neighbor in compilation
2010-03-19 13:21:24 +00:00
adamdunkels
f2c9b3e813
Remove old neighbor.h inclusion
2010-03-19 13:20:40 +00:00
adamdunkels
a3a8c0e179
Safety check: only try to read a packet if it was preceeded by an interrupt (which sets the pending flag)
2010-03-19 13:18:53 +00:00
adamdunkels
3a5be4a7e4
Added broadcast announcement module and collect-neighbor module
2010-03-19 13:17:55 +00:00
adamdunkels
14453e9fb7
Slight API change to support bump functionality
2010-03-19 13:17:31 +00:00
adamdunkels
7b0606cd58
Renamed the neighbor module to collect-neighbor, as it is only used by the collect module and is not a generic neighbor module
2010-03-19 13:17:00 +00:00
adamdunkels
137e02baac
Added a bump method that tells the announcement module that a value has changed sufficiently much for it to be pushed out quicker
2010-03-19 13:16:11 +00:00
adamdunkels
17db783fb0
Broadcast announcement back-end that sends announcement data as broadcasts, with increasing transmission intervals
2010-03-19 13:15:19 +00:00
nifi
7f7922a10d
typos
2010-03-19 12:54:38 +00:00
joxe
cf9acf4748
made it possible to have zero contexts to avoid stateful compression in hc06
2010-03-19 08:15:20 +00:00
joxe
17a721a7e4
fixed buggy define for Traffic class and Flowlabel compression
2010-03-17 20:57:25 +00:00
adamdunkels
115b3a7c5c
Minor timing bugfix: the time between channel checks should not include the time required for the channel check itself
2010-03-17 18:24:06 +00:00
adamdunkels
efeb9944fa
Increase the required non-activity periods before turning off the radio; remove the strict phase requirement (which messes up things with low-power streaming)
2010-03-17 16:35:52 +00:00
nvt-se
1a9e00ab78
Purge neighbors that go over a configurable ETX limit. Increase the no-ACK penalty.
2010-03-17 15:08:46 +00:00
nvt-se
4e0ceedc47
Enabled external neighbor removal
2010-03-17 15:00:52 +00:00
fros4943
55f780ec19
removed debugging output
2010-03-17 14:36:46 +00:00
joxe
4f27fcf766
added ipaddr variable if not UIP_ROUTER is defined
2010-03-17 12:30:25 +00:00
joxe
e8916fe01f
added hooks for adding an external header compressor
2010-03-17 12:08:59 +00:00
nifi
ea090a60e6
Fixed to call the SLIP callback function also when using IPv6
2010-03-17 07:10:25 +00:00
joxe
d113577a8e
made UIP_ND6_SEND_RA configurable from platforms and projects
2010-03-16 18:27:22 +00:00
adamdunkels
36b995cc9a
Reenabled announcement support
2010-03-16 18:12:34 +00:00
adamdunkels
9be1a65211
Don't set the RELIABLE flag on incoming packets with the ack requested flag set, since it is set on most packets even if they aren't reliable
2010-03-16 18:11:58 +00:00
adamdunkels
b1feac5a00
Bugfixes in low-power streaming mode, and re-added support for announcements. These now use the low-power streaming mode so that active listening for announcments have a radio duty cycle of 16% rather than 100%
2010-03-16 18:11:13 +00:00
adamdunkels
67b0170a43
Bugfix: don't care about FIFOP when reading a packet; if the radio rx had been turned off before a packet was read, FIFOP would be zero and the packet would be trashed
2010-03-16 18:10:09 +00:00
nifi
6b7ec2d002
removed uip_router
2010-03-16 15:45:20 +00:00
nifi
75091661e6
fixed typo
2010-03-16 15:41:00 +00:00
joxe
b4adc6bcb5
added fallback interface and removed uip_router
2010-03-16 15:35:03 +00:00
joxe
2b44f809fb
added support for extending route entries
2010-03-16 14:11:46 +00:00
joxe
453cf7f2e6
refactoring of hc06 code
2010-03-16 10:21:04 +00:00
nifi
55e0fec37e
* Changed to write keys to CC2420 RAM big-endian order
...
* Fixed cc2420_aes_cipher() to wait for encryption to finish before reading result
2010-03-15 23:04:54 +00:00
nifi
e834562455
* Fixed FASTSPI_READ_RAM_LE to wait for tx end before reading
...
* Added FASTSPI_WRITE_RAM_BE to write to RAM (big-endian order)
2010-03-15 23:01:37 +00:00
nvt-se
7f687b99e6
Debug off by default
2010-03-15 19:22:29 +00:00
nifi
3f8b346c29
replaced obsolete netif include with new ds6
2010-03-15 16:54:35 +00:00
joxe
fd3d6c44d0
integration of new uip6 code from Mathilde and Julien - adds routing and improved interface handling
2010-03-15 16:41:24 +00:00
joxe
7d5e3fbfde
added function to retrieve elapsed time
2010-03-15 15:53:57 +00:00
adamdunkels
a9bad71fbd
Increased the number of bits that repressent the MAX_RETRANSMITS attribute to allow for more than 7 hop-by-hop retransmissions
2010-03-14 23:01:12 +00:00
adamdunkels
7bab9316da
Two major changes:
...
* Low-power streaming. Experimental support for a low-power mode which
allows rapid exchange of packets with a 16% duty cycle. Does not
seem to function correctly yet though.
* Phase locking. When the phase of a neighbor has been detected, the
sender assumes that the neighbor will keeps it phase and does not
send more strobes than necessary to hit the receiver's channel
check - even if the receiver does not acknowledge the reception of
the strobes when it should have been awake. Instead, the sender
stops strobing and tries again at a later time.
2010-03-14 22:59:23 +00:00
adamdunkels
0035a70537
Reworked the locking code, which seems to fix a few bugs caused by the interaction with contikimac. Contikimac performs a CCA check in a preempting rtimer, which requires underlying code to properly call the GET_LOCK() macro. This fix seems to solve most problems, but there may be others left.
2010-03-14 22:45:20 +00:00
oliverschmidt
def540e6c0
Avoid newlines in macro expansions as cc65 doesn't support them between the macro name and the open parenthesis of the arguments.
...
There were btw other even longer lines with expansions of the same macro already present.
2010-03-14 12:13:54 +00:00
joxe
e8bd53cfd8
added typedef of icmp6_error
2010-03-13 09:25:24 +00:00
dak664
0236c6e725
Leave compiler warning for 16 bit timers
2010-03-12 17:51:07 +00:00
joxe
4c2daf9886
started integration of Mathildes and Juliens new uip6 code + made some ND timers configurable
2010-03-12 16:19:19 +00:00
dak664
7c5eed6bda
Add includes needed by AVR-gcc, fix compiler warning
2010-03-12 15:23:57 +00:00
dak664
52c9f4bde3
Remove compiler warning
2010-03-12 15:21:14 +00:00
nifi
2cf0fb9cce
Changed to use short address mode with short rime addresses
2010-03-12 14:49:21 +00:00
nvt-se
6be0bac1a1
minor include fix + added documentation
2010-03-12 13:40:13 +00:00
nvt-se
881fac7f50
fixed comment
2010-03-12 13:25:14 +00:00
nvt-se
6ce15b14c9
prepend net/ to include paths
2010-03-12 13:23:50 +00:00
nvt-se
c316fc2fa9
Make it possible to provide feedback to the neighbor modules
2010-03-12 13:20:13 +00:00
nvt-se
814dd8bf59
Added generic modules for neighbor information.
2010-03-12 13:19:45 +00:00
joxe
d75ec2da53
fixed so that uip6 sends icmp6 errors from correct source when acting as router - improves support for tracert, etc.
2010-03-11 18:07:37 +00:00
nifi
58c55340ed
fixed to work with IPv6
2010-03-10 22:30:39 +00:00
adamdunkels
90bb63a383
Set the (correct) packet attribute to let the MAC layer perform retransmissions
2010-03-09 20:40:50 +00:00
adamdunkels
4b60301727
Don't set the ack flag for broadcast packets
2010-03-09 20:40:11 +00:00
adamdunkels
17f6b3a324
Simplified the structure of the code
2010-03-09 20:38:55 +00:00
adamdunkels
d0e6436a20
Don't call up the netstack if the transmission was deferred
2010-03-09 20:37:02 +00:00
c_oflynn
dc3e6c1877
Fix TC/FL errors in hc-06. Need to verify further
2010-03-09 16:19:44 +00:00
joxe
48a9bff889
added support for dropping packets if hop limit is reached
2010-03-09 15:50:15 +00:00
joxe
1214b1fa40
made cc2420 panid and short address not dependent on endianness
2010-03-09 15:45:29 +00:00
c_oflynn
1d483a5da4
Fix UDP compression to work per hc-06. More commits to come to fix Traffic Class stuff...
2010-03-09 15:18:03 +00:00
nvt-se
bf2e85a57f
supply an argument of the same type as the print format
2010-03-09 14:14:36 +00:00
adamdunkels
edda6dd86c
Minor bugfix: don't subtract collisions and deferrals from the number of transmissions
2010-03-09 13:23:58 +00:00
adamdunkels
5a6fc2ade0
Bugfix: set up rtmetric before starting to announce it. Set the number of MAC layer retransmissions correctly
2010-03-09 13:21:28 +00:00
adamdunkels
2c3d3e3d73
Bugfix: handle deferred transmissions correctly (don't count them)
2010-03-09 13:20:08 +00:00
adamdunkels
79722b4247
Rework of the timing conditions of ContikiMAC: the old timing did not work well on real hardware, the new one seems to work better
2010-03-09 13:19:05 +00:00
adamdunkels
cc7d3ae142
Reset CCA mode to default. Make sure that the radio gto switched on when reading RSSI; otherwise node will reboot because of watchdog
2010-03-09 13:18:16 +00:00
nvt-se
96eb20d235
forward arguments even if REXMIT is not set
2010-03-04 14:17:43 +00:00
dak664
c65e09ceb2
Remove compiler warnings
2010-03-02 15:41:23 +00:00
nifi
5e43a6998b
Replaced old framer (framer_get/framer_set) with new NETSTACK style configuration. Added nullrdc-framer that is a nullrdc with framer support.
2010-03-01 13:30:21 +00:00
nifi
0c084b8c68
added random init of sequence number
2010-03-01 13:17:01 +00:00
adamdunkels
524625dfd2
Removed debug string names of packet attribtues
2010-02-28 20:20:19 +00:00
adamdunkels
410d860a93
Improved handling of neighbor phase estimation: instead of busy-waiting while waiting for neighbor's phase, the new code schedules a timer just before neighbor wakes up
2010-02-28 20:19:47 +00:00
adamdunkels
e6fceb7200
Added MAC-layer return value to indicate that a packet transmission was deferred
2010-02-28 20:18:30 +00:00
adamdunkels
ec928a2a19
Make max queueing time depend on retransmission timeout
2010-02-28 14:15:58 +00:00
adamdunkels
e06acc4525
Prod the watchdog if waiting for along time
2010-02-28 14:15:16 +00:00
adamdunkels
74da90a06b
Don't count collisions as transmissions
2010-02-28 10:07:17 +00:00
adamdunkels
f95a6cce85
Added function for obtaining packet queue length
2010-02-28 09:20:32 +00:00
adamdunkels
8fe15f7b45
New packet attribute for specifiying MAC layer retransmissions; reorder and commented packet attributes
2010-02-28 09:19:43 +00:00
adamdunkels
970a9eb9c7
Increased neighbor lifetime to allow for longer neighbor announcement intervals
2010-02-28 09:19:04 +00:00
adamdunkels
7165a3866f
Significant rework of the Contiki data collection protocol:
...
* the new version makes use of MAC-layer feedback so that bad paths
can be identified quicker and then avoided.
* the new code uses transport layer ACKs that contain feedback from
the collect protocol: when a packet cannot be forwarded due to lack
of resources, the ACK contains a flag that indicates that the packet
could not be forwarded. ACKs also contain the routing metric of the
sender, which improves agility in face of rapid path changes.
* loop detection and management has been improved: with higher path
metric agility, the system is more prone to short-lived routing
loops. Instead of dropping looping packets, the new version adjusts
the routing metric for the routes that exhibit loops so that the
risk for future loops is reduced.
* make use of packet attributes to inform the MAC layer of how many
times packets should be retransmitted.
2010-02-28 09:18:01 +00:00
adamdunkels
b6b4941871
Made the number of MAC-layer retransmissions configurable on a per-packet basis, via a packet attribute
2010-02-28 08:35:16 +00:00
adamdunkels
ed88f487c8
Improved detection of link-layer ACKs; increased the time ContikiMAC waits when it has detected a link-layer ACK; increased the number of silence periods required to detect a CCA false positive
2010-02-28 08:33:21 +00:00
adamdunkels
fa1a96636e
Bugfix: the compile-time check for UIP_LLADDR_LEN previously generated a run-time error, when it should have generated a compile-time error
2010-02-28 08:30:39 +00:00
adamdunkels
ba0e50a7b7
Set the default number of MAC layer retransmissions for IPv6 packets to 2
2010-02-28 08:29:42 +00:00
adamdunkels
b9827d2b36
Bugfix: didn't correctly reset the pending flag when a packet was read from the radio
2010-02-25 16:06:44 +00:00
joxe
0ab2bc9a31
upgraded sicslowpan to hc-06 - no 48 bit multicast compression support yet
2010-02-25 15:50:58 +00:00
nifi
b50d47fb80
added missing function in sicslowmac_driver
2010-02-23 22:45:11 +00:00
nifi
1cfcc8a73a
Removed the combined name of CSMA and NETSTACK_RDC. The name of NETSTACK_RDC can be accessed separately if needed.
2010-02-23 20:42:45 +00:00
nifi
c20047f657
Changed the network stack to use different structures for the different layers (network_driver, mac_driver, rdc_driver, radio_driver). This helps to avoid incorrect configuration.
2010-02-23 20:09:11 +00:00
adamdunkels
bb62749de7
Made debug printfs optional
2010-02-23 18:49:58 +00:00
adamdunkels
0ab2ba433f
Bugfix: the wrong callback pointer was passed to higher layers.
2010-02-23 18:49:45 +00:00
adamdunkels
ed52586e18
Rework of parts of the ContikiMAC code based on input from experimental results. When channel check is triggered because of a false positive, the new version checks the radio several times to make sure that there really is an incoming packet. Otherwise, the radio is switched off. Cleaned up and removed old unused code. Added a few temporary debugging mechanisms and functions.
2010-02-23 18:49:05 +00:00
adamdunkels
50e1452564
Ugly workaround for internal error in mspgcc when applying the >= operator to two 32-bit values
2010-02-23 18:40:08 +00:00
adamdunkels
0c4c88ae66
Improved per-packet power profiling: if a packet is retransmitted, the new energy is added to the old energy so that it is possible to measure the full energy for all transmissions of the packet
2010-02-23 18:39:00 +00:00
adamdunkels
ca0417a923
Added the MAC layer callback functionality so that the Rime network layer gets information from the MAC about the status of sent packets: were they successfully transmitted, or was there a collisions? How many retries were there?
2010-02-23 18:38:05 +00:00
adamdunkels
f10eedab3e
Added debug printout
2010-02-23 18:37:15 +00:00
adamdunkels
2d13fecea7
Improved backoff management: timer is now doubled on every transmission, until the using module calls the neighbor_discovery_start() function again. Don't cancel the transmission even if a lower value arrives (this fixes a problem with multi-hop ETX propagaion).
2010-02-23 18:36:50 +00:00
adamdunkels
0eade2886c
Better loop handling: when a loop is detected, the neighbor to which the packet was originally sent gets an inflated ETX; made sure that collect without announcments work; increased timeouts, to work nicer in larger networks
2010-02-23 18:35:23 +00:00
adamdunkels
a4d9d6651b
Added the option to specify the old value to observers so that they can determine if the announcement should be sent out quicklier than otherwise
2010-02-23 18:32:44 +00:00
adamdunkels
b746b7fc06
Reworked the Rime/Chameleon interface so that packets now always hit Rime before Chameleon. Chameleon is now only called by Rime. This makes packet sniffing easier, and allows for sniffing packets after their header has been processed by Chameleon, thereby making per-packet power profiling much easier to implement
2010-02-23 18:29:53 +00:00
adamdunkels
d8cce42d28
Set the default radio driver to nullradio
2010-02-23 18:28:04 +00:00
adamdunkels
47578806b5
Removed semicolon from #define to allow the semicolon to be placed naturally after the macro is used
2010-02-23 18:27:04 +00:00
adamdunkels
4b04fdd328
Minor style fix
2010-02-23 18:26:26 +00:00
adamdunkels
1ee32c3074
Removed non-functional time synchronization code; added some experimental code for CCA checks (enabled CCA mode 1, a temporary development function for setting the CCA threshold); enable the possibility to switch off radio even if a packet is currently arriving
2010-02-23 18:24:49 +00:00
adamdunkels
5292005962
A null radio driver that does not do anything - useful in the native port and as a template for new radio drivers
2010-02-23 18:18:53 +00:00
adamdunkels
0b2b7bcdba
Removed inadvertedly left-over include file
2010-02-18 23:52:34 +00:00
adamdunkels
5cf3b83733
Common initialization code for the netstack
2010-02-18 23:15:26 +00:00
adamdunkels
a2664054c5
Always include netstack.h
2010-02-18 23:09:30 +00:00
adamdunkels
f49ebfe1c4
Temporarily disabled rime route udp because it breaks with newest MAC interfaces
2010-02-18 21:53:08 +00:00
adamdunkels
e34eb54960
A work-in-progress rework of the Contiki MAC and radio layers. The
...
main ideas are:
* Separates the Contiki low-layer network stack into four layers:
network (e.g. sicslowpan / rime), Medium Access Control MAC
(e.g. CSMA), Radio Duty Cycling RDC (e.g. ContikiMAC, X-MAC), and
radio (e.g. cc2420).
* Introduces a new way to configure the network stack. Four #defines
that specify what mechanism/protocol/driver to use at the four
layers: NETSTACK_CONF_NETWORK, NETSTACK_CONF_MAC, NETSTACK_CONF_RDC,
NETSTACK_CONF_RADIO.
* Adds a callback mechanism to inform the MAC and network layers about
the fate of a transmitted packet: if the packet was not possible to
transmit, the cause of the failure is reported, and if the packets
was successfully transmitted, the number of tries before it was
finally transmitted is reported.
* NULL-protocols at both the MAC and RDC layers: nullmac and nullrdc,
which can be used when MAC and RDC functionality is not needed.
* Extends the radio API with three new functions that enable more
efficient radio duty cycling protocols: channel check, pending
packet, and receiving packet.
* New initialization mechanism, which takes advantage of the NETSTACK
#defines.
2010-02-18 21:48:39 +00:00
adamdunkels
f8c804e28b
ntikiMAC: a new radio duty cycling mechanism that uses a combination
...
of link-layer and MAC-layer mechanisms to achieve a very low power
consumption: during idle listening the radio is switched off between
99.2% and 99.6% of the time. One unicast transmission typically adds
between 0.07% and 1.2% additional radio time, depending on packet
size.
ContikiMAC uses the standard IEEE 802.15.4 message format and adds no
additional headers.
ContikiMAC is simple: it uses periodic two-shot channel sampling
during idle listening to keep the radio on-time down. Transmissions
are done with repeated transmissions until a link-layer ACK is
received.
2010-02-18 21:26:15 +00:00
adamdunkels
f5c48751b5
Reworked 802.15.4 header creation and parsing so that it works regardless of the size of the rimeaddr_t typedef
2010-02-18 21:00:28 +00:00
adamdunkels
2fbf21b2b3
Refactored the phase optimization functionality into a separate module
2010-02-18 20:58:59 +00:00
adamdunkels
515a391ee4
Removed left-over debug printfs
2010-02-15 23:31:05 +00:00
dak664
bb9afb4fb1
Remove compiler warning
2010-02-15 20:49:38 +00:00
adamdunkels
4bb0375251
Buffer name definition bugfix
2010-02-15 19:23:54 +00:00
adamdunkels
9bb149ca13
Bugfix by Raimondas Sasnauskas: TCP SYN duplicate receptions in the SYN_RCVD state was not correctly handled
2010-02-15 18:03:07 +00:00
adamdunkels
d67d1f7340
Major bugfix, found by Raimondas Sasnauskas: the TCP periodic timer was not started when a new connection request arrived. If there were no other active TCP connections, this means that the SYNACK would never be retransmitted, potentially leading to a forever stale TCP connection.
2010-02-09 12:58:53 +00:00
adamdunkels
4a522c96dd
Added debugging statements for packet drops
2010-02-08 21:59:49 +00:00
adamdunkels
2b6a651233
Added missing include, made debug statement more explicit
2010-02-08 21:59:21 +00:00
adamdunkels
2eba08e8f6
Made queuebuf statistics configurable, and off by default
2010-02-08 21:10:32 +00:00
nvt-se
f4d19560fc
Fixed a performance problem by not allowing GC while doing merges of files and micro logs.
2010-02-08 14:08:14 +00:00
oliverschmidt
c284092a53
- Set cursor in ctk_draw_init() to top left corner as it is called for re-initialization on Contiki exit.
2010-02-07 21:43:03 +00:00
oliverschmidt
1d1f3a23af
- No need for textcolor() before cclear().
...
- Set textcolor() in ctk_draw_init() to some reasonable value as it is called for re-initialization on Contiki exit.
2010-02-07 21:38:01 +00:00
adamdunkels
b98f7d891f
Bugfix: added missing queuebuf allocation
2010-02-06 20:50:24 +00:00
adamdunkels
671216c558
No need to clear the headers now that we explicitly save a queuebuf when sending fragments
2010-02-06 17:07:43 +00:00
adamdunkels
b6647b5630
Turns out that with cxmac, clearing the header after sending a packet is not enough to make fragmentation work. Instead, we allocate a queuebuf and restore the packet after from the queuebuf after sending it.
2010-02-06 09:42:49 +00:00
adamdunkels
494e692d0b
Bugfix: clear the header after sending a packet solves a problem with fragmentation; also prod the watchdog since fragment transmissions can take a long time with some low-power MAC protocol
2010-02-06 07:49:58 +00:00
adamdunkels
a68b4c40c4
Added a function to clear only the header part of the packetbuf
2010-02-06 07:48:52 +00:00
oliverschmidt
e88d209214
Adjusted process name to title case.
2010-02-05 19:13:05 +00:00
nifi
a1199721a6
Changed to use separate Contiki event type for ICMP6 notifications
2010-02-05 12:43:36 +00:00
oliverschmidt
5e66abda50
Initialize lastport in all cases it is defined.
2010-02-04 21:33:51 +00:00
adamdunkels
d8b0625e21
Bugfix: lastport must be defines both when UIP_ACTIVE_OPEN or UIP_UDP are defined (thanks Oliver!)
2010-02-04 21:14:45 +00:00
adamdunkels
7bcb106fa9
Disable the stream mode for TCP packets since it does not seem to work reliably with cxmac
2010-02-04 18:57:33 +00:00
adamdunkels
13f6673d04
Bugfix: drop incoming TCP and UDP packets where port numbers are zero
2010-02-04 11:17:42 +00:00
adamdunkels
d7b7b05d0e
Moved the neigbor_init() call to the collect module, since it is the only one that currently uses it
2010-02-03 20:38:33 +00:00
adamdunkels
75e1c0c8c7
Include contiki-conf.h to let the MAC channel check rate be configurable
2010-02-03 16:45:12 +00:00
adamdunkels
06d17c7e1c
Remove unused rtimer code
2010-02-03 16:44:43 +00:00
adamdunkels
4bffd277f5
Don't set the stream bit on outgoing TCP packets for now - it doesn't seem to play well with IPv6 and X-MAC
2010-02-03 16:44:19 +00:00
adamdunkels
36db5eb70b
Added debug printout
2010-02-03 01:18:24 +00:00
adamdunkels
e419eb3cc5
Retransmit packet if it didn't receive a MAC layer ack
2010-02-03 01:17:54 +00:00
adamdunkels
d68af249ec
Added a MAC layer return value that informs the caller that a packet did not receive a MAC layer acknowledgement
2010-02-03 01:17:32 +00:00
adamdunkels
4bc4f033e8
Increase the trickle resend interval for router advertisements
2010-02-03 01:13:17 +00:00
adamdunkels
181213124b
Added a configuration option for setting the MAC channel check rate (which must be a power of two). The configuration is independent of the MAC protocol.
2010-02-02 23:28:58 +00:00
adamdunkels
f66cd6d44e
Increased the forwarding queue to six packets to improve collection robustness
2010-02-02 21:44:05 +00:00
adamdunkels
e21c1a39d3
Removed unused code; a number of fixed by Anthony Asterisk
2010-02-02 21:13:27 +00:00
adamdunkels
901a128e7f
Reconfigured the timeouts to work better on top of a power-cycling radio mechanism
2010-02-02 21:12:29 +00:00
adamdunkels
28052c655f
Removed exit() calls that were unadvertedtly left in from testing
2010-02-02 21:10:38 +00:00
adamdunkels
0db31db624
Moved declarations to the start of each function
2010-02-02 21:09:06 +00:00
adamdunkels
fcf60e9260
Removed the csma_init declaration in the mac_driver struct since it isn't needed and it breaks sdcc
2010-02-02 20:45:58 +00:00
adamdunkels
cc2be0f111
Remove compiler warnings
2010-02-02 16:33:07 +00:00
adamdunkels
88c661b0c2
Rewrote the netif time code so that is avoids the use of floating point numbers; some code style fixes
2010-02-02 16:32:03 +00:00
oliverschmidt
3f142f0718
Convert '@' correctly from PETSCII to ASCII - by leaving it alone.
2010-01-31 23:46:19 +00:00
adamdunkels
1a13d25d33
Revised version of the X-MAC implementation that uses a ctimer instead
...
of an rtimer for the periodic radio duty cycling. The benefit of this
implementation is that it leaves an rtimer free for user tasks. The
drawback is a slightly higher idle power consumption. This new version
is based on the current rtimer-based X-MAC.
2010-01-31 18:44:23 +00:00
adamdunkels
e4168db633
Bugfix: deallocate queuebuf only if there was no collision
2010-01-31 13:55:36 +00:00
oliverschmidt
9e809ef5a4
Provide optional prototypes for all three keyboard input related functions.
2010-01-31 12:48:46 +00:00
adamdunkels
4938df5c05
Update to Contiki version number 2.4
2010-01-29 18:03:55 +00:00
adamdunkels
388c5d4244
Made the sicslowpan MAC layer reachable from outside modules
2010-01-28 13:50:51 +00:00
adamdunkels
2ae7ed827c
Increase the default X-MAC channel check rate to 4 Hz instead of 2 Hz
2010-01-28 13:40:47 +00:00
adamdunkels
f94d6df6f0
Bugfix: copy the originator address from the packetbuf into a local variable to avoid it being overwritten
2010-01-27 08:12:56 +00:00
adamdunkels
8430dab039
Typecast to fix nightly build problem
2010-01-27 07:36:31 +00:00
adamdunkels
9e5823f060
Made retransmission timeout configurable
2010-01-26 10:19:26 +00:00
adamdunkels
b728c0927c
Made number of duplicate announcements configurable
2010-01-26 10:18:55 +00:00
adamdunkels
cc3f609eaa
Bugfix for alignment issue. Added mechanism that allows five duplicate announcements before suppressing one's own.
2010-01-25 13:55:17 +00:00
adamdunkels
71ffde578e
Moved route_init() into mesh instead of the generic rime initialiation
2010-01-25 13:54:26 +00:00
adamdunkels
423e37f426
Added parameter to ipolite that specifies how many dups that are acceptable, before suppressing one's own packet
2010-01-25 13:54:06 +00:00
adamdunkels
0b58ca3b22
Bugfix: split full size TCP segments if they match the MSS definition, not only the buffer size definition
2010-01-25 13:53:15 +00:00
adamdunkels
7615a6cf47
Bugfix by Henrik Mäkitaavola: check that ICMP6 process is defined before invoking it
2010-01-25 13:37:05 +00:00
adamdunkels
4f3e8d565c
Added a simple CSMA (Carrier Sense Multiple Access) mechanism that
...
works on top of an underlying duty cycling mechanism. The CSMA layer
retransmits packets that could not be sent because of a collision was
detected.
2010-01-25 11:46:44 +00:00
adamdunkels
7ad93e5d18
Added a field to the struct mac interface:
...
channel_check_interval(). This function returns the interval by which
the duty cycling mechanism checks the radio channel for activity. It
is used by higher layer mechanisms to determine suitable timeouts for
retransmissions.
2010-01-25 11:43:32 +00:00
fros4943
26e0bab11a
bugfix: alignment problem caused by previous bugfix
2010-01-21 11:39:35 +00:00
fros4943
3db4f36c3e
removed compiler specific attribute
2010-01-20 09:58:16 +00:00
nvt-se
3c890c48a9
Added some comments to clarify how Coffee works internally
2010-01-19 16:18:34 +00:00
adamdunkels
6f72ff7af1
Remove compiler warnings
2010-01-19 13:08:24 +00:00
adamdunkels
c962f49516
Alignment bugfix
2010-01-18 21:27:21 +00:00
adamdunkels
e455ef3533
Added the battery indicator to the sensors API
2010-01-15 08:51:21 +00:00
adamdunkels
fab672c7ba
Reverted the FIFOP->FIFO change; it didn't work :(
2010-01-14 23:32:05 +00:00
nvt-se
d2655eac7a
make watchdog management slightly more abstract to simplify porting
2010-01-14 21:16:58 +00:00
adamdunkels
53edff7655
Added sensor API for the SHT11 driver
2010-01-14 20:16:33 +00:00
adamdunkels
743e93e650
Do not remove encounters - there is no need to, as they are only an optimization
2010-01-14 20:14:03 +00:00
adamdunkels
f6715890de
Made SENSORS_ACTIVATE() and SENSORS_DEACTIVATE() use non-pointers, for concistency
2010-01-14 20:13:34 +00:00
nifi
079db2af55
fixed sensors_find API
2010-01-14 20:04:38 +00:00
joxe
dd6922906c
replace void pointer types with int
2010-01-14 15:33:27 +00:00
nifi
480f72c95c
changed argument for SENSORS_ACTIVATE/DEACTIVATE to be a pointer to the sensor structure
2010-01-14 14:17:08 +00:00
nifi
1d592b5680
removed obsolete structure
2010-01-14 13:55:21 +00:00