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
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
f49ebfe1c4
Temporarily disabled rime route udp because it breaks with newest MAC interfaces
2010-02-18 21:53:08 +00:00
adamdunkels
e34eb54960
A work-in-progress rework of the Contiki MAC and radio layers. The
...
main ideas are:
* Separates the Contiki low-layer network stack into four layers:
network (e.g. sicslowpan / rime), Medium Access Control MAC
(e.g. CSMA), Radio Duty Cycling RDC (e.g. ContikiMAC, X-MAC), and
radio (e.g. cc2420).
* Introduces a new way to configure the network stack. Four #defines
that specify what mechanism/protocol/driver to use at the four
layers: NETSTACK_CONF_NETWORK, NETSTACK_CONF_MAC, NETSTACK_CONF_RDC,
NETSTACK_CONF_RADIO.
* Adds a callback mechanism to inform the MAC and network layers about
the fate of a transmitted packet: if the packet was not possible to
transmit, the cause of the failure is reported, and if the packets
was successfully transmitted, the number of tries before it was
finally transmitted is reported.
* NULL-protocols at both the MAC and RDC layers: nullmac and nullrdc,
which can be used when MAC and RDC functionality is not needed.
* Extends the radio API with three new functions that enable more
efficient radio duty cycling protocols: channel check, pending
packet, and receiving packet.
* New initialization mechanism, which takes advantage of the NETSTACK
#defines.
2010-02-18 21:48:39 +00:00
adamdunkels
4a522c96dd
Added debugging statements for packet drops
2010-02-08 21:59:49 +00:00
adamdunkels
2eba08e8f6
Made queuebuf statistics configurable, and off by default
2010-02-08 21:10:32 +00:00
adamdunkels
a68b4c40c4
Added a function to clear only the header part of the packetbuf
2010-02-06 07:48:52 +00:00
oliverschmidt
e88d209214
Adjusted process name to title case.
2010-02-05 19:13:05 +00:00
adamdunkels
d7b7b05d0e
Moved the neigbor_init() call to the collect module, since it is the only one that currently uses it
2010-02-03 20:38:33 +00:00
adamdunkels
36db5eb70b
Added debug printout
2010-02-03 01:18:24 +00:00
adamdunkels
f66cd6d44e
Increased the forwarding queue to six packets to improve collection robustness
2010-02-02 21:44:05 +00:00
adamdunkels
f94d6df6f0
Bugfix: copy the originator address from the packetbuf into a local variable to avoid it being overwritten
2010-01-27 08:12:56 +00:00
adamdunkels
9e5823f060
Made retransmission timeout configurable
2010-01-26 10:19:26 +00:00
adamdunkels
b728c0927c
Made number of duplicate announcements configurable
2010-01-26 10:18:55 +00:00
adamdunkels
cc3f609eaa
Bugfix for alignment issue. Added mechanism that allows five duplicate announcements before suppressing one's own.
2010-01-25 13:55:17 +00:00
adamdunkels
71ffde578e
Moved route_init() into mesh instead of the generic rime initialiation
2010-01-25 13:54:26 +00:00
adamdunkels
423e37f426
Added parameter to ipolite that specifies how many dups that are acceptable, before suppressing one's own packet
2010-01-25 13:54:06 +00:00
fros4943
26e0bab11a
bugfix: alignment problem caused by previous bugfix
2010-01-21 11:39:35 +00:00
adamdunkels
c962f49516
Alignment bugfix
2010-01-18 21:27:21 +00:00
nvt-se
a03e899c27
Signal the result of transmissions attempts made in the mesh module. Patch from Moritz Struebe
2009-12-18 14:57:15 +00:00
nifi
7b2b93e6e6
clear transmission flag if send failed
2009-12-18 14:49:42 +00:00
adamdunkels
f4e6758b22
Use RTIMER_NOW() instead of rtimer_arch_now()
2009-12-09 18:08:26 +00:00
nifi
1f2c226d8e
* Added ctimer_restart(). Patch by Moritz Struebe.
...
* Added ctimer_expired().
2009-11-19 18:32:05 +00:00
fros4943
9b20f11cd8
chameleon returns 1 only on successful rime_output()
2009-11-13 09:14:52 +00:00
fros4943
583dd11c55
rime_output() now returns RIME_OK or RIME_ERR depending on the MAC return value.
...
this patch may affect Rime sniffers running on top of MAC protocols that do not yet return generic MAC return values
2009-11-13 09:10:24 +00:00
adamdunkels
60a3fc0cae
Fixed alignment issue
2009-11-09 08:22:40 +00:00
adamdunkels
56218aba3b
Made rimeaddr_t pointers const where they should be.
2009-11-08 19:40:16 +00:00
adamdunkels
5aab2eb77d
A simple addition with significant performance implications:
...
sicslowpan tags TCP packets with the PACKETBUF_ATTR_PACKET_TYPE_STREAM
flag, which makes the underlying power-saving MAC layer keep the radio
on for some time after transmitting the packet. This allows reply
packets to be processed directly, significantly increasing TCP latency
and throughput.
2009-11-02 11:58:56 +00:00
zhitao
1913e1a936
prevent neighbor ETX from wrap-over
2009-10-22 13:11:20 +00:00
nifi
df32fde58c
Made max number of neighbors configurable
2009-10-21 21:25:10 +00:00
adamdunkels
91579fbaab
Removed debug strings to save ROM
2009-10-20 08:06:43 +00:00
adamdunkels
a5ea7ef966
Increased default number of queue buffers
2009-10-19 21:28:59 +00:00
adamdunkels
4d9b05c2ce
Increased default header size in packetbuf to accomodate 802.15.4 headers
2009-10-19 21:28:11 +00:00
nvt-se
31f41d842e
* decline route discovery requests if we have one in the air
...
* and, by popular demand, switched PRINTF to printf in the debug macro. :-)
2009-10-08 16:30:26 +00:00
adamdunkels
1980253ba3
Refresh routes when hearing a packet from a neighbor
2009-09-09 21:10:21 +00:00
adamdunkels
786ed3cf84
Fixed sdcc compiler problem: function pointers cannot be NULL, so added a dummy function instead
2009-09-09 21:09:42 +00:00
oliverschmidt
e60db62b10
Added prototype missing for quite some time now - do we need -Werror ?
2009-08-20 20:27:17 +00:00
nvt-se
38fff1b527
mac_driver structure has been changed to include the init function.
2009-06-24 16:31:49 +00:00
nvt-se
33909cc2fd
made neighbor discovery method configurable. default is announcements.
2009-05-30 19:54:05 +00:00
nvt-se
83f2b9ae57
include ctimer.h, since ctimer's are used in the neighbor_discovery_conn struct.
2009-05-30 19:40:39 +00:00
nvt-se
9277f922f1
fixed some documentation typos.
...
also uc -> unicast, stuc -> stunicast.
2009-05-26 13:58:53 +00:00
adamdunkels
5308a09dd3
Added debug output
2009-05-10 21:10:23 +00:00
adamdunkels
02734c9806
Bugfix: must copy the sender and receiver addresses from the packetbuf buffer, otherwise an application program may overwrite them
2009-05-10 21:10:02 +00:00
adamdunkels
fe30886b37
Added functionality for decaying routes: when a packet is sent over a route, it is decayed. If the route is not refreshed within four packets (with the route_refresh() function, which is called when a new packet arrives), the route is dropped. A route can be decayed at most once per second
2009-05-10 21:08:01 +00:00
adamdunkels
6bf8e0b478
Bugfix by Takahide Matsutsuka: too few items in array, which caused problems with sdcc
2009-05-08 08:52:55 +00:00
zhitao
48d4800f08
removed reference to undefined function in mspgcc
2009-05-06 15:34:28 +00:00
adamdunkels
a671ea1146
Documentation fix
2009-05-06 15:04:20 +00:00
zhitao
58940ecbf8
minor documentation fixes
2009-05-06 08:37:48 +00:00
adamdunkels
c83c5c4c55
Removed automatic refresh of routes from the route_lookup() function and moved it into an explicit route_refresh() function. The previous behaviour was dangerous, since it meant that even bad routes that someone was looking for were considered fresh. Now such routes time out if they are not explictily refreshed (e.g., on a packet reception)
2009-05-04 11:23:30 +00:00
adamdunkels
f5a57a4e54
Fixes by Ward Van Heddeghem (reapplied from versioin 1.24)
2009-04-30 20:21:06 +00:00
adamdunkels
e70cf0c7c6
Rewrite of the collect module. The new version uses a packet queue for outgoing and forwarded packets so that more than one packet can be forwarded at the same time. The new version uses the packetqueue module to maintain the packet queue.
2009-04-29 20:48:57 +00:00
adamdunkels
c489b1118d
New module: packetqueue. The packetqueue module maintains packet queues for other modules.
2009-04-29 20:47:30 +00:00
adamdunkels
c9df0ab123
Bugfix in debug message printout
2009-04-28 14:01:46 +00:00
fros4943
7810d362a6
minor bugfixes: a rucb sender could not immediately after start receiving a bulk transfer
2009-04-16 14:32:01 +00:00
nvt-se
c0fb680f12
simplified code by using udp_broadcast_new.
2009-04-13 19:55:15 +00:00
adamdunkels
f5f52ffd1f
Fixes by Ward Van Heddeghem (VUB)
2009-04-07 13:06:03 +00:00
adamdunkels
ace6567815
Added a timer that randomizes the retransmission of an incoming new trickle version to avoid broadcast collisions
2009-04-06 21:20:35 +00:00
adamdunkels
be1c8ccec9
Added debug printouts
2009-04-06 21:19:34 +00:00
adamdunkels
d02ac74bbc
Increased size of temporary stack value to avoid overflowing when computation is done with 8-bit integers
2009-04-06 21:19:00 +00:00
nifi
eab96e9b53
added rime-udp.c
2009-04-06 14:10:57 +00:00
nvt-se
d6869018c7
turned off debugging.
2009-04-06 13:27:37 +00:00
nvt-se
faf083f09d
save copy of a rime address that points to a packet buffer, since the
...
packet buffer is cleared and overwritten before the address usage is done.
2009-04-06 13:16:39 +00:00
nvt-se
c531f25c94
A module that enables Rime to run over UDP.
2009-04-06 13:13:26 +00:00
adamdunkels
73fdf05940
Added const to constant parameters (rime addresses)
2009-03-24 07:15:04 +00:00
adamdunkels
a625d80259
Added explicit typecast to buffer definition
2009-03-24 07:14:12 +00:00
adamdunkels
f4b8680174
Defined the packetbuf buffer so that it is always aligned on a 16-bit boundary.
2009-03-23 19:37:45 +00:00
adamdunkels
39af9b361d
Fixed minor bug in comment
2009-03-23 16:39:09 +00:00
adamdunkels
21e0900d18
Made constant addresses const
2009-03-23 16:22:02 +00:00
adamdunkels
143bf11548
The multihop module used the pre-chameleon style packet headers. Converted it to use packet attributes instead of packet headers
2009-03-23 16:20:37 +00:00
adamdunkels
c791d851bb
Send an announcement packet only if there are more than zero announcemnets
2009-03-23 16:19:03 +00:00
nifi
91fa18e0e6
removed unused prototype
2009-03-23 10:58:00 +00:00
nvt-se
cc85a36722
use u8 when writing rime addresses.
2009-03-21 20:53:06 +00:00
nifi
f0e56df2eb
fixed compiler warning when timesynch is disabled
2009-03-17 09:57:01 +00:00
adamdunkels
fb8fab739a
Renamed the rimebuf module to packetbuf to signal that the module is used outside of a pure Rime context (e.g., the sicslowpan code uses it).
2009-03-12 23:04:52 +00:00
adamdunkels
65eb5fd4e8
Renamed the rimebuf module to packetbuf to signal that the module is used outside of a pure Rime context (e.g., the sicslowpan code uses it).
2009-03-12 21:58:20 +00:00
adamdunkels
537219bf27
Added a packet attribute to specify transmission power on outgoing packets
2009-03-11 20:33:17 +00:00
zhitao
f304941ab4
raise busy forwarding flag before sending
2009-03-10 14:07:41 +00:00
zhitao
1eb085834f
Update announcement value after route metric saturates. Not doing this results in stubborn forwards from former children nodes.
2009-03-09 12:54:27 +00:00
adamdunkels
a1260c0c1f
Documentation updates
2009-03-08 21:43:24 +00:00
adamdunkels
366ad7bece
Added Rime documentation from the Rime/Chameleon paper (SenSys 2007)
2009-03-07 11:15:46 +00:00
zhitao
0a12098bd5
avoid ping pong packets during route disruption
2009-03-06 17:33:59 +00:00
zhitao
64badeb282
bugfix: use memcpy() to get attributes longer than a byte properly written to packet header
2009-03-05 13:51:28 +00:00
zhitao
08b2315f41
bugfix: put up busy forwarding flag only after next hop found
2009-03-04 08:59:32 +00:00
fros4943
f701615afa
bugfix: remember active transmissions (sender side) instead of last received packets (receiving side). allows several nodes sending to a single receiver.
...
+ added function for checking if runicast is currently transmitting (non-acked) data
2009-03-03 12:19:46 +00:00
adamdunkels
9816f49fe6
Changed listen and transmit energy attributes so that they are named _TIME rather than _ENERGY, to indicate that they contain the time during which the radio was switched on and not the energy
2009-03-02 22:00:41 +00:00
adamdunkels
78591a003f
Minor documentation update
2009-03-02 21:56:16 +00:00
adamdunkels
45e32894a0
Bugfix: backwards definition of MIN macro (quite embarassing)
2009-03-02 11:22:09 +00:00
adamdunkels
aa2f7a3399
Made polite announcement times configurable, added missing right-brace
2009-03-01 10:43:57 +00:00
adamdunkels
3adf8e5807
Call output packet sniffers after the MAC has sent the packet
2009-03-01 10:29:50 +00:00
adamdunkels
2aedc8490d
Compile only if timesynch is enabled
2009-02-20 21:23:22 +00:00
fros4943
97f76126e6
remembering last received packet id to avoid multiple recv callbacks for the same retransmitted packet (but still sending back acks of course)
2009-02-17 12:40:18 +00:00
adamdunkels
36bb3ece64
If no neighbor is found, we listen for announcements. Cleaned up debug output.
2009-02-16 01:18:53 +00:00
adamdunkels
585620c102
Reverted the recent change from random_rand() to rand(). It turned out that
...
since libc rand() returns a signed int, there were frequently problems with
timer values wrapping. By reverting to random_rand(), we can provide a
random generator that returns an unsigned and the timer problems are solved.
2009-02-11 11:08:53 +00:00
adamdunkels
9d75781a78
Added packet attributes for energy spent on a packet (RIMEBUF_ATTR_LISTEN_ENERGY and RIMEBUF_ATTR_TRANSMIT_ENERGY)
2009-02-10 23:51:12 +00:00
adamdunkels
b15198b9a8
Bugfix: the Chameleon header parser modules should not clear the packet attributes, because the MAC or radio layers may have added attributes already
2009-02-10 23:49:58 +00:00
adamdunkels
e1ef13dad6
Reduced the size of the packet cache from four to two to avoid falseley dismissing fresh packets (the header field that hold sequence numbers is only two bits wide, hence all sequence numbers fits in a four-entry cache...)
2009-02-10 00:44:50 +00:00
adamdunkels
6c95bd895a
Added default initialization of polite announcements. Not sure where the best place for this is, but this at least allow us to start experimenting with this.
2009-02-09 22:05:33 +00:00
adamdunkels
0de445e035
Initialize the announcement module
2009-02-09 21:08:12 +00:00
adamdunkels
3670ef2f44
Rewrote the collect module so that it uses the announcement module rather than the neighbor-discovery module. This makes it possible to implement other annoumcement back-ends than the traditional broadcast-based neighbor discovery
2009-02-09 20:58:25 +00:00
adamdunkels
4b71003c2f
Changed from random_rand() to rand() for better pseudo randomness
2009-02-07 18:43:45 +00:00
adamdunkels
752291f450
Changed from random_rand() to rand() function for (pseudo) random numbers because random_rand() does not work that well
2009-02-07 16:16:31 +00:00
adamdunkels
91e8487032
Added Doxygen documentation
2009-02-07 16:15:37 +00:00
adamdunkels
be846d8c90
A new experimental network primitive called an 'announcement'. An
...
announcement is an (ID, value) tuple that is disseminated to local
area neighbors. An application or protocol can explicitly listen to
announcements from neighbors. When an announcement is heard, a
callback is invoked.
Announcements can be used for a variety of network mechanisms such as
neighbor discovery, node-level service discovery, or routing metric
dissemination.
Application programs and protocols register announcements with the
announcement module. An announcement back-end, implemented by the
system, takes care of sending out announcements over the radio, as
well as collecting announcements heard from neighbors.
2009-02-05 19:32:01 +00:00
fros4943
4f1a9d3c75
bugfix: stopping timeout timer when we receive route reply (still limited to only one active discovery)
2009-01-21 14:29:24 +00:00
adamdunkels
71e5adb254
Moved packet attributes specifications from rimebuf.h to the appropriate protocol header files
2009-01-15 22:15:51 +00:00
adamdunkels
50b1e60621
Rewrote the rimeaddr_copy() loop to use the ->u8 field instead of the ->u16 field (which now finally is removed)
2008-11-30 18:26:57 +00:00
adamdunkels
6951d9d582
Removed the unused ->u16 field (it was there only as a convenience/laziness access method during the initial development of the Rime stack, but has caused problems when being there)
2008-11-30 18:26:06 +00:00
oliverschmidt
7cf3165155
Replaced NETSIM macro with general (and now actually working) solution in Makefile.include.
2008-11-17 22:52:10 +00:00
zhitao
229d60d691
Neighbor ETX should accumulate over retransmission timeouts;
...
Best neighbor has minimum sum of routing metric and neighbor ETX. Previously best neighbor prioritizes routing metric before neighbor ETX, which often causes a poor neighbor with a good upstream path to be selected.
2008-11-12 10:47:17 +00:00
adamdunkels
8851a6359a
Remove unguarded printf()
2008-11-09 12:16:05 +00:00
julienabeille
f95cdc5abb
Main uIPv6 files addition
2008-10-14 09:40:56 +00:00
adamdunkels
41dcd78c8b
Improved debugging output
2008-08-15 19:28:33 +00:00
adamdunkels
31509ad726
Fixed a bunch of bugs in the collection neighbor announcement/discovery code: neighbor announcments were not repeated unless there was a change in the ETX val. Neighbor announcements happened to often when there were changes in the ETX.
2008-08-15 19:00:38 +00:00
adamdunkels
210782d9c6
Set the channel as a packet attribute
2008-08-15 18:59:22 +00:00
adamdunkels
9a4e5dfabf
Rewrote the neighbor discovery code so that messages are suppressed if a lower rtmetric is received. This reduces the overall number of broadcast packets.
2008-07-09 09:33:58 +00:00
adamdunkels
9318117429
Fixed function prototype compiler warning
2008-07-08 10:59:31 +00:00
adamdunkels
ba5c18a468
Rewrote the trickle code to run directly over the broadcast primitive: the previous implementation did not work as expected, because packets were not supressed correctly by the previous underlying netflood primitive
2008-07-07 23:29:30 +00:00
adamdunkels
df33cb6e16
Only send ACK if it was possible to allocate a queuebuf to hold the data packet.
2008-07-07 23:27:57 +00:00
adamdunkels
4d35b905d3
Bugfix: check should cover min(hdrsize, datalen), not max
2008-07-07 23:27:05 +00:00
adamdunkels
cfcdac3122
Avoid crashing if Rime/Chameleon is not initialized when Rime code is run
2008-07-03 23:13:31 +00:00
adamdunkels
4687c2c948
Renamed Rime module mh to multihop
2008-07-03 22:36:02 +00:00
adamdunkels
d9b3097037
Renamed Rime nf module to netflood
2008-07-03 22:25:22 +00:00
adamdunkels
ec22f3c2fc
Renamed Rime nf module to netflood
2008-07-03 22:02:09 +00:00
adamdunkels
c2c3835110
Changed name of Rime module ruc to unicast
2008-07-03 21:52:25 +00:00
adamdunkels
eddf71f534
Changed name of suc module to stunicast
2008-07-03 21:35:46 +00:00
adamdunkels
8a1ed696d9
Slightly nicer formatting
2008-07-03 21:34:12 +00:00
adamdunkels
a6682c4bfd
originator address is const
2008-07-03 17:58:10 +00:00
adamdunkels
f274b26588
Added CC_CONST_FUNCTION as a work-around to the sdcc const function pointer bug
2008-07-03 07:38:52 +00:00
adamdunkels
040d65c1f6
Added missing #include sys/cc.h to make system compile
2008-07-03 07:37:51 +00:00
matsutsuka
d194d54e8e
CC_CONST_FUNCTION replaces some const keywords in order to workaround a sdcc bug, which cannot handle function pointers as const.
2008-07-02 15:02:33 +00:00
adamdunkels
66876625d4
Changed name of the simple-cc2420 module to cc2420: changed all function names and variable names from simple_cc2420_* to cc2420_*.
2008-07-02 09:05:40 +00:00
adamdunkels
1586d8f36f
Changed filename of the CC2420 driver from simple-cc2420 to cc2420.
2008-07-01 21:02:51 +00:00
adamdunkels
1d1ab90642
Added rimebuf attributes for RSSI, timestamp, and network ID (used for e.g. 802.15.4 PAN ID)
2008-06-30 19:57:10 +00:00
adamdunkels
651a374eca
Removed unused sibc module
2008-06-30 19:56:08 +00:00
adamdunkels
020a0c30aa
Rewrote the collect module to use packet attributes instead of explicit headers
2008-06-30 09:15:22 +00:00
adamdunkels
6bbb99438e
Cleaned up Rime makefile - removed sibc, changed name of sabc to stbroadcast
2008-06-30 08:29:32 +00:00
adamdunkels
e6079870fe
Changed name of the sabc module to stbroadcast
2008-06-30 08:28:53 +00:00
adamdunkels
4349504219
Bugfix: fixed the missing arguments to make Rime compile
2008-06-27 16:44:58 +00:00
nifi
839b6111d6
Changed send function to return false if it was not possible to send
2008-06-26 11:38:59 +00:00
adamdunkels
63c620303a
Changed the 'ibc' and 'uc' Rime modules into the more descriptive names 'broadcast' and 'unicast'
2008-06-26 11:19:22 +00:00
nifi
fe4f8f4339
clear attributes when clearing buffer
2008-04-03 09:07:28 +00:00
nifi
f187981cd6
Fixed type offset bug in rimebuf_addr() and removed unused type for attributes and addresses. Replaced memcpy with loop.
2008-04-02 14:49:21 +00:00
nifi
8d47324d8f
fixed typo
2008-04-01 13:22:59 +00:00
nifi
fabe4393f7
fixed alignment problem with rime/chameleon
2008-04-01 13:10:22 +00:00
adamdunkels
5901bf977a
Changed assignment to explicit copy to enable compilation with SDCC
2008-03-20 09:40:31 +00:00