deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
5618 commits 6 branches 13 tags 80 MiB
Commit graph

406 commits

Author SHA1 Message Date
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
adamdunkels
39c85118d8 Ensure that header_module is != NULL before calling it. Define and print headers only if DEBUG is set. 2008-03-03 20:20:33 +00:00
oliverschmidt
edbae75705 Stick to CC_INLINE. 2008-02-28 21:25:34 +00:00
fros4943
cefaa38581 -debugging output 2008-02-27 10:39:17 +00:00
adamdunkels
a0c833da11 Mistakenly included development code in the Makefile target 2008-02-25 13:22:34 +00:00
adamdunkels
412facb831 This is an initial commit of an implementation of the Chameleon 
architecture for the Rime stack for Contiki. The Chameleon
architecture separates the header processing from the Rime protocol
logic. Instead of having each protocol create its own part of the
packet header, protocols use packet attributes. Before sending a
packet, a special Chameleon header processing module creates a packet
header from the packet attributes. The same Chameleon module parses
incoming packets and creates packet attributes from the header.

The details are in our SenSys 2007 paper:

Adam Dunkels, Fredrik Osterlind, Zhitao He. An Adaptive Communication
Architecture for Wireless Sensor Networks. In Proceedings of the Fifth
ACM Conference on Networked Embedded Sensor Systems (SenSys 2007),
Sydney, Australia, November 2007.

http://www.sics.se/~adam/dunkels07adaptive.pdf

This is a rewrite of the code that was developed for the paper.
 2008-02-25 02:14:34 +00:00
adamdunkels
d99ca27820 Changed all occurences of u8_t and u16_t to uint8_t and uint16_t 2008-02-24 22:05:27 +00:00
adamdunkels
3c1b0f4e65 Debug output slightly improved 2008-02-24 21:09:08 +00:00
adamdunkels
16c715aade Updated collect_open() definiton to match prototype declaration 2008-02-24 21:08:37 +00:00
adamdunkels
fc603fdcc6 constness 2008-02-05 20:18:57 +00:00
adamdunkels
3d6c1c966b Bugfix: forwarding functions now have access to its packet headers. Added last hop to the arguments to the reception function 2008-02-05 20:17:43 +00:00
adamdunkels
33bcc24019 Increased timeouts, updated to match new mh API 2008-02-05 20:16:48 +00:00
adamdunkels
465f75736d Minor source code reformatting 2008-02-03 21:12:44 +00:00
adamdunkels
53f0b7feb8 Added line drawing code when compiled for the netsim target 2008-02-03 20:52:41 +00:00
adamdunkels
2886e03f57 Rewrote the neighbor code to use memb and a list instead of a static array 2008-02-03 20:44:11 +00:00
adamdunkels
c576b7b01c Optimized transmission when interval == 0 2008-01-25 01:06:25 +00:00
adamdunkels
49ac5f9026 Show rt metric in netsim as number of expected transmissions 2008-01-24 21:11:40 +00:00
adamdunkels
cdfe030980 Send immediately if interval == 0. Added debug information 2008-01-24 21:10:50 +00:00
adamdunkels
29cc2b1266 Updated debug printouts 2008-01-23 16:10:10 +00:00
adamdunkels
c8dccbbd40 Added a function for converting a timesynchronized time to a local (rtimer) time 2008-01-23 15:07:05 +00:00
adamdunkels
5c169ac291 Better debug output 2008-01-21 12:19:27 +00:00
adamdunkels
57b54894f8 Removed mistakenly added development files 2008-01-14 16:05:34 +00:00
adamdunkels
34bd11905c Rewrote the timesynch code to use the Rime sniffer interface instead of the kludge of running timesynch as a MAC layer 2008-01-14 14:50:01 +00:00
adamdunkels
02ee418313 Moving timesynch.[ch] from sys/ to core/net/rime as they have more to do with Rime than with the kernel 2008-01-14 14:22:16 +00:00
adamdunkels
042180c13f Rewrote the sniffer code to use a list, which makes it possible to add any number of sniffers. Sniffers now can be both for incoming and outoing packets. 2008-01-14 09:42:00 +00:00
adamdunkels
7fcb1f3b2a Updated debug output 2008-01-14 09:36:35 +00:00
adamdunkels
b26754fd95 Removed unused code 2008-01-14 09:34:33 +00:00
adamdunkels
7b94bfb621 Rewrote the code to use polite broadcasts istead of regular broadcasts. This reduces the amount of broadcast traffic, particularly for dense networks. 2008-01-14 09:34:00 +00:00
adamdunkels
f6b4022511 Setting a lower value now causes a discovery packet go out quicker 2008-01-08 08:27:25 +00:00
adamdunkels
bac26c90c8 Made a primary transmission go out immediately instead of within a random interval 2008-01-08 08:26:48 +00:00
adamdunkels
a20202231d Minor type change 2008-01-08 08:00:13 +00:00
adamdunkels
d2be099c0e Bugfix: queue buffers were not freed when a new packet was sent, leading to memory leakage. Added debug output. 2008-01-08 07:59:51 +00:00
adamdunkels
c6a43333d2 Call the timeout function only if it is non-NULL 2008-01-08 07:58:49 +00:00
adamdunkels
40d6216ec9 Added API for reading the routing table 2008-01-08 07:58:23 +00:00