Mariano Alvira
c9ac19b919
Allocate the default_instance pointer in rpl-dag.c instead of the
...
header file to fix "multiple definition of `default_instance'" errors.
2011-12-09 08:36:23 -05:00
Mariano Alvira
1086299f25
fix typo
2011-12-09 08:23:43 -05:00
Adam Dunkels
f88a1e394b
Made collect retransmissions and broadcast announcements timers depend on the rdc wakeup rate
2011-12-09 08:18:22 +01:00
Nicolas Tsiftes
a4a7fd7dc0
Fix coding style.
2011-12-08 15:42:19 +01:00
Nicolas Tsiftes
1e61fca653
Fix coding style.
2011-12-08 15:38:35 +01:00
Nicolas Tsiftes
d0ebeb409e
Merge remote-tracking branch 'sf/master' into rpl-patch
...
Conflicts:
core/net/tcpip.c
2011-12-08 15:26:11 +01:00
Adam Dunkels
1e57ddb6c7
Disable phase shift correction by default
2011-12-08 14:04:01 +01:00
Adam Dunkels
0a428c9489
style fix; added fas check for cycle_time being a power of two or not.
2011-12-05 16:28:04 +01:00
Niclas Finne
405b295306
Clear uip_len when trying to send to a neighbor with an incomplete state, as suggested by Ivan Delamer.
2011-12-02 17:13:29 +01:00
Niclas Finne
077eba80e1
code style
2011-12-02 17:07:27 +01:00
Nicolas Tsiftes
23a280e5eb
Refactored loop detection.
2011-12-02 16:16:42 +01:00
Nicolas Tsiftes
ac869185c0
Refactored header management.
2011-12-02 15:55:07 +01:00
Nicolas Tsiftes
5c0100c979
Use rpl headers.
2011-12-02 15:54:49 +01:00
David Kopf
74aa63de43
Add optional correction for phase drift of receiver.
2011-12-01 10:02:37 -05:00
Nicolas Tsiftes
220e6f7b88
Minor documentation improvements.
2011-12-01 14:40:54 +01:00
Nicolas Tsiftes
7c808081d6
Coding style
2011-11-23 14:36:50 +01:00
nvt
e11b7d4fb6
Removed redundant code
2011-11-22 14:18:32 +01:00
Adam Dunkels
8edd86da5e
Bugfix: PROCESS_PAUSE() must explicitly check the event type, otherwise we may cause the process event queue to fill up if we repeatedly call PROCESS_PAUSE() while other (broadcast) events are posted as well, such as timer events.
2011-11-22 09:36:27 +01:00
Nicolas Tsiftes
cef95ebf9b
Inverted DAG ID check
2011-11-21 15:50:19 +01:00
Nicolas Tsiftes
2b1549bfe8
Continued merge with sf master
2011-11-21 15:25:13 +01:00
Nicolas Tsiftes
0e32956a63
Merge remote-tracking branch 'sf/master' into rpl-patch
2011-11-21 14:59:31 +01:00
Nicolas Tsiftes
ea73f1d767
Do not force DIO reset on certain events where it is not needed.
2011-11-16 09:49:22 +01:00
Nicolas Tsiftes
b405571e32
Update next-hop address for existing routes.
2011-11-16 09:05:34 +01:00
Nicolas Tsiftes
ef0ce944e5
Split management of extension headers into a separate file and fixed coding style.
2011-11-16 09:00:19 +01:00
Nicolas Tsiftes
63afff5436
Removed debug output and fixed coding style.
2011-11-16 08:56:56 +01:00
Nicolas Tsiftes
e716ce25a1
DEBUG off.
2011-11-16 08:50:01 +01:00
Niclas Finne
63e40d195e
Restore packetbuf before mac callback (earlier commit was accidental reverted)
2011-11-15 16:59:12 +01:00
David Kopf
8e47694597
Add RDC_CONF_HARDWARE_CSMA, RDC_CONF_HARDWARE_ACK, RDC_CONF_MCU_SLEEP, CONTIKIMAC_CONF_SHORTEST_PACKET_SIZE for use with hardware having those modes.
...
Default behaviour should be unchanged.
2011-11-14 12:02:47 -05:00
Joakim Eriksson
5281e7c59c
made linkable with IAR linker - avoiding multiple defs of rime_sniffer, etc
2011-11-08 11:57:17 +01:00
David Kopf
a547b2259e
Avoid infinite loop when printing garbled packets
2011-10-27 11:13:26 -04:00
David Kopf
659d30c6c2
Fix sd6 typo
2011-10-27 09:24:05 -04:00
Joakim Eriksson
2a94b3ce82
added debug callbacks
2011-10-27 12:32:16 +02:00
Niclas Finne
b01cbb996d
Fixed to restore packetbuf before mac callback
2011-10-21 17:52:31 +02:00
Joakim Eriksson
1b0af2a21d
fixed powertrace attribution for 6lowpan traffic
2011-10-20 12:37:56 +02:00
Joakim Eriksson
2399689bbd
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-10-17 14:16:57 +02:00
Joakim Eriksson
17bbb1f1c1
fixed so that rpl avoids sending no-path DAOs when changing parent when in NO_DOWNWARD mode of operation
2011-10-17 14:16:19 +02:00
David Kopf
8ebd7a65a4
Add missing includes, remove unimplemented function declaration.
2011-10-13 11:23:53 -04:00
Joakim Eriksson
cf61e522a8
added powertrace to IPv6 including an example
2011-10-13 15:09:40 +02:00
nvt
d711887a1b
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-10-10 22:11:52 +02:00
nvt
6611291dd0
Ensure that packet metric is always set.
2011-10-10 22:10:21 +02:00
simonduq
a2073db715
Removed ContikiMAC burst dependency to phase optimization
2011-10-04 10:29:40 +02:00
Joakim Eriksson
e0ae036a69
added static on the list send functions to get less compiler errors with IAR compiler
2011-10-03 15:17:30 +02:00
simonduq
222f9bd3af
Include string.h
2011-09-29 15:07:00 +02:00
simonduq
dd8576830e
Added bursts support in CSMA/ContikiMAC, and CFS-swapping in
...
queuebuf. Exemplified in examples/udp-stream.
2011-09-27 16:47:03 +02:00
Joakim Eriksson
5b1d9617c4
moved io and signal and IAR-GCC checks from driver files into contiki include file
2011-09-26 10:38:41 +02:00
Joakim Eriksson
ab049ec704
some fixes to cut some extension headers before TCP processing
2011-09-22 17:22:59 +02:00
Niclas Finne
6d3571ed59
Updated to use clock_seconds() on all platforms
2011-09-19 17:42:19 +02:00
Joakim Eriksson
95dde73618
fixed Sky platform for IAR compiler
2011-09-11 17:18:02 +02:00
nvt
ab0c04b041
Move 16-bit integer conversion operations into functions, as is done already with 32-bit ops.
2011-09-06 17:28:39 +02:00
nvt
942ba1f7bd
Removed const qualifier to conform with the rest of the Rime interface.
2011-09-05 22:05:41 +02:00
Niko Pollner
84105f4e47
Improved multihop/mesh route discovery.
...
Packetbuffer is now saved before route discovery and resent when a
route is found.
This solves the following problems:
- First packet sent to a certain node is corrupted.
- Packet to be forwarded that triggers route discovery is lost.
2011-09-05 21:27:38 +02:00
Adam Dunkels
3fa14d3cd5
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-09-05 20:45:24 +02:00
Adam Dunkels
13853b2cfd
Set default RDC wakeup rate to 8 hz
2011-09-05 20:42:38 +02:00
nvt
644f1c627d
Initialize the DIO object in case options are missing. Updated the terminology regarding options.
2011-09-05 20:28:50 +02:00
Adam Dunkels
f7a3a8476f
Added a safeguard to fragmentation reassembly: if there are additional bytes in the final fragment, we shave them off in the spirit of being 'liberal in what we accept'
2011-09-05 14:26:48 +02:00
Joakim Eriksson
7b50b87e12
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-09-05 11:40:22 +02:00
Joakim Eriksson
62705a17ea
Send DAOs if dtsn differs instead of only when larger than last dtsn in DIO
2011-09-05 11:36:53 +02:00
Adam Dunkels
bd951031ef
Cleanup of the ContikiMAC code; removed the old an unused announcement code
2011-09-02 14:06:29 +02:00
Adam Dunkels
61ef9b6fc3
Cleanup of the ContikiMAC code; removed the old an unused announcement code
2011-09-02 14:06:27 +02:00
Adam Dunkels
9b53b3aa8e
Small spelling bugfix
2011-09-02 13:51:28 +02:00
Adam Dunkels
2da65385a0
Added a SICSLOWPAN_CONF_COMPRESSION_THRESHOLD that can be used to set a threshold under which header compression should not be used. Below this threshold, headers are not compressed but sent as full IPv6 packets. This is useful for RDC layers, such as ContikiMAC, which set a lower bound for packet size.
2011-09-02 13:51:09 +02:00
Adam Dunkels
3cb42ceb10
Made the ContikiMAC header configurable from contiki-conf.h
2011-09-02 13:37:46 +02:00
Adam Dunkels
9e30f0f7c6
Minor code style fixes
2011-09-02 08:16:50 +02:00
Adam Dunkels
6220e231a2
Fixed previously erroneously fixed include
2011-09-01 09:11:46 +02:00
Adam Dunkels
4cf82b2764
Fixed includes
2011-09-01 08:45:18 +02:00
Adam Dunkels
d6508cf3c0
Made the number of phase neighbors configurable
2011-08-31 20:54:21 +02:00
Adam Dunkels
81e098d2da
Added some defensive programming
2011-08-31 20:53:48 +02:00
Adam Dunkels
7ce313eef6
A significantly simpler API for sending UDP packets
2011-08-29 21:30:21 +02:00
David Kopf
11efc33d2c
Make comparison endian-safe, thanks Ivan.
2011-08-18 14:01:20 -04:00
David Kopf
2feed121d2
Account for 16 bit rtimer wraparound, else ENERGEST way underreports AVR times.
2011-08-17 16:51:22 -04:00
David Kopf
d4eeeeb8c9
Remove inclusion of preprocessor directive in macro expansion. Some gcc's do not like that.
2011-08-17 13:13:55 -04:00
David Kopf
b55dddcd38
Free rtimer for contikimac, add print-stats option
2011-08-15 14:55:18 -04:00
David Kopf
e2ad2acde4
Add stk500 platform and changes suggested by Daniel Willmann
2011-08-03 11:18:55 -04:00
David Kopf
44f4ee9315
Use PROCESS_NAME_STRING macro to handle NO_PROCESS_NAMES
2011-08-03 11:08:40 -04:00
David Kopf
df70b21c70
gcc 4.4.1 - 4.6.0 compiler bug workaround.
2011-07-31 15:36:01 -04:00
nvt
5330dd1565
Avoid reading bytes from the original file when their is a log entry for that part of the file.
2011-07-30 10:05:23 +02:00
Vincent Brillault
d7c114dbd8
RPL prefix handling fix : Change IP on DODAG change, delete IP when leaving DODAG.
2011-07-13 10:42:59 +02:00
Vincent Brillault
d8d9494168
uip : When creating a route with a "state" field, clear it (It's possible that the process responsible for this creation doesn't handle the state field)
2011-07-13 10:31:22 +02:00
Vincent Brillault
4f76130a77
Changed Instance structure in order to decrease memory waste.
2011-07-13 10:28:56 +02:00
Vincent Brillault
286cf002bc
Clean nd6 debug output (use uip-debug instead of local code)
2011-07-11 16:53:36 +02:00
Vincent Brillault
f4b804ed9f
Add support of RPL Option ( http://tools.ietf.org/html/draft-ietf-6man-rpl-option-03 ):
...
- Auto-insersion when forwarding messages
- Delete messages with 2 rank errors
Not supported yet :
- Routing depending on InstanceID
- DAO inconsistency loop recovery
- Full UDP or TCP support (Bugs in µIPv6)
- Real Option Type (TBD by IANA)
2011-07-11 16:53:02 +02:00
Vincent Brillault
dc9cbe647d
Changes in RPL implementation :
...
- Structural modification of RPL data storage.
- Support multiple gateways (multiple DODAG-ID with a unique InstanceID)
- Use Lollipop counters
- Add leaf-only configuration option for RPL
Bugfix :
- Correctly send "Grounded" flag in DIO
2011-07-11 16:52:45 +02:00
Vincent Brillault
2ac91d53b5
Add (dangerous) feature : use layer 2 acks instead of NUD in the IPv6 layer.
...
(Decrease packet numbers but dangerous if neighbors change their ips (not a problem in standard RPL with EUI-64 based addresses))
2011-07-11 14:19:14 +02:00
Vincent Brillault
6ddd0bb190
Allow to completely desactivate DAD (useless in route-over LLN as implemented, see http://tools.ietf.org/html/draft-ietf-6lowpan-nd-15#section-8.2 )
2011-07-11 13:51:38 +02:00
Vincent Brillault
b0907f0344
Cleaning old .h :
...
- Delete unimplemented function and unused structures
- Remove misleading configuration options
- Transfer some comments from 6lowmac to framer-802154
(doc/uip6-doc.txt should be cleaned as well)
2011-07-11 13:20:30 +02:00
Nicolas Tsiftes
77a44c560a
The flags field got widened to 9 bits.
2011-06-28 17:49:32 +02:00
Nicolas Tsiftes
b1fea35e47
Fixed issues with propagation of the route lifetime configuration. Removed deprecated configuration parameters.
2011-06-28 17:08:44 +02:00
David Kopf
c48b7ab78d
Add RPL nodes and border router to minimal-net platform (cygwin only)
2011-06-28 08:19:48 -04:00
Nicolas Tsiftes
6749281a87
Rediscover lost routes when forwarding packets. Also refresh route entries when sending packets through them. Patch from Jaroslav Meduna.
2011-06-23 14:45:11 +02:00
Niclas Finne
28b0479c06
Added optional address filtering
2011-06-15 17:51:57 +02:00
Niclas Finne
e8a96dc202
Bug fix: update packet attributes in queued packets in CSMA instead of doing a full packetbuf copy after transmissions. The lower layers often add their own headers to packetbuf.
2011-06-15 16:10:07 +02:00
Nicolas Tsiftes
48e6e801c2
Removed redundant tokens at the end of preprocessor conditions
2011-06-10 17:44:48 +02:00
Nicolas Tsiftes
ce909a97e6
Removed unread stack variable
2011-06-10 17:41:46 +02:00
Niclas Finne
154f971b2b
collect_send() should return 0 if the packet could not be enqueued to be sent
2011-06-07 19:45:41 +02:00
Joakim Eriksson
d980c0db16
added delays in CC2420 to avoid risk of configuring before CC2420 is powered on
2011-06-05 00:20:25 +02:00
Joakim Eriksson
e511c6a930
added debug to sht11 driver and made it more configurable
2011-06-05 00:15:53 +02:00
Joakim Eriksson
77ec0bfa0f
fixed the z1 platform and generic code used by z1 to work with IAR compiler
2011-05-25 17:21:51 +02:00
dak664
580efaa412
Fix compiler warning for unused variable
2011-05-18 11:22:25 -04:00
Joakim Eriksson
2432a8ee7d
set expected reception sequence no to zero - to get initial connection to avoid having ack-number other than zero
2011-03-11 14:27:23 -05:00
Salvatore Pitrulli
4fb433ac1f
'if' statement replaced by a preprocessor directive.
2011-05-12 21:50:47 +02:00
