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

661 commits

Author SHA1 Message Date
adamdunkels 9ec57d61ad Added MAC layer framing support to X-MAC so that packets now are standard 802.15.4 frames 2009-10-19 20:53:56 +00:00
adamdunkels 4de1816e36 Added a new module called "framer" that creates MAC level frames to 
the packetbuf from packet attributes. Two framer modules are included,
one that creates 802.15.4 frame headers, and one that creates a
minimal "nullmac"-style header that only contains the link-local
addresses.
 2009-10-19 18:30:03 +00:00
nifi ae226c5917 * Set sender and receiver packet attributes on incoming packets 
* Added link layer destination check
 2009-10-19 11:25:54 +00:00
adamdunkels 10c873018d Ensure that DEFAULT_PERIOD is != 0, to avoid a modulo with 0 2009-10-19 06:39:29 +00:00
adamdunkels f25856a387 Hack to be able to receive UDPv4 multicast packets 2009-10-18 22:03:44 +00:00
adamdunkels fb037e0afb Added function for sending an UDP packet to a specified IP address and port number over an existing UDP connection 2009-10-18 22:02:01 +00:00
adamdunkels 9d26bd663e A new optimization to X-MAC: senders now keep track of when neighbors 
last were known to be awake. When sending a packet, a sender does not
start to send strobes until the neighbor is expected to be awake. This
reduces power consumption for senders and decreases the contention in
the network as there are less packets in the air. Additionally, the
ACK optimization was improved so that data/ack exchanges now are
more efficient.
 2009-10-18 13:19:25 +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
nvt-se f143227205 made the route discovery packet timeout configurable. 2009-09-29 16:02:28 +00:00
nifi 0ad51b8dcc Moved the link layer destination check to sicslowmac 2009-09-18 16:37:17 +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
adamdunkels 2181e90f69 Added the possibility to switch lpp off. Fixed sdcc compiler issue 2009-09-09 21:09:23 +00:00
adamdunkels 1cafbc6002 sdcc compiler issue fix: compound assignments are not supported, so we use memcpy() instead 2009-09-09 21:08:46 +00:00
nvt-se 4d21a3e203 Don't assume that radio->send turns on the radio automatically. 2009-09-04 10:59:30 +00:00
oliverschmidt e60db62b10 Added prototype missing for quite some time now - do we need -Werror ? 2009-08-20 20:27:17 +00:00
adamdunkels 522f991f14 Set sender and receiver packet attributes on incoming packets: patch by Gidon Ernst 2009-08-20 18:59:17 +00:00
dak664 c1b7375a5a *** empty log message *** 2009-07-23 16:13:48 +00:00
dak664 2166261890 Separate input and output debug PRINTFs 2009-07-10 13:33:45 +00:00
nvt-se 38fff1b527 mac_driver structure has been changed to include the init function. 2009-06-24 16:31:49 +00:00
nifi 912aba7280 added init function in MAC driver for easier configuration 2009-06-22 11:14:11 +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
nifi f39d2bd4c6 Fixed link panid for broadcasts to be standard compliant. Ignore packets addressed to other non-broadcast panids. 2009-05-26 12:08:29 +00:00
nvt-se e2bbdbca9b decrement TTL right after forwarding check. 2009-05-19 11:54:50 +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 fe5a1f1068 Added an optimization option that avoids multiple simultaneous broadcasts from neighbors: when a broadcast is to be sent, a sender does not send until it knows that no other nodes are broadcasting. 2009-05-10 21:09:05 +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 1d921ddf42 Explicit typecast to avoid compiler problems 2009-05-06 15:07:09 +00:00
adamdunkels 0adceb63b4 Code cleanup; made encounter optimization explicit; added optimization for adaptive off-time, but it currently seems to work bad with broadcasts 2009-05-06 15:06:38 +00:00
adamdunkels 9fff85757d Code cleanup; made strobe transmission time longer again (seems to work better in cooja?) 2009-05-06 15:05: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 1752b53f74 Refresh routes when a packet is received. Set a conservatively low route timeout (10 seconds). 2009-05-04 11:24:04 +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 cc44e89415 Reduced default strobe time, which seems to work well. Avoid running the interrupt if the power-save feature is turned off (fixes problems with serial data reception on a gateway mote) 2009-04-29 11:42:13 +00:00
adamdunkels c02a82ac41 Tag outgoing TCP packets with the ERELIABLE attribute so that an underlying power-saving MAC protocol can treat them differently, because it knows that an ACK might be arriving soon 2009-04-29 11:40:33 +00:00
adamdunkels c9df0ab123 Bugfix in debug message printout 2009-04-28 14:01:46 +00:00
adamdunkels 81ef83b856 Added option to wait randomly before sending a packet. A few code cleanups. Avoid switching radio off when sending a packet with end-to-end acks, because an ACK may arrive shortly after the transmission. 2009-04-28 14:00:53 +00:00
adamdunkels fdd05f5c71 Bugfix: psock send should use PT_WAIT_UNTIL() not PT_YIELD_UNTIL(). This improves TCP throughput by 100x under minimal-net 2009-04-28 13:52:04 +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
nvt-se 9765df97e5 support udp_broadcast_new also when using IPv6. Suggested by Wolf-Bastian Pttner. 2009-04-13 19:54:07 +00:00
adamdunkels ef4f5cc0e5 Made TCP MSS configurable 2009-04-10 00:37:48 +00:00
nifi 84b38de494 removed bitfields for compatibility with cc65 2009-04-09 21:54:09 +00:00
adamdunkels f5f52ffd1f Fixes by Ward Van Heddeghem (VUB) 2009-04-07 13:06:03 +00:00
nvt-se 03cd533712 made LISTEN_TIME and OFF_TIME configurable. 2009-04-07 11:29:08 +00:00
adamdunkels 5e456aea7d Added optimization for sending ACKs immediately. Turned optimizations on. Increased listening time to 1/64 s again due to problems with broadcasts with the 1/128 s setting 2009-04-06 22:50:35 +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 000f740adc typo 2009-04-06 15:54:07 +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
nifi 9f2ff48fda added 802.15.4 frame packeter 2009-04-06 13:19:03 +00:00
nvt-se 3b2ad9cfc4 added packet forwarding and replaceable routing modules. 2009-04-06 13:18:50 +00:00
nvt-se 461ba4082c in case UIP_CONF_ROUTING is set, check if we have a registered routing 
module and use it for looking up the next hop of an address.
 2009-04-06 13:18:12 +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
