11a5e0a49a
Merge pull request #1051 from simonduq/fix-warning
...
Fixed a number of compiler warnings
2015-05-13 00:52:40 +01:00
4a93f5148d
Fixed a number of compiler warnings
2015-05-08 09:07:20 +02:00
333e076b24
Disable PACKETBUF_ATTR_PACKET_TYPE in the non-Rime case by default
2015-05-06 16:36:15 +02:00
290fc829ea
Consistently use PACKETBUF_ATTR_MAC_SEQNO for MAC sequence number, both input and output. Disable PACKETBUF_ATTR_PACKET_ID in the non-Rime case.
2015-05-06 16:34:44 +02:00
bb76bb8beb
Remove unused flag SICSLOWPAN_CONF_ACK_ALL. Include packetbuf attribute PACKETBUF_ATTR_RELIABLE only when RIME is compiled.
2015-05-06 16:34:26 +02:00
dd4f181cde
Fix warnings caused by incorrect \defgroup, \addtogroup, \file
2015-02-15 20:11:09 +01:00
bd4233a953
Cleanup packetbuf: use rime attributes and addresses only when rime is enabled. Saves 32 byte per queuebuf in the non-rime case.
2014-12-02 16:54:58 +01:00
a9cc909794
Network layer configuration: replace UIP_CONF_* with NETSTACK_CONF_WITH_*
2014-12-01 21:02:57 +01:00
9b90c378e8
Merge pull request #812 from kkrentz/packetbuf-holds-broadcast
...
packetbuf_holds_broadcast()
2014-11-28 19:15:19 +01:00
6ecbf8af34
ContikiMAC: Retain original copyright
2014-11-25 04:56:09 -08:00
18ee5ce294
ContikiMAC: Added missing length function to contikimac-framer.c
2014-11-25 04:56:09 -08:00
866bb99944
Merge pull request #860 from simonduq/frame802154-align
...
frame802154_t: make sure dest_addr and src_addr are aligned
2014-11-18 08:59:30 +01:00
fb00a217f5
packetbuf: Use packetbuf_holds_broadcast() all-over
2014-11-13 09:58:08 -08:00
85b494c16b
[doc] Give files a common structure by placing license first (partial)
...
Followed by doxyen file and group tags.
This patch is only a first attempt to make provide a clean structure,
many more files require rework, too.
2014-11-10 23:54:49 +01:00
e9b5899eed
[core/net/mac] Doxygen: Added frame802154 to net group
2014-11-10 23:53:32 +01:00
6b7017452b
frame802154: move inclusion of linkaddr.h from .h to .c file
2014-11-10 15:43:32 +01:00
df6a435d42
struct frame802154_t: make sure dest_addr and src_addr are aligned
2014-11-10 15:40:24 +01:00
6fb7dd238e
Merge pull request #648 from cetic/pr-csma-fixes
...
High throughput fixes for csma and sixlowpan
2014-10-21 12:17:03 +02:00
7cbd59df03
Add per neighbor packet throttle
2014-08-13 10:11:02 +02:00
91d84a3086
Improve csma debug traces
2014-08-13 10:11:02 +02:00
2cf7d98cad
ContikiMAC: Create and parse ContikiMAC header in special framer; Expanded framer interface
...
to allow for creating and securing frames in advance; Create and secure frames in advance when sending bursts; Do neither recreate nor resecure frames that come from phase
2014-08-05 05:07:06 -07:00
515287ef17
llsec: Removed superseded NETSTACK_ENCRYPT, NETSTACK_DECRYPT, and
...
NETSTACK_ENCRYPTION_INIT macros
2014-08-05 05:07:05 -07:00
41c5dbf961
llsec: Disable duplicate detection when the LLSEC driver provides replay protection anyway.
2014-08-05 05:07:05 -07:00
eaae9f1100
llsec: Calling NETSTACK_LLSEC.on_frame_created()
2014-08-05 05:04:15 -07:00
8659c97fb0
framer-802154: Support for explicit keys
2014-08-05 05:04:15 -07:00
124dde25f3
framer-802154: Conditional compilation of security-related code
2014-08-05 05:04:14 -07:00
fb6d2270ab
framer-802154: Simplification of frame802154_create
2014-08-05 05:04:14 -07:00
11495a011c
framer-802154: Renamed variable for the sake of consistency
2014-08-05 05:04:14 -07:00
1d324e50d2
framer-802154: Sequence number fix
2014-08-05 05:04:14 -07:00
9dc9e4bd9f
framer-802154: Support for setting and accessing the frame type
...
attribute
2014-08-05 05:04:14 -07:00
19c9ef0a95
framer-802154: Support for creating and parsing frames with security headers
2014-08-05 05:04:14 -07:00
be22883724
framer-802154: Introduced mnemonic variable
2014-08-05 05:04:14 -07:00
c9ad9c04bd
framer-802154: Style fixes
2014-08-04 01:09:57 -07:00
bb74fc320f
llsec: Configuration option for defining a constant LoWPAN-wide security level
2014-08-04 01:09:57 -07:00
c396a85364
llsec: Added a layer in between NETSTACK_MAC and NETSTACK_NETWORK for implementing link layer security
2014-08-04 01:09:57 -07:00
cff30a394b
Merge pull request #635 from nfi/linkaddr-size
...
Use LINKADDR_SIZE instead of sizeof(linkaddr_t) to avoid struct padding problems.
2014-06-11 23:18:27 +02:00
eceaf0c59b
Merge pull request #631 from nfi/framer-len
...
Added function to framer that returns the estimated header length
2014-06-11 23:17:47 +02:00
25c8b0835d
Closing doxygen groups
2014-05-30 11:01:20 +02:00
b1335b08a8
Changed to use LINKADDR_SIZE instead of sizeof() to select between
...
short address and long address as some platforms might use padding in
the struct. This fixes #555 .
2014-04-11 17:24:16 +02:00
68730566a3
Added method to framer that returns the header length if the framer
...
would create a header with the current packet information.
This allows sicslowpan to calculate the max payload size without
consuming a sequence number or clearing/restoring the packet buffer.
2014-04-11 17:03:23 +02:00
5b1a9f5bc2
Bugfix: when a packet is sent by the RDC layer, we should count the number of transmissions made because a single callback can pertain to multiple transmissions at the RDC layer.
2014-03-24 08:36:18 +01:00
45265249fc
Changed the name of the rimeaddr module to linkaddr
2014-01-29 20:12:24 +01:00
bddd96d5c8
Removed all module makefiles. Instead, all .c files in a module directory are compiled.
2014-01-26 23:20:46 +01:00
8eace27f9b
Moved net/rime.h to net/rime/rime.h
2014-01-26 23:20:45 +01:00
0fe08205e1
Moved the rimeaddr.[ch] code from the core/net/rime module to the core/net module, as it is used not only by rime code
2014-01-26 23:20:36 +01:00
0f255606b0
Turned sicslowmac into a module
2014-01-26 23:20:28 +01:00
b78ab6753c
Added makefiles to make core/net/mac into a separate module
2014-01-26 23:20:26 +01:00
d777ae14e4
Moved cxmac into a separate module
2014-01-26 23:20:26 +01:00
083fe0b594
Moved the contikimac code into a core/net/mac/contikimac module
2014-01-26 23:20:25 +01:00
5f3fe7f7c7
Updated include paths for the moved files under net/
2014-01-26 23:20:23 +01:00
662eb4db14
Fix compilation error when DEBUG enabled in core/net/mac/framer-nullmac.c
2014-01-24 20:23:26 +01:00
0908924f91
Removed the lpp.c code
2013-11-28 15:24:40 +01:00
f86aaf7c14
Removed the xmac.c code
2013-11-28 15:24:22 +01:00
db4cada4e7
Merge pull request #462 from adamdunkels/push/no-reserved-double-inclusion-defines
...
Remove all leading double underscore inclusion #defines
2013-11-26 14:26:37 -08:00
4deba89f81
rdc: duplicate packets: Keep only the last sequence number for each address
...
According to IEEE 802.15.4e (§6.4.3.9), in order to detect duplicate received
MAC-layer frames, only the most recently received frame's sequence number needs
to be stored for each unique device address. Doing so limits the possible false
duplicate packet detections to a single sequence number. This also allows to
keep the last sequence number of more device addresses for the same value of
MAX_SEQNOS.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-11-25 13:01:11 +01:00
477a4a7178
rdc: duplicate packets: Factor out detection code
...
The code detecting duplicate packets in the RDC layer had been copied into most
RDC implementations. Factor it out into a new mac-sequence module in order to
have a single instance of this code.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-11-25 13:01:11 +01:00
14db3382af
csma: Initialize sequence number with random value
...
According to IEEE 802.15.4 (§5.1.6.1, §6.4.2), the MAC sequence numbers should
be initialized to random values. This was already the case in
framer-802154.c:create(), but not in csma.c:send_packet(), sometimes causing
false detections of duplicate MAC-layer packets in other devices when a device
was restarted too quickly. This patch decreases the probability of such an
event.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-11-25 13:01:11 +01:00
bb2dcaa057
A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix
2013-11-24 20:20:11 +01:00
bec721d313
Allow payload len to be larger than 256 bytes
2013-11-16 14:22:48 +01:00
03dcca15cb
Implement a truncated exponential backoff for csma
2013-11-14 15:02:36 +01:00
4ba22102fd
[core/net/mac] Removed invalid struct member u8 in PRINTADDR
2013-10-15 01:43:26 +02:00
248301a041
Fix naming issues and includes in uip-ds6-nbr.h
2013-08-19 17:48:30 +02:00
5a1d8d8006
Make phase module use neighbor-table.
2013-08-19 17:48:29 +02:00
8041f66d8c
link-layer acks support for cooja motes
2013-08-15 14:32:35 +02:00
0aa448f190
6lowpan fragmentation bugfix: the 6lowpan code had an unfortunate
...
interaction with the behavior of the rdc layer. If the first packet of a
fragment transmission was lost, the remaining packets would get dropped
on reception. Moreover, the reception code contained a bug that
sometimes would cause fragments to be misidentified as fragments. Taken
together, these problems would result in a pathelogical network
breakdown if too many fragmented packets would occur simultaneously.
2013-08-11 14:27:20 +02:00
cf894b8b95
changed inter packet interval to 0.4ms
2013-06-21 13:15:45 +02:00
7cc8f326f4
Merge pull request #257 from adamdunkels/hotfix-csma
...
CSMA bugfix
2013-06-20 01:49:48 -07:00
09f30e875d
Bugfix: when a CSMA callback is received, we should remove the packet
...
that was transmitted and not just the first packet that happens to be on
the output queue.
2013-05-25 12:13:07 +02:00
c9de0e49be
Added a number of default options for ContikiMAC, and allow them to be overridden with contiki-conf.h configuration options
2013-05-25 12:10:27 +02:00
82d498f3a1
Removed undef
2013-05-15 16:25:34 +02:00
071cfaf1cb
Corrects some leftover uncapitalized printfs which may cause some platforms
...
to crash.
2013-05-15 12:21:15 +02:00
7f2a842b71
Merge pull request #174 from adamdunkels/feature-net-improvements
...
Improvements to the core/net/ code
2013-03-18 17:12:12 -07:00
6a07172662
Merge pull request #176 from adamdunkels/feature-net-bugfixes
...
Network system bugfixes
2013-03-18 13:38:44 -07:00
7742b05d8c
Major bugfix: when nullrdc is asked to send a list of packets, send the list of packets and not just the first packet - this is essential for retransmissions of fragmented IP packets to work
2013-03-18 13:35:29 +01:00
4efd570cf9
Minor bugfix: explicitly cast pointer argument in debug printf
2013-03-18 11:22:05 +01:00
f2fbb4b49d
Defensive programming: make sure that we don't fail completely if we get a callback for a NULL pointer
2013-03-18 11:22:04 +01:00
82b755c017
Bugfix: keep track of receiver being awake as a local variable rather than a global, as it may have changed between invokations
2013-03-18 11:22:02 +01:00
0670a8e1e2
Minor code style fixes to the contikimac and nullrdc code
2013-03-18 11:22:01 +01:00
5993595a8f
A number of updates to nullrdc
...
* add a few rimestats to keep track of sent and received acks
* made a number of configuration options possible to override (ack timing)
* added the logic for sending 802.15.4 link layer ack packets, despite not being able to guarentee the 802.15.4 MAC timing
* increased the number of sequence numbers to keep track of for duplicate filtering
2013-03-18 11:19:20 +01:00
4541d3e85b
Let the framer functions use ints instead of uint8_t to make them more generic
2013-03-18 11:19:18 +01:00
c0a693672c
core/net: Added support for "bridge mode".
...
"Bridge mode" allows devices to more easily send 802.15.4 packets as if
they were a different device. It also turns off any packet filtering
that may be implemented at layer 2. It works by allowing
`PACKETBUF_ADDR_SENDER` to be set earlier in the stack.
This is useful for implementing 6LoWPAN-ethernet bridges.
Enabled via setting `NETSTACK_CONF_BRIDGE_MODE` to 1. Disabled by
default.
2013-03-10 14:45:15 -07:00
cb7842bd16
Added support for encryption and decryption of the packetbuf if macros
...
NETSTACK_ENCRYPT and NETSTACK_DECRYPT are defined. Those are intended
to be called as functions NETSTACK_ENCRYPT() and NETSTACK_DECRYPT() to
encrypt and decrypt the packetbuf, respectively. If needed, an
initialization function by the name NETSTACK_ENCRYPTION_INIT() can
also be defined.
2012-11-25 12:05:00 +01:00
6ee1f72486
Removed old unused TDMA-based MAC and RDC code
2012-11-20 20:48:34 +01:00
ec8c7e9be0
Cleanup of the node-id.h files. The node-id.h file contains
...
declarations of functions for setting and getting a node ID number, a
functionality that exists on many platforms. Since this functionality
was not considered part of the Contiki core, each platform defined its
own node-id.h file. This commit attempts to clean this up by
collecting the node-id.h into a core/sys/node-id.h file that replaces
the old node-id.h files from the platform directories.
2012-11-20 19:59:46 +01:00
713c2e5974
DOS EOL and indentation fixes (core/ apps/ cpu/)
...
- Removed some DOS EOLs
- Changed some tabs to spaces
- Removed some trailing whitespaces
Part of Pull Request #6
2012-10-30 13:43:51 +00:00
944537fccf
Removed all old RCS tags in the Contiki source tree. Those RCS tags are not used any more, as we are now using git to manage the Contiki source tree
2012-10-26 15:54:49 +02:00
076c208b72
avoid gcc optimization bug by extracting struct values
2012-05-30 17:58:45 +02:00
63ea562568
base encounter_time on the time before last strobe, remove unused previous_txtime
2012-03-26 22:49:28 +02:00
7784cf7827
stm32w platforms: use 2 cca and default contikimac guard time
2012-03-20 17:30:05 +01:00
5da4463236
adding ducy cycling support to the stm32w-based platforms (patch by Chi-Anh La)
2012-03-20 17:29:58 +01:00
e6819effef
Fix compile errors with SDCC
...
Intermingled declarations and code are not yet implemented in sdcc.
2012-03-14 17:52:50 +00:00
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
745f071c98
Eliminate unused variable warnings. Dummy test of PT_YIELD_FLAG does not change program size.
2012-02-21 11:23:54 -05:00
24d58edf15
Adjust cycle starts when RTIMER_ARCH_SECOND not a power of two.
2012-01-10 12:48:39 -05:00
65163a9b57
Changed FRAMER to return negative values for error to allow 0 size headers.
2012-01-01 09:10:56 +01:00
d0ebeb409e
Merge remote-tracking branch 'sf/master' into rpl-patch
...
Conflicts:
core/net/tcpip.c
2011-12-08 15:26:11 +01:00
1e57ddb6c7
Disable phase shift correction by default
2011-12-08 14:04:01 +01:00
0a428c9489
style fix; added fas check for cycle_time being a power of two or not.
2011-12-05 16:28:04 +01:00
74aa63de43
Add optional correction for phase drift of receiver.
2011-12-01 10:02:37 -05:00
0e32956a63
Merge remote-tracking branch 'sf/master' into rpl-patch
2011-11-21 14:59:31 +01:00
63e40d195e
Restore packetbuf before mac callback (earlier commit was accidental reverted)
2011-11-15 16:59:12 +01:00
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
b01cbb996d
Fixed to restore packetbuf before mac callback
2011-10-21 17:52:31 +02:00
8ebd7a65a4
Add missing includes, remove unimplemented function declaration.
2011-10-13 11:23:53 -04:00
a2073db715
Removed ContikiMAC burst dependency to phase optimization
2011-10-04 10:29:40 +02:00
e0ae036a69
added static on the list send functions to get less compiler errors with IAR compiler
2011-10-03 15:17:30 +02:00
222f9bd3af
Include string.h
2011-09-29 15:07:00 +02:00
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
bd951031ef
Cleanup of the ContikiMAC code; removed the old an unused announcement code
2011-09-02 14:06:29 +02:00
61ef9b6fc3
Cleanup of the ContikiMAC code; removed the old an unused announcement code
2011-09-02 14:06:27 +02:00
3cb42ceb10
Made the ContikiMAC header configurable from contiki-conf.h
2011-09-02 13:37:46 +02:00
d6508cf3c0
Made the number of phase neighbors configurable
2011-08-31 20:54:21 +02:00
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
28b0479c06
Added optional address filtering
2011-06-15 17:51:57 +02:00
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
580efaa412
Fix compiler warning for unused variable
2011-05-18 11:22:25 -04:00
4fb433ac1f
'if' statement replaced by a preprocessor directive.
2011-05-12 21:50:47 +02:00
74f1754d88
Bugfix: energy consumption for retransmissions was miscounted
2011-04-13 14:10:39 +02:00
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
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
a8f9119ace
pass up a RADIO_NOACK to the MAC layer.
2011-02-23 15:19:43 -08:00
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
24af4888bc
Made the number of MAC sequence numbers to remember configurable
2011-02-21 14:11:17 +01:00
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
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
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
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
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
808c21fbfa
Bugfix: default should be 3 MAC-level retransmissions if collissions or loss occurs
2011-01-18 16:03:57 +00:00
affba785b5
Enabled phase-lock only for channel check rates of 32 Hz or lower
2011-01-18 16:03:19 +00:00
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
a0960154ba
Cleaned up parts of the code; added comments
2011-01-09 21:07:01 +00:00
322d835fee
Fix avr-gcc compiler warnings
2010-12-18 22:12:53 +00:00
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
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
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
af21afa750
Make sure that the cycle timing is exact
2010-12-10 13:36:06 +00:00
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
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
e54d7d6f9c
Fix compiler warnings
2010-12-02 15:55:17 +00:00
6d556d5c13
Fixed bug with link-layer ACKs. Refactored the ACK reception code.
2010-11-25 08:44:34 +00:00
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
05d78522d3
Added MAC-layer duplicate message suppression when using 802.15.4 auto ack
2010-11-12 12:53:16 +00:00
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
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
73f5535754
Made the guard time slightly more conservative - found an occasion where this was needed
2010-10-24 21:06:17 +00:00
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
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
e2b4956a7f
Bug fix: release the packet and notify the sender if RDC returned an error
2010-10-14 19:08:39 +00:00
4f3fc1c404
fixed xmac to use new channel check define name
2010-10-03 22:46:53 +00:00
ceebd7020a
Bugfix: the return value sometimes was wrong when a collision was detected.
2010-10-03 20:39:24 +00:00
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
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
12479c32bc
Fix compiler warnings
2010-08-01 21:18:07 +00:00
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
7647cbd8aa
Use the list_item_next() API
2010-06-15 19:22:25 +00:00
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
951fd78f6c
ctimer moved from net/rime to sys/
2010-06-14 18:58:45 +00:00
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
8d1680fed5
Filter duplicate packets
2010-06-14 06:52:41 +00:00
ac9b862cd0
Added configurable support for 802.15.4 autoack
2010-05-26 14:12:33 +00:00
b8a3a4109e
Adjusted the code so as to remove compilation warnings.
2010-04-30 22:18:12 +00:00
0859d4b95f
Avoid turning off the radio in the middle of a packet reception
2010-04-30 07:32:39 +00:00
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
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
12b6f35ce7
PRINTF()ed debugging output
2010-04-27 12:56:35 +00:00
85d6f6c514
removed unused variable
2010-04-26 22:41:50 +00:00
b26f45a35b
code cleanup
2010-04-26 17:55:11 +00:00
d761b6e89a
Added MAC header to handle padding
2010-04-26 17:46:21 +00:00
14b1bb9f57
Fixed to only use leds when DEBUG is set
2010-04-20 11:41:16 +00:00
3670fac618
Bugfix: timing fixed
2010-04-08 18:23:24 +00:00
91ff8574ad
Improved handling of duplicate packets
2010-04-08 09:32:56 +00:00
ac4ba199bc
Turn off DEBUG mode by default.
2010-04-06 21:37:54 +00:00
497111bcc9
Added an optional rate limit for broadcast transmissions
2010-04-06 11:57:43 +00:00
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
c68ee6e577
Bugfix: memory from the wrong memb was freed.
2010-04-04 21:02:09 +00:00
a4c328785a
Small timing tweaks
2010-04-04 21:01:24 +00:00
62039a530d
Removed non-existant cooja-debug.h include
2010-04-04 12:31:47 +00:00
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
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
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
6ae86d001d
made number of phase neighbors configurable
2010-04-01 17:17:36 +00:00
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
b43f7830b3
Fine-tuned the timing and phase lock optimization
2010-03-31 20:27:15 +00:00
877eb2fbe9
Fiddled with the timing
2010-03-31 11:54:38 +00:00
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
226abb8ec3
Removed non-existant include file
2010-03-29 22:10:03 +00:00
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
b4b7e942b6
Back off a guard time for every non-ack packet
2010-03-29 21:50:01 +00:00
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
49009e9cbd
Extend the length of announcement packets if they are too short
2010-03-19 13:24:58 +00:00
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
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
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
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
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
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
2cf0fb9cce
Changed to use short address mode with short rime addresses
2010-03-12 14:49:21 +00:00
4b60301727
Don't set the ack flag for broadcast packets
2010-03-09 20:40:11 +00:00
17f6b3a324
Simplified the structure of the code
2010-03-09 20:38:55 +00:00
George Oikonomou
Simon Duquennoy
George Oikonomou
Nicolas Tsiftes
kkrentz
Enrico Joerns
Laurent Deru
Adam Dunkels
Rémy Léone
Niclas Finne
Adam Dunkels
Martin Heusse
Benoît Thébaudeau
Fredrik Osterlind
Jelmer Tiete
lebrush
Robert Quattlebaum
Fredrik Osterlind
David Kopf
Joakim Eriksson
Adam Dunkels
Vincent Brillault
Salvatore Pitrulli
Mariano Alvira
Lionel Debroux
adamdunkels
dak664
nifi
joxe
nvt-se
fros4943
oliverschmidt