Commit graph

490 commits

Author SHA1 Message Date
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
adamdunkels 2187212703 Name fix on uip_all_zeroes_addr 2008-02-07 01:35:00 +00:00
adamdunkels d407fe2e9f Set TTL on outbound ICMP echo reply packets to make Windows tracert work 2008-02-07 01:34:25 +00:00
adamdunkels 245558fd56 Make windows tracert work: needs ICMP time exceeded sent for ICMP echo packets 2008-02-07 01:33:47 +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 f1bec7b955 Added the ability to send packets to an external network 2008-02-03 20:56:07 +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 6e89e545b3 Added optional transmission of ICMP destimation unreachable in response to incoming UDP packets with an destination port that is not open. This is needed for correct operation of traceroute 2008-01-24 23:08:58 +00:00
adamdunkels c9508567a1 Bugfix: IP addresses in ICMP time exceeded messages were not transmitted correctly 2008-01-24 23:07:37 +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 bf8b5c093d Made timetable code optional 2008-01-24 06:17:51 +00:00
adamdunkels e7fb51b14c Added generic return valued 2008-01-24 06:17:33 +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 8a9b931a4b Rewrote most of the X-MAC code to make it easier to follow, debug and modify. Also added an optional, experimental time synchronized addition that makes X-MACs on different nodes explicitly de-synchronized 2008-01-23 15:00:54 +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 94f8978443 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:35:53 +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 bd125aaac6 Changed the code so that the rtimer is only set from the rtimer (interrupt) code, and not from the non-rtimer code. Removed unused code that was supposed to turn the radio off when a packet for another node was heard (but which didn't really work anyway). Changed default on time to 1/100 seconds, and off time to 1/2 seconds 2008-01-14 09:26:42 +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
adamdunkels 601560b1eb Added hopcount to callbacks 2008-01-08 07:55:56 +00:00
adamdunkels 0c748d7dd2 Debug formatting fixes 2008-01-08 07:55:15 +00:00
adamdunkels f737127cca Minor type change 2008-01-08 07:55:00 +00:00
adamdunkels 16142f12c7 Removed unused code 2008-01-08 07:54:40 +00:00
adamdunkels 88a010acdc Added a simple sniffer callback, which currently is a hack - a better solution would be a list of sniffers for both outgoing and incoming packets, but this will do for now. 2008-01-08 07:53:02 +00:00
adamdunkels 5b454bbd5f Added a simple sniffer callback, which currently is a hack - a better solution would be a list of sniffers for both outgoing and incoming packets, but this will do for now. Added trickle, neighbor & route includes. 2008-01-08 07:52:31 +00:00
adamdunkels 25a5434fb5 Sending with interval 0 made explicit 2008-01-07 14:53:04 +00:00
adamdunkels d33871facc Bugfix: hops should be at least one for all packets that are sent over the radio 2008-01-07 14:52:23 +00:00
oliverschmidt 00d75c8d16 Made use of uip_ipaddr_to_quad(). 2008-01-04 23:28:33 +00:00
oliverschmidt af6d9a59be Adjusted value (without distinguishing between Ethernet, SLIP, ...). 2007-12-23 20:24:46 +00:00
oliverschmidt a9ebc469b8 Avoid usage of POSIX function names even for static functions as some indirectly included system header might declare them. 2007-12-23 14:56:54 +00:00
oliverschmidt 8a4e2ec268 Fixed typo. 2007-12-22 12:02:43 +00:00
adamdunkels 3033b86753 Made the number of routing table entries configurable 2007-12-17 09:20:16 +00:00
adamdunkels 758411d06d Cleaned up #includes to avoid cyclic dependencies - the Rime includes no longer depend on rime.h 2007-12-17 09:14:08 +00:00
adamdunkels 8287215c82 Removed obsolete, unused files 2007-12-17 09:12:16 +00:00
adamdunkels 07e2ca9287 Documentation updates 2007-12-16 14:33:32 +00:00
adamdunkels 5c5775e93b Ensure that receiver_callback is set before calling it 2007-12-16 14:31:43 +00:00
fros4943 2c67936d6d including uaodv-rt 2007-12-13 10:04:59 +00:00
adamdunkels 43d394f758 Maximum rtmetric now defined by the collect module - a bit of a hack since this probably should be configured elsewhere (and be referenced by both the collect and the neighbor module) but it will do for now 2007-12-09 15:44:21 +00:00
adamdunkels 5a89c19b5e Changed to store neighbors' rtmetrics as 16 bit valued 2007-12-09 15:43:51 +00:00
adamdunkels 01da62aa25 Changed local rtmetric name from 'local_rtmetric' to 'rtmetric' and updated the neighbor discovery module from nbh to neighbor-discovery 2007-12-09 15:43:09 +00:00
adamdunkels 4e1d2906b7 Changed name on the neighbor discovery module from (cryptic) 'nbh' to 'neighbor-discovery' 2007-12-09 15:40:43 +00:00
oliverschmidt 29b2d1d236 Allow to link with UIP_CONF_ACTIVE_OPEN set to 0. 2007-12-08 23:06:02 +00:00
oliverschmidt 3b95e284fc Allow to actually configure active open support via UIP_CONF_ACTIVE_OPEN.
Is there any reason I don't understand why this wasn't allowed? At least it seems to work...
2007-12-08 23:04:34 +00:00
adamdunkels 761ad7dd57 Updated debug output 2007-12-05 13:40:34 +00:00
adamdunkels fff49f6671 Correct route lookup 2007-12-05 13:40:26 +00:00
adamdunkels 36b7c7e782 Added missing forwarding function 2007-12-05 13:26:13 +00:00
adamdunkels bfd5db667a Don't call the forward function if it is not defined 2007-12-05 13:25:07 +00:00
adamdunkels 18fd561041 Avoid switching the radio on and off when the MAC layer is turned off. Cleanups. 2007-12-05 13:23:17 +00:00
adamdunkels 442516356a Expose the Rime MAC driver so that applications can use it - a bit of a hack, but it works for now 2007-12-05 13:21:58 +00:00
adamdunkels 6720b41707 Removed debug output 2007-11-28 20:03:50 +00:00
adamdunkels 1fd6e1bef9 Increased default route lifetime to 60 seconds. Routes are now refreshed every time they are looked up. 2007-11-28 20:00:57 +00:00
adamdunkels 996a8af0dd Fixed include of ruc instead of abc 2007-11-28 20:00:07 +00:00
adamdunkels 6e739853f7 Updated the multihop forwarding interface to match the intended operation of the module: to let the user produce the route, and the mh module only does the forwarding 2007-11-28 19:55:27 +00:00
adamdunkels d9bda3bc80 Added mh.h and rmh.h to the default includes 2007-11-28 19:54:24 +00:00
adamdunkels dca1e0e446 Changed module name to 'collect' from 'tree' to better reflect the purpose of the module, rather than the particular data structure used to implement it 2007-11-28 16:04:41 +00:00
adamdunkels b003f32e27 Added #ifdef around label (yes, ugly) to avoid compiler warning with UIP_UDP == 0 2007-11-28 12:53:07 +00:00
adamdunkels 6e228f7a79 uaodv.c now compiles without #if UIP_UDP 2007-11-28 12:52:34 +00:00
adamdunkels 3e35a97776 Exposed a few UDP declarations even when UIP_UDP == 0 to make uaodv.c compile 2007-11-28 12:52:12 +00:00
matsutsuka 1dd0e32a1e #if UIP_UDP
option is added, because this file cannot be compiled and is unnecessary when UIP_UDP==0.
2007-11-28 10:15:44 +00:00
adamdunkels b07b46dd79 Removed unused return value from ruc recv callback 2007-11-27 23:32:34 +00:00
adamdunkels f6cf045413 Always add neighbors to the list regardless if their rtmetric is higher than ours or not. If our rtmetric rises, we may need ot have those neighbors in our list. 2007-11-26 23:31:44 +00:00
adamdunkels 98854f80e0 Made Rime address size configurable through contiki-conf.h 2007-11-26 23:30:35 +00:00
adamdunkels 75be20bea6 Added function for accessing a specific neighbor 2007-11-26 23:30:13 +00:00
adamdunkels 58d6310979 Added #ifdef around MAX definition to avoid compiler warnings 2007-11-26 23:22:41 +00:00
adamdunkels 52a8e8d16b Fixed to match the Contiki code style 2007-11-26 15:31:32 +00:00
nvt-se 977fdc7f03 Format requires unsigned long. 2007-11-18 11:21:29 +00:00
oliverschmidt aedb4f56da Moved logically empty files to backyard. 2007-11-18 01:18:09 +00:00
adamdunkels 1e1e44a3f8 Fixed compiler warnings to make code compile with gcc's -pedantic switch 2007-11-17 18:01:00 +00:00
adamdunkels d9eebf7e17 Fixed compiler warnings 2007-11-17 10:46:25 +00:00
adamdunkels 7fd1eca954 Added debug output 2007-11-17 10:34:17 +00:00