nvt-se 005578a722 added multihop routing support through replaceable modules. first implementation 
uses rime's route discovery by translating between ipv6 and rime addresses.
 2009-04-06 13:11:25 +00:00
nifi 4bc60d76d3 fixed alignment problem on MSP430 when using compression 2009-04-06 13:11:20 +00:00
adamdunkels ed1e945e66 Added guard code so that OFF_TIME is never zero 2009-04-03 20:08:05 +00:00
adamdunkels 8dbd2b2337 Significant power consumption optimization: LPP now keeps track of encounters with neighbors and uses this information to keep the radio switched off longer. 2009-04-03 19:59:22 +00:00
adamdunkels 1d86b01bfb Made optimizations explicit (and configurable). Added missing initialization of dutycycle protothread. Reduced default listen time and off time. 2009-04-03 11:45:06 +00:00
adamdunkels 04101aae36 Fixed alignment problem on the MSP430, where the LPP header may be misaligned 2009-03-31 17:39:54 +00:00
nvt-se e2cc8b2a3e send all queued packet once we have the chance. 2009-03-31 14:44:13 +00:00
nvt-se 1d47e2a8da send immediate probes only if the packet is directed to us. 
sleep for OFF_TIME if the queue is empty.

restrict double packet lifetime timeouts to unicast packets.

stop ctimer in remove_queued_packet in case the function is not called
via the ctimer callback. it could overwrite a valid packet otherwise.
 2009-03-31 14:11:25 +00:00
nvt-se dd082f7fcf improvements to lpp based on code from Adam and discussions with Thiemo. 
* queue multiple packets
* send a strobe back immediately after receiving a data packet
* double the packet lifetime to allow for a missed probe
 2009-03-31 12:47:00 +00:00
