nvt
534c734465
Removed redundant code and improve code style and documentation.
2012-04-22 00:18:07 +02:00
nvt
e94718f95c
Separated configuration into a new file called rpl-conf.h. Improved the documentation.
2012-04-22 00:17:10 +02:00
nvt
eda6b7c318
Use LIST_STRUCT macros. Made get_dag a static function.
2012-04-17 23:35:19 +02:00
nvt
3d0d2c284f
Changed function names.
2012-04-17 23:34:47 +02:00
nvt
80097f2c65
Removed some redundant code and fixed coding style.
2012-04-17 23:12:47 +02:00
nvt
6071b5aee7
Remove obsolete support for broadcast DAOs.
2012-04-17 23:04:20 +02:00
nvt
ed37e983f6
Refuse to allocate more parents for a specific DAG when the per-DAG limit has been reached.
2012-04-17 22:59:42 +02:00
nvt
26ee7cb5db
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-04-02 20:10:55 +02:00
Niclas Finne
2507ba4e8d
Avoid using memcpy on unaligned uint16_t variables, because certain compilers will optimize this code to a direct copy instruction that will result in unaligned memory access. Thanks to Angelo Compagnucci for reporting this problem.
2012-03-31 01:25:27 +02:00
nvt
bef9b2bd36
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-03-28 22:40:38 +02:00
Niclas Finne
7bf4fa4bff
Removed obsolete mac pointer
2012-03-28 21:51:19 +02:00
Ivan Delamer
5c232e7263
Remove compiler warning for remove_ext_header().
2012-03-27 19:48:26 -06:00
Ivan Delamer
51e3999054
Simplified reachability detections by sending probes only in PROBE
...
state.
2012-03-27 18:06:48 -06:00
Ivan Delamer
419ffddd0a
remove unnecessary stimer call in tcpip_ipv6_output()
2012-03-27 18:04:51 -06:00
Ivan Delamer
f9d5d71fde
6LowPAN: check tx result, if fail then do not send subsequent
...
fragments. Serves to save energy and also as collision avoidance.
2012-03-26 15:46:49 -06:00
Ivan Delamer
436cbec844
Separated processed_ip_len into processed_ip_in_len and
...
processed_ip_out_len to avoid corruption, in case we send a packet in
the middle of receiving a fragmented packet.
2012-03-26 15:46:47 -06:00
Ivan Delamer
c6b3a9957d
Ignore 6LowPAN fragments which won't fit in UIP_BUFSIZE (in case
...
UIP_BUFSIZE < 1280). Otherwise we'll have a buffer overrun.
2012-03-26 15:46:45 -06:00
simonduq
63ea562568
base encounter_time on the time before last strobe, remove unused previous_txtime
2012-03-26 22:49:28 +02:00
nvt
3cace20809
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-03-20 21:23:13 +01:00
simonduq
7784cf7827
stm32w platforms: use 2 cca and default contikimac guard time
2012-03-20 17:30:05 +01:00
simonduq
5da4463236
adding ducy cycling support to the stm32w-based platforms (patch by Chi-Anh La)
2012-03-20 17:29:58 +01:00
nvt
82ed40651a
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-03-15 21:47:12 +01:00
George Oikonomou
598dcc110c
sicslowpan doesn't need to remember the mac driver
2012-03-14 17:52:50 +00:00
George Oikonomou
e6819effef
Fix compile errors with SDCC
...
Intermingled declarations and code are not yet implemented in sdcc.
2012-03-14 17:52:50 +00:00
nvt
9fb93cd7b7
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-03-12 19:23:37 +01:00
Matthias Kovatsch
87cd18539b
Eliminated RPL_CONF_ADJUST_LLH_LEN correction by using uip_l3_icmp_hdr_len instead of uip_l2_l3_icmp_hdr_len.
2012-03-08 00:48:04 +01:00
Matthias Kovatsch
7eac4393c2
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-03-07 22:24:02 +01:00
Matthias Kovatsch
dd967e62f5
Applied patch provided by Franck Rousseau restoring UIP_LLH_LEN.
2012-03-07 22:22:58 +01:00
Ivan Delamer
f38962a3c4
Do not remove infinite default routers when PROBE fails.
2012-03-07 13:52:06 -07:00
nvt
c4eeb578a7
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-03-06 23:23:34 +01:00
nvt
3860e798ac
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-03-05 01:49:55 +01:00
David Kopf
07f6e10c1c
Add display options to border router web page, default now uses stack instead of static buffer.
...
Turn radio off until prefix is acquired.
2012-03-02 16:01:12 -05:00
nvt
217a4e54ca
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-02-22 19:28:49 +01:00
Joakim Eriksson
321ecc9fab
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-02-21 19:07:40 +01:00
Joakim Eriksson
5a65e3cc8b
tuned RPL parameters and improved calculation of path etx
2012-02-21 19:06:58 +01:00
David Kopf
745f071c98
Eliminate unused variable warnings. Dummy test of PT_YIELD_FLAG does not change program size.
2012-02-21 11:23:54 -05:00
Joakim Eriksson
2752337e69
fixed lollipop counter
2012-02-21 13:20:20 +01:00
Nicholas J Humfrey
3fe55673d3
Converted deprecated uIP types in the network stack to standard C99 names (in stdint.h)
2012-02-17 22:45:13 +00:00
nvt
9d8be775d4
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-02-11 02:14:20 +01:00
Niclas Finne
99f3d5ada2
Added missing include
2012-03-06 12:33:47 +01:00
Ivan Delamer
27daa94030
Compress UDP header when UIP_CONF_UDP is disabled but we are routing
...
others' UDP packets.
2012-02-01 13:06:38 -07:00
Ivan Delamer
e7cd04b558
Bug fix: do not overwrite NS or RA messages otherwise generated in the
...
same uip_ds6_periodic() call.
2012-02-01 09:55:41 -07:00
Joakim Eriksson
729a434d0f
always send DAO to refresh routes
2012-02-29 15:01:59 -08:00
Nicolas Tsiftes
d0e2d9b47e
Cleaned up code style, comments, and print outs. Set default DAG parameters when the DIO configuration option is missing.
2012-02-29 21:59:50 +01:00
Ivan Delamer
02d3fd4758
Fixes small bug in uip-nd6.c: when a packet is sent before DAD is
...
completed, DAD-like message is sent that can create a DAD fail in
another node (if it matches the destination of our packet).
2012-01-31 15:44:29 -07:00
nvt
82a7c93b47
Check return value.
2012-01-30 23:51:07 +01:00
Nicolas Tsiftes
16c437da7e
Adjust for the multi-instance structures.
2012-02-27 23:03:52 +01:00
Niclas Finne
1e85183754
fixed debug output and changed to use uip-debug.h for debug output
2012-01-27 15:51:46 +01:00
Joakim Eriksson
c3655728b8
fixed extension header handling
2012-01-27 15:40:39 +01:00
Niclas Finne
b65972d32d
Corrected debug output
2012-01-22 22:27:20 +01:00
Joakim Eriksson
6ee05f4a2d
fixed loop detection bug in RPL
2012-01-13 05:37:30 -08:00
Matthias Kovatsch
8ee68b4345
Added ext. header handling for UDP (RPL multihop still not functional).
2012-01-12 20:22:31 +01:00
David Kopf
24d58edf15
Adjust cycle starts when RTIMER_ARCH_SECOND not a power of two.
2012-01-10 12:48:39 -05:00
Joakim Eriksson
d24ecf8d59
added timestamp to neighbor info
2012-01-10 16:04:56 +01:00
Joakim Eriksson
237100f6fa
changed so that ext hdr len code checks against buffer size instead of link mtu
2012-01-10 15:51:06 +01:00
Niclas Finne
9d261eec56
Use NETSTACK_RDC_* instead of NETSTACK_CONF_RDC_*
2012-01-09 18:06:30 +01:00
Niclas Finne
8b83ffec67
Added native-border-router and slip-radio
2012-01-01 09:29:33 +01:00
Joakim Eriksson
65edc32de2
Fixed uiplib to stop parsing IPv6 address when at length part
2012-01-01 09:29:27 +01:00
Joakim Eriksson
65163a9b57
Changed FRAMER to return negative values for error to allow 0 size headers.
2012-01-01 09:10:56 +01:00
nvt
d89a4ef4fd
Simplified best_dag function and fixed the previous incomplete commit.
2012-01-04 14:13:54 +01:00
Nicolas Tsiftes
f112fa99d5
Removed the force flag from rpl_reset_dio_timer. Removed an unnecessary DIO timer reset when changing rank but keeping the same preferred parent.
2012-01-04 11:22:11 +01:00
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
Nicolas Tsiftes
cef95ebf9b
Inverted DAG ID check
2011-11-21 15:50:19 +01:00
Nicolas Tsiftes
2b1549bfe8
Continued merge with sf master
2011-11-21 15:25:13 +01:00
Nicolas Tsiftes
0e32956a63
Merge remote-tracking branch 'sf/master' into rpl-patch
2011-11-21 14:59:31 +01:00
Nicolas Tsiftes
ea73f1d767
Do not force DIO reset on certain events where it is not needed.
2011-11-16 09:49:22 +01:00
Nicolas Tsiftes
b405571e32
Update next-hop address for existing routes.
2011-11-16 09:05:34 +01:00
Nicolas Tsiftes
ef0ce944e5
Split management of extension headers into a separate file and fixed coding style.
2011-11-16 09:00:19 +01:00
Nicolas Tsiftes
63afff5436
Removed debug output and fixed coding style.
2011-11-16 08:56:56 +01:00
Nicolas Tsiftes
e716ce25a1
DEBUG off.
2011-11-16 08:50:01 +01:00
Niclas Finne
63e40d195e
Restore packetbuf before mac callback (earlier commit was accidental reverted)
2011-11-15 16:59:12 +01:00
David Kopf
8e47694597
Add RDC_CONF_HARDWARE_CSMA, RDC_CONF_HARDWARE_ACK, RDC_CONF_MCU_SLEEP, CONTIKIMAC_CONF_SHORTEST_PACKET_SIZE for use with hardware having those modes.
...
Default behaviour should be unchanged.
2011-11-14 12:02:47 -05:00
Joakim Eriksson
5281e7c59c
made linkable with IAR linker - avoiding multiple defs of rime_sniffer, etc
2011-11-08 11:57:17 +01:00
David Kopf
a547b2259e
Avoid infinite loop when printing garbled packets
2011-10-27 11:13:26 -04:00
David Kopf
659d30c6c2
Fix sd6 typo
2011-10-27 09:24:05 -04:00
Joakim Eriksson
2a94b3ce82
added debug callbacks
2011-10-27 12:32:16 +02:00
Niclas Finne
b01cbb996d
Fixed to restore packetbuf before mac callback
2011-10-21 17:52:31 +02:00
Joakim Eriksson
1b0af2a21d
fixed powertrace attribution for 6lowpan traffic
2011-10-20 12:37:56 +02:00
Joakim Eriksson
2399689bbd
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-10-17 14:16:57 +02:00
Joakim Eriksson
17bbb1f1c1
fixed so that rpl avoids sending no-path DAOs when changing parent when in NO_DOWNWARD mode of operation
2011-10-17 14:16:19 +02:00
David Kopf
8ebd7a65a4
Add missing includes, remove unimplemented function declaration.
2011-10-13 11:23:53 -04:00
Joakim Eriksson
cf61e522a8
added powertrace to IPv6 including an example
2011-10-13 15:09:40 +02:00
nvt
d711887a1b
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-10-10 22:11:52 +02:00
nvt
6611291dd0
Ensure that packet metric is always set.
2011-10-10 22:10:21 +02:00
simonduq
a2073db715
Removed ContikiMAC burst dependency to phase optimization
2011-10-04 10:29:40 +02:00
Joakim Eriksson
e0ae036a69
added static on the list send functions to get less compiler errors with IAR compiler
2011-10-03 15:17:30 +02:00
simonduq
222f9bd3af
Include string.h
2011-09-29 15:07:00 +02:00
simonduq
dd8576830e
Added bursts support in CSMA/ContikiMAC, and CFS-swapping in
...
queuebuf. Exemplified in examples/udp-stream.
2011-09-27 16:47:03 +02:00
Joakim Eriksson
ab049ec704
some fixes to cut some extension headers before TCP processing
2011-09-22 17:22:59 +02:00
nvt
ab0c04b041
Move 16-bit integer conversion operations into functions, as is done already with 32-bit ops.
2011-09-06 17:28:39 +02:00
nvt
942ba1f7bd
Removed const qualifier to conform with the rest of the Rime interface.
2011-09-05 22:05:41 +02:00
Niko Pollner
84105f4e47
Improved multihop/mesh route discovery.
...
Packetbuffer is now saved before route discovery and resent when a
route is found.
This solves the following problems:
- First packet sent to a certain node is corrupted.
- Packet to be forwarded that triggers route discovery is lost.
2011-09-05 21:27:38 +02:00
Adam Dunkels
3fa14d3cd5
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-09-05 20:45:24 +02:00
Adam Dunkels
13853b2cfd
Set default RDC wakeup rate to 8 hz
2011-09-05 20:42:38 +02:00
nvt
644f1c627d
Initialize the DIO object in case options are missing. Updated the terminology regarding options.
2011-09-05 20:28:50 +02:00
Adam Dunkels
f7a3a8476f
Added a safeguard to fragmentation reassembly: if there are additional bytes in the final fragment, we shave them off in the spirit of being 'liberal in what we accept'
2011-09-05 14:26:48 +02:00
Joakim Eriksson
7b50b87e12
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-09-05 11:40:22 +02:00
Joakim Eriksson
62705a17ea
Send DAOs if dtsn differs instead of only when larger than last dtsn in DIO
2011-09-05 11:36:53 +02:00
Adam Dunkels
bd951031ef
Cleanup of the ContikiMAC code; removed the old an unused announcement code
2011-09-02 14:06:29 +02:00
Adam Dunkels
61ef9b6fc3
Cleanup of the ContikiMAC code; removed the old an unused announcement code
2011-09-02 14:06:27 +02:00
Adam Dunkels
9b53b3aa8e
Small spelling bugfix
2011-09-02 13:51:28 +02:00
Adam Dunkels
2da65385a0
Added a SICSLOWPAN_CONF_COMPRESSION_THRESHOLD that can be used to set a threshold under which header compression should not be used. Below this threshold, headers are not compressed but sent as full IPv6 packets. This is useful for RDC layers, such as ContikiMAC, which set a lower bound for packet size.
2011-09-02 13:51:09 +02:00
Adam Dunkels
3cb42ceb10
Made the ContikiMAC header configurable from contiki-conf.h
2011-09-02 13:37:46 +02:00
Adam Dunkels
9e30f0f7c6
Minor code style fixes
2011-09-02 08:16:50 +02:00
Adam Dunkels
6220e231a2
Fixed previously erroneously fixed include
2011-09-01 09:11:46 +02:00
Adam Dunkels
4cf82b2764
Fixed includes
2011-09-01 08:45:18 +02:00
Adam Dunkels
d6508cf3c0
Made the number of phase neighbors configurable
2011-08-31 20:54:21 +02:00
Adam Dunkels
81e098d2da
Added some defensive programming
2011-08-31 20:53:48 +02:00
Adam Dunkels
7ce313eef6
A significantly simpler API for sending UDP packets
2011-08-29 21:30:21 +02:00
David Kopf
11efc33d2c
Make comparison endian-safe, thanks Ivan.
2011-08-18 14:01:20 -04:00
David Kopf
df70b21c70
gcc 4.4.1 - 4.6.0 compiler bug workaround.
2011-07-31 15:36:01 -04:00
Vincent Brillault
d7c114dbd8
RPL prefix handling fix : Change IP on DODAG change, delete IP when leaving DODAG.
2011-07-13 10:42:59 +02:00
Vincent Brillault
d8d9494168
uip : When creating a route with a "state" field, clear it (It's possible that the process responsible for this creation doesn't handle the state field)
2011-07-13 10:31:22 +02:00
Vincent Brillault
4f76130a77
Changed Instance structure in order to decrease memory waste.
2011-07-13 10:28:56 +02:00
Vincent Brillault
286cf002bc
Clean nd6 debug output (use uip-debug instead of local code)
2011-07-11 16:53:36 +02:00
Vincent Brillault
f4b804ed9f
Add support of RPL Option ( http://tools.ietf.org/html/draft-ietf-6man-rpl-option-03 ):
...
- Auto-insersion when forwarding messages
- Delete messages with 2 rank errors
Not supported yet :
- Routing depending on InstanceID
- DAO inconsistency loop recovery
- Full UDP or TCP support (Bugs in µIPv6)
- Real Option Type (TBD by IANA)
2011-07-11 16:53:02 +02:00
Vincent Brillault
dc9cbe647d
Changes in RPL implementation :
...
- Structural modification of RPL data storage.
- Support multiple gateways (multiple DODAG-ID with a unique InstanceID)
- Use Lollipop counters
- Add leaf-only configuration option for RPL
Bugfix :
- Correctly send "Grounded" flag in DIO
2011-07-11 16:52:45 +02:00
Vincent Brillault
2ac91d53b5
Add (dangerous) feature : use layer 2 acks instead of NUD in the IPv6 layer.
...
(Decrease packet numbers but dangerous if neighbors change their ips (not a problem in standard RPL with EUI-64 based addresses))
2011-07-11 14:19:14 +02:00
Vincent Brillault
6ddd0bb190
Allow to completely desactivate DAD (useless in route-over LLN as implemented, see http://tools.ietf.org/html/draft-ietf-6lowpan-nd-15#section-8.2 )
2011-07-11 13:51:38 +02:00
Vincent Brillault
b0907f0344
Cleaning old .h :
...
- Delete unimplemented function and unused structures
- Remove misleading configuration options
- Transfer some comments from 6lowmac to framer-802154
(doc/uip6-doc.txt should be cleaned as well)
2011-07-11 13:20:30 +02:00
Nicolas Tsiftes
77a44c560a
The flags field got widened to 9 bits.
2011-06-28 17:49:32 +02:00
Nicolas Tsiftes
b1fea35e47
Fixed issues with propagation of the route lifetime configuration. Removed deprecated configuration parameters.
2011-06-28 17:08:44 +02:00
David Kopf
c48b7ab78d
Add RPL nodes and border router to minimal-net platform (cygwin only)
2011-06-28 08:19:48 -04:00
Nicolas Tsiftes
6749281a87
Rediscover lost routes when forwarding packets. Also refresh route entries when sending packets through them. Patch from Jaroslav Meduna.
2011-06-23 14:45:11 +02:00
Niclas Finne
28b0479c06
Added optional address filtering
2011-06-15 17:51:57 +02:00
Niclas Finne
e8a96dc202
Bug fix: update packet attributes in queued packets in CSMA instead of doing a full packetbuf copy after transmissions. The lower layers often add their own headers to packetbuf.
2011-06-15 16:10:07 +02:00
Niclas Finne
154f971b2b
collect_send() should return 0 if the packet could not be enqueued to be sent
2011-06-07 19:45:41 +02:00
dak664
580efaa412
Fix compiler warning for unused variable
2011-05-18 11:22:25 -04:00
Joakim Eriksson
2432a8ee7d
set expected reception sequence no to zero - to get initial connection to avoid having ack-number other than zero
2011-03-11 14:27:23 -05:00
Salvatore Pitrulli
4fb433ac1f
'if' statement replaced by a preprocessor directive.
2011-05-12 21:50:47 +02:00
Joakim Eriksson
695c7d74b8
fixed bug in 6lowpan compression when compressing
2011-05-09 09:57:37 +02:00
nvt
e00508472c
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-05-03 18:18:50 +02:00
nvt
15ee0a6414
Send No-Path DAOs correctly.
2011-05-03 17:50:24 +02:00
Adam Dunkels
dfaf4afc8e
Rime sniffers must be called for all transmissions, even if they failed, to get energy attribution right. This means that rime output sniffers now also must take the MAC transmission status as an argument.
2011-05-02 15:06:34 +02:00
