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
