Commit graph

577 commits

Author SHA1 Message Date
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
adamdunkels 8851a6359a Remove unguarded printf() 2008-11-09 12:16:05 +00:00
oliverschmidt 28889f2210 Commented out otherwise unguarded printf(). 2008-11-06 23:15:58 +00:00
nvt-se 0c4f7bed8f temporary fix to get sicslowpan.c working on the Sky platform:
conventional MAC implementations require a call to the MAC driver's
read function.
2008-11-06 20:45:06 +00:00
adamdunkels d73124cc5e Bugfix: there was a problem with TCP segments not being properly retransmitted for protosockets-based applications. Cleaning up the logic around acknowledgements and retransmissions fixed the bugs pertaining to retransmissions of lost packets. This bugfix affects both the telnet server and the web server (which now work as expected wrt packet loss). 2008-10-31 18:10:24 +00:00
adamdunkels f623b81d59 Temporarily out-commented the problematic code and added a comment that describes the problem 2008-10-17 14:40:16 +00:00
mdurvy 75f036f698 uncommented the remove of the router (necessary for compliance) 2008-10-16 09:07:43 +00:00
blakelev 99f6932cdf Removed one line to prevent the default router from being removed
prematurely.  This timer should not time out, but it does.
2008-10-15 23:29:38 +00:00
adamdunkels adc57729c3 struct uip_udp_conn should be declared even if UIP_UDP is zero (it does not add any extra code) 2008-10-15 08:56:44 +00:00
adamdunkels e931260603 Added more curly brackets to ensure ANSI C compliance when UIP_TCP is defined; 2008-10-15 08:52:30 +00:00
adamdunkels 6a3565f5b6 Added an #if around the whole code if IPv6 is defined 2008-10-15 08:08:32 +00:00
adamdunkels 91910f82dd added curly brackets to ensure ANSI C compliance when UIP_TCP is defined; some automatic whitespace removal 2008-10-15 07:59:34 +00:00
adamdunkels 647443cb9d Added payload field to ICMP v4 header that was inadvertedly removed during the uIPv6 commits; automatic whitespace removal at line ends 2008-10-15 07:55:00 +00:00
julienabeille 2238f2e7da Debugged autoconf for ethernet 2008-10-14 16:50:11 +00:00
julienabeille 4f9bc05f90 ping-ipv6 example compiles on native cygwin 2008-10-14 13:39:12 +00:00
adamdunkels fc1a8575d6 Removed unused include files (also automatically removed whitespace from line endings) 2008-10-14 12:26:18 +00:00
julienabeille 2e8264010b Main uIPv6 files addition - more 2008-10-14 09:42:33 +00:00
julienabeille f95cdc5abb Main uIPv6 files addition 2008-10-14 09:40:56 +00:00
adamdunkels 7b238a91af Don't turn on the radio on after sending a broadcast 2008-09-04 17:44:01 +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 c0c26262c4 No need to send strobes for broadcast packets: just send the actual packet instead 2008-07-07 23:25:12 +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 05454ce929 Documentation bugfix 2008-07-02 14:10:28 +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 7054083d88 Reverted mistakenly added #include for non-existant file 2008-06-30 20:00:53 +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 1093a8fe28 Added name to mac structure. Do not turn radio on when sending a broadcast packet. Changed default off time to half a second. 2008-06-30 08:10:02 +00:00
adamdunkels 247de015b5 added name to mac structure 2008-06-30 08:09:17 +00:00
adamdunkels c9528fb010 Added name, made default listen time shorter 2008-06-30 08:08:59 +00:00
adamdunkels a7dfa95551 Added a 'name' field in the mac structure, which allows boot-up code to print out the name of the currently selected MAC protocol 2008-06-30 08:08:27 +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
oliverschmidt a5fcfa2787 I seem to remember that we wanted to avoid ignoring gcc warnings that might trigger errors with other compilers ;-) 2008-05-16 21:31:57 +00:00
adamdunkels 532692e5a0 Removed reference to non-existant function rimebuf_attr_isset() 2008-05-16 15:04:10 +00:00
adamdunkels 8ea461b039 Changed on time to work with the current default tick time on the sky platform 2008-05-15 08:59:48 +00:00
adamdunkels dbab9fbdb5 A quick, initial implementation of the LPP power-saving MAC protocol (Musaloiu-E et al, IPSN 2008) 2008-05-15 08:56:29 +00:00
adamdunkels 1feb4fe3cb Removed call to tcpip_set_forwarding() - the UIP_CONF_IP_FORWARDING configuration option is used instead 2008-05-14 19:20:28 +00:00
adamdunkels 31ea41d8db Changed the name of UIP_CONF_TCP_FORWARD to UIP_CONF_IP_FORWARD since forwarding is done at the IP level 2008-05-14 19:19:28 +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
oliverschmidt 59145615b0 Changed packet forwarding from a runtime option to a compiletime option. This avoids pulling in uip-fw.o if forwarding isn't required (saves > 1400 bytes on 6502 targets).
*** This change breaks all platforms calling tcpip_set_forwarding() ! These calls were intentionally not removed as they need to be replaced by setting the new compiletime option UIP_CONF_TCP_FORWARD - which should be done by the platform owners. ***
2008-03-29 15:19:25 +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 aa7ba44fb1 Avoided compiler warning. 2008-02-28 23:59:05 +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 974870359a Changed all occurences of u8_t and u16_t to uint8_t and uint16_t 2008-02-24 22:10:30 +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 be1dd57cb3 Stopping watchdog before sending packets to allow for wait times longer than 1 second. Reduced default on time to 5 ms. Added option for turning off X-MAC but keeping the radio turned on. 2008-02-24 21:07:28 +00:00
adamdunkels 32a3fa5d4a Added parameter to the mac off() method that specifies whether or not the radio should be turned off when the MAC layer is turned off 2008-02-24 21:05:28 +00:00
adamdunkels 436d1f25eb Added a configuration option for using u32 in the uip_ip4addr_t structure: UIP_CONF_UIP_IP4ADDR_T_WITH_U32 2008-02-24 21:04:15 +00:00
adamdunkels 8c782de931 Ensure that no more data than can be held by the buffer is sent with uip_send() 2008-02-24 21:03:24 +00:00
adamdunkels 49bc31236e Improved debug output 2008-02-24 21:02:09 +00:00
oliverschmidt 8f81934bfd Since revision 1.11 the usage of the label 'ip_send_nolen' isn't solely depending on UIP_UDP anymore. 2008-02-15 17:12:46 +00:00
oliverschmidt 081d50b878 Reverted part of recent change. The 32-bit member causes 32-bit alignment on 32-bit machines - at least without specific compiler options. That 32-bit alignment causes padding i.e. the ARP structure breaking the existing code. 2008-02-09 16:22:22 +00:00
nifi b06e6c60a9 Name fix on uip_all_zeroes_addr 2008-02-08 09:12:57 +00:00