nvt-se d8caaca289 listen time and off time parameters configurable from outside because cc1020 needs longer listen time. 2009-03-26 12:50:57 +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 ec1677ca6c Added a function (quick hack) that sets the radio transmission power of outgoing announcement packets in xmac 2009-03-23 21:06:26 +00:00
adamdunkels 1cbc0f4ea9 Send announcement packets only if there are any announcements to send 2009-03-23 21:00:25 +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
nvt-se 4b6c110706 fixed documentation typos. 2009-03-17 20:28:44 +00:00
nifi f0e56df2eb fixed compiler warning when timesynch is disabled 2009-03-17 09:57:01 +00:00
nvt-se 13b364bcc1 fixed documentation typos. 2009-03-15 20:29:04 +00:00
nvt-se 41ca9516a7 fixed documentation typos. 2009-03-15 20:21:16 +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
julienabeille 2a173b465a more printing in debug mode 2009-03-10 08:00:59 +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
adamdunkels dc7491f810 Bugfix and optimization: X-MAC did not properly switch the radio off after sending a packet, resulting in increased power consumption. For packets that require an ACK, we can let the radio be on in anticipation of the ACK (controlled with an WITH_ACK_OPTIMIZATION option) 2009-03-05 19:37:52 +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 d813d343c5 Cleaned up old left-over code 2009-03-01 20:38:57 +00:00
adamdunkels 7010eb84b8 Added support for communication power accounting. Energy is attributed to idle listening when the radio is switched off. Enegrgy is attributed to an incoming packet when it is received. Energy is attributed to an outgoing packet when it is transmitted. 2009-03-01 20:37:16 +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
oliverschmidt bc3d9d2e3c Minor rearrangement. 2009-02-28 11:57:46 +00:00
julienabeille f95c5df7d9 The global prefixes processed must be one less than the total amount of prefixes, as the link local one occupies one slot 2009-02-25 08:35:52 +00:00
adamdunkels 2aedc8490d Compile only if timesynch is enabled 2009-02-20 21:23:22 +00:00
adamdunkels e6907a1d8b Include random.h 2009-02-20 21:22:39 +00:00
adamdunkels 4ec5167276 Rewrote the tcpip_output() and tcpip_set_outputfunc() so that the latter is a proper function (which simplifies debugging) and so that tcpip_output() checks if the output callback function is NULL before calling it 2009-02-20 21:21:56 +00:00
julienabeille 10deaa6fc6 Removed CLOCK_SECOND from stimers in uIPv6, stimers are already in seconds 2009-02-20 07:59:35 +00:00
julienabeille 710e5c621c changed timer to stimer for neighbor, prefix, default router, address list 2009-02-19 16:42:41 +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
c_oflynn 8516626703 Fixed documentation error (thanks to David Kopf) 2009-02-17 01:28:28 +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 aaa8c9d2c9 Construct the X-MAC header on the stack instead of directly in the packet header, because the packet header may be misaligned. A bit of cleanup in the code too. 2009-02-15 22:05:06 +00:00
adamdunkels e4b1ff461e Added MAC-layer announcement beacons to X-MAC. Configuratble through XMAC_CONF_ANNOUNCEMENTS 2009-02-14 20:35:03 +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 3efb83c338 Added announcement includes 2009-02-09 21:09:42 +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 dd9ffd87c4 Added missing #include announcement.h 2009-02-08 20:14:18 +00:00
adamdunkels 085df6b630 Improved version of LPP with support for broadcasts as well as announcement data in the probes 2009-02-08 19:30:18 +00:00
adamdunkels 91d280c4c9 Reverted to the old behaviour on broadcasts: send strobes for both unicast and broadcast packets. 2009-02-07 18:45:50 +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
c_oflynn 5ec6412fbc *Support for Atmel 'Router Under Mac' (RUM) in Jackdaw 2008-12-10 21:26:05 +00:00
c_oflynn 17790ce46a Bug fix by David Kopf - sicslowpan timeout was always set at 20 seconds, this greatly improves performance!! 2008-12-02 22:04:16 +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
fros4943 e42d572f81 updated for latest mac driver structure 2008-11-12 12:42:41 +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
oliverschmidt 75ffd0640c Inform user about (most likely unintentional) call of dummy_tcpip_output_function. 2008-11-10 21:00:53 +00:00
adamdunkels 3b283a5ff3 Added dummy function so that tcpip_output() always is defined, even if tcpip_set_outputfunc() never has been called. This fixes a bug with programs attempting to use the network when compiled for the native platform. 2008-11-09 12:29:24 +00:00
adamdunkels 5243d58ac5 Added logic for announcing that a network has a gateway to the outside world (with the function uip_over_mesh_make_announced_gateway()). The announced gateway sends a trickle message to the network, containing the address of the gateway. Other nodes will then know that packets destined to the outside world should go through the gateway node. 2008-11-09 12:20:56 +00:00