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

1525 commits

Author SHA1 Message Date
nifi 01b1359b1f removed unused (and slightly problematic) code 2010-06-15 14:19:22 +00:00
nifi 46f9f7e6c0 corrected include path 2010-06-15 13:31:22 +00:00
adamdunkels 3fa8ffda1a Moved the modules packetbuf, queuebuf, and packetqueue from net/rime to net/, since they are not Rime-specific 2010-06-14 19:19:16 +00:00
adamdunkels 951fd78f6c ctimer moved from net/rime to sys/ 2010-06-14 18:58:45 +00:00
nvt-se fad2b1def9 Clarified the function naming for neighbor information callbacks - names now indicate where the information is from. 2010-06-14 18:35:04 +00:00
nifi adc38568ad Minor optimization: replaced init loops with memset to reduce code size 2010-06-14 13:51:13 +00:00
nifi 7499939c94 removed debug output 2010-06-14 13:07:09 +00:00
nvt-se e000b1abf3 A major update to ContikiRPL resulting in a reduced code footprint by 
300 bytes, as well as cleaner protocol logic.

* Made parent management uniform.

* Simplified the DIO processing.

* Improved the Objective Function API and its documentation.

* Removed redundant code at various places.

* Improved identifier naming.

* Switched visualization from candidate parents to preferred parents only.

* Made DAO ACK transmissions configurable.

* Improved initial ETX guess by using a cached local confidence value.

* Added a periodical rank recalculation function to reduce
  the maximum stack depth.

* Increased the Trickle redundancy constant to ensure faster
  topological updates.
 2010-06-14 12:44:37 +00:00
adamdunkels a890cd3d49 Moved ctimer.[ch] from their old and illogical location in core/net/rime to a more appropriate place in core/sys 2010-06-14 11:33:58 +00:00
adamdunkels 97708d6235 Documentation group set accordingly 2010-06-14 07:35:53 +00:00
adamdunkels 8f8393aadc Moved ctimer.[ch] from their old and illogical location in core/net/rime to a more appropriate place in core/sys 2010-06-14 07:34:36 +00:00
adamdunkels baa62e9314 Addresses are not const 2010-06-14 06:55:26 +00:00
adamdunkels 2647f879c2 Bugfix: select the best parent if current parent is NULL 2010-06-14 06:54:47 +00:00
adamdunkels 8d1680fed5 Filter duplicate packets 2010-06-14 06:52:41 +00:00
adamdunkels a6bd51f361 If a packet is lost due to NOACK or TXERR, we count the number of transmissions and we add an additional loss penalty (currently one) 2010-06-14 06:51:58 +00:00
joxe 1095997b66 made DIOs and OCP 09 compliant 2010-06-12 10:55:46 +00:00
nvt-se 75b624eb71 Refactored the code, removed void pointer arithmetic, and fixed invalid list removal after freeing of memb object. 2010-06-11 12:32:48 +00:00
nvt-se 8a43743a42 Updated declaration for rpl_alloc_dag. 2010-06-08 21:41:02 +00:00
nvt-se b1521e4950 Check correctly if a DAG already exists in the same instance. 2010-06-08 21:37:22 +00:00
adamdunkels 296c828ac2 Removed instant reaction to packet loss. Previously, a neighbor was dropped if no MAC layer ack was received. 2010-06-08 19:25:40 +00:00
nvt-se 4a08f545c9 Make the distinction between incoming and outgoing DTSN clear. 2010-06-08 16:21:54 +00:00
nvt-se b8848f29eb Replaced invalid attempt to switch preferred parent when its DS6 neighbor entry got purged. 2010-06-08 15:40:50 +00:00
nvt-se 4e61d69a49 Removed redundant code, moved the control of acceptable rank increases into a separate function. 2010-06-07 14:01:22 +00:00
nvt-se c6c6760838 Validate incoming DTSN value 2010-06-07 13:40:05 +00:00
nvt-se e5fd1f47fa Copy the DTSN from the DIO when joining a DAG. 2010-06-07 11:36:02 +00:00
nvt-se f0afbb69ab Fixed typo 2010-06-06 21:48:15 +00:00
nvt-se 3748f782c5 Added basic functionality for DAO ACKs and DTSN. Randomized DAO timer. 2010-06-06 21:42:50 +00:00
joxe f4508cc1e2 minor fixes + improved debug-printout 2010-06-06 12:45:55 +00:00
joxe e75c77937e fixed bug that caused problems when uncompressing unspecified address 2010-06-06 12:44:12 +00:00
joxe 17209e8fa4 moved code for autoconfiguring global address into join_dag 2010-06-03 18:37:47 +00:00
nvt-se c201058325 Purge all routes related to a DAG being freed. Do not send no-DAOs when doing a global repair. 2010-06-03 15:20:56 +00:00
joxe ba2bf31c20 changed DAOs to be formatted according to the rpl-08 specification 2010-06-03 14:49:15 +00:00
nvt-se f52e97111f Made the remove_parents function more powerful by adding a flag that indicates whether no-DAOs should be sent or not. Fixed some style issues and a possible NULL pointer dereference. 2010-06-03 12:55:09 +00:00
nvt-se 352fb4e74d Restrict the rank to INFINITE_RANK 2010-06-03 12:12:20 +00:00
joxe 62abed8347 fixed a minor bug causing too low rank during global repair 2010-06-02 16:54:59 +00:00
joxe 941443878b fixed rank calculation bug in of-etx 2010-06-02 16:23:08 +00:00
joxe f069320ca9 removed sequence_number and replaced with version - fixing global repair functionality 2010-06-02 11:59:51 +00:00
joxe fec0e8df69 changed RPL to be more 08 compliant - DIO and DIO options are formatted as in RPL-08 2010-06-01 22:30:02 +00:00
joxe 7887559d56 fixed bug in ttl decompression 2010-06-01 12:37:54 +00:00
joxe 518f9c1a00 refactoring and cleanup 2010-05-31 20:42:27 +00:00
nifi b54c6e673b Updated API for uiplib and resolv to use uip_ipaddr_t instead of uint16_t for compability with IPv6 2010-05-31 15:22:08 +00:00
nvt-se c13bb8666b Better validation of incoming DIOs. Added a reset function to the OF API. 2010-05-31 14:22:00 +00:00
oliverschmidt 126ea40994 Removed UIP_CONF_PLAIN_BUFFER again now that the pointer indirection to uip_buf was removed again. 2010-05-30 09:46:12 +00:00
nvt-se f135105567 Added support for multiple objective functions. 
Extended the objective function API with a callback function that receives link-layer neighbor information.

Throttled DAO transmissions to one per DEFAULT_DAO_LATENCY period.

Added support for an ETX objective function (hysteresis control still lacking though).

Fixed a leak of routes installed by DAOs.

Control that dst_adv_supported is set before sending DAOs.

Improved debugging output.
 2010-05-29 22:23:21 +00:00
nifi f6e0b46f38 * Made Chameleon header processing module configurable (CHAMELEON_CONF_MODULE) 
* Removed the unused init function from header processing modules
* Added option CHAMELEON_CONF_WITH_MAC_LINK_ADDRESSES to specify that
  MAC link addresses should be used instead of Chameleon's own encoding
  of sender and receiver. This avoids encoding the link addresses twice
  when the MAC RDC has its own addresses.
 2010-05-28 06:18:39 +00:00
nifi b7b2c8fcde Added macro to identify address attributes for use in header processing modules 2010-05-27 20:28:29 +00:00
nifi ac9b862cd0 Added configurable support for 802.15.4 autoack 2010-05-26 14:12:33 +00:00
nvt-se 320fa820ca Renamed neighbors to parents. Removed redundant code. Corrected the logic for max rank increase. 2010-05-25 21:58:54 +00:00
joxe 34b8313fb6 added experimental support for disseminating autoconf prefix via DIO suboption 2010-05-25 19:19:43 +00:00
nvt-se 6c4bf93141 Handle MAC_TX_ERR notifications. 2010-05-25 15:29:51 +00:00
nvt-se c5d1c3ea27 Improvements to local repair and DAO handling. 2010-05-24 16:38:56 +00:00
nvt-se f882901bf6 Remove unreachable neighbors immediately, rather than using an ETX threshold that leads to slow topological repairs. ETX information should later be stored even for removed neighbors if there is room. 2010-05-24 16:38:17 +00:00
joxe 16c212798f cleanup of the code, removing dead core + adding local vars to save some space. 2010-05-24 14:28:56 +00:00
joxe 2d447502d4 changed uip_buf to a union for 32-bit alignment 2010-05-24 10:07:34 +00:00
joxe 9db7f06368 fixed compiler warnings 2010-05-24 09:57:20 +00:00
joxe 56a3a71108 added include of string.h since memcpy are used 2010-05-19 16:16:57 +00:00
joxe 5c30aed814 removed nd llao option struct since not naturally aligned - replaced struct fields access with array based access 2010-05-19 12:21:45 +00:00
nvt-se 4411807b29 Fixed bug in DAO input. Made printfs more portable. 2010-05-18 16:43:56 +00:00
nvt-se 8c3ed291bb Preserve the file offset if a seek operation fails. 2010-05-13 18:24:55 +00:00
nifi ed4debe285 Changed neighbor notification to be default on when using RPL 2010-05-11 10:02:29 +00:00
nifi 7aeb206840 Added isinfinite to uip_ds6_defrt_t to handle infinite life time 2010-05-10 13:46:35 +00:00
joxe 058ef029e4 replaced hardcoded value with constant for route lifetime 2010-05-10 11:16:35 +00:00
joxe c0c7cea3ce fixed bug that caused select_src to set a non legal address - now sets unspecified if no address found 2010-05-10 11:10:27 +00:00
joxe 6f66d36d67 avoid sending DAO when address is tentative 2010-05-09 19:12:47 +00:00
joxe adb00ed932 factored out function for getting link local address in ds6 and made use of it in rpl for checking state of lladdress as DIOs should not be sent when tentative 2010-05-09 17:52:37 +00:00
oliverschmidt e5665fb968 The recent change turning uip_buf from an array to a pointer seems a quite heavyweight way to have the uip_buf alligned to a 32-bit boundary. Contiki is - still - supposed to be portable across a wide range of toolchains - therefore it i.e. intentionally doesn't use C99 features. From that perspective it seems questionable if all toolchains are able to optimize away the overhead imposed by an "unnecessary" indirection to access uip_buf - and uIP consists mostly of accesses to uip_buf. Even if the future is supposed to bring support for multiple uip_bufs which would turn the uip_buf pointer from a mere workaround to an neceesary element on can still presume that there will be targets with resources limited in a way prohibiting the use of several uip_bufs. So at least for those targets will still be a usecase for a "plain", not indirected uip_buf. 
Therefore it seems reasonable to allow to stay with the "plain" uip_buf at compile-time.
 2010-05-08 07:23:55 +00:00
oliverschmidt dec19626e8 Adjusted UIP_CONF_EXTERNAL_BUFFER to apply to actual buffer only. 2010-05-07 20:45:16 +00:00
fros4943 bc0ea1f81d bug fix: dag pointer may be NULL 2010-05-07 13:51:34 +00:00
joxe cd5dfa9692 added const for the uip_buf pointer for more efficient and smaller uip code and fixed same construct for the sicslowpan code 2010-05-05 13:07:45 +00:00
nvt-se e4187b2fc8 Made pointers constant and thereby reduced the code size slightly. 2010-05-05 12:35:39 +00:00
nvt-se 361e210751 Improvements to style and commentary. 2010-05-04 22:55:32 +00:00
joxe 01881f92a8 added missing include 2010-05-04 14:41:55 +00:00
joxe 790819e701 allocate uip_buf as uint32_t to avoid risk for unaligned uip_buf on 32 or 16 bit architectures 2010-05-04 09:19:41 +00:00
joxe 7d235841b3 always include the RPL route state to allow compilation of rpl code 2010-05-03 14:12:03 +00:00
nifi 6c86398778 Added check to not copy or create too large packets 2010-05-02 14:59:11 +00:00
nifi a04372adc4 Fixed conversion of packetbuf address type to address index and corrected return value 2010-05-02 12:21:34 +00:00
joxe f72bd5572c added initialization of RPL 2010-05-01 13:04:31 +00:00
joxe 0531d9bd82 moved RPL routing state struct into uip-ds6 2010-05-01 12:02:25 +00:00
nvt-se 9a4a9b9437 Removed return value in function that should not return a value. 2010-04-30 23:13:58 +00:00
nvt-se ecada2d1ac *** empty log message *** 2010-04-30 23:10:45 +00:00
nvt-se b8a3a4109e Adjusted the code so as to remove compilation warnings. 2010-04-30 22:18:12 +00:00
nvt-se b822dbb25e Addressed compilation warnings. 2010-04-30 15:04:47 +00:00
nvt-se 4106f4d798 Increased minimum DIO interval from 1024 ms to 4096 ms in order to more calm in duty-cycled networks. 2010-04-30 15:03:55 +00:00
joxe 168a65d989 added ContikiRPL - an implementation of IETF ROLL RPL 2010-04-30 13:43:53 +00:00
joxe 167b0d636e added icmp_send function and moved rpl input function signature 2010-04-30 13:22:21 +00:00
joxe dc1a5f70ff added uip-debug utilities 2010-04-30 13:20:57 +00:00
nvt-se 7e0e2fe284 Removed obsolete rime-route code for IPv6 2010-04-30 12:43:37 +00:00
joxe cc9914a4f3 fixed uip to use UDP_BUF instead of TCP_BUF when setting udp ports - minor cleanup 2010-04-30 08:46:27 +00:00
adamdunkels 3d10dedecf Added a safety measure against a problem where a node in rare situations would turn itself into a sink. Not entirely sure why this happens, but the safety measure should at least avoid the results of the problem. Added more debug messages. 2010-04-30 07:33:51 +00:00
adamdunkels 0859d4b95f Avoid turning off the radio in the middle of a packet reception 2010-04-30 07:32:39 +00:00
adamdunkels e606c674c2 Rewrote LPP so that it uses 802.15.4 headers. A number of bugfixes with respect to alignment. Avoid turning off the radio in the middle of packet reception. 2010-04-30 07:31:44 +00:00
adamdunkels 55b6129bd2 Debug printout fix 2010-04-30 07:29:31 +00:00
adamdunkels e523c36cdf Removed the (unused) header packet of the queuebuf. Added a function for accessing address attributes in the queuebuf 2010-04-30 07:29:08 +00:00
adamdunkels 3c735fcea4 Added a packetbuf flag that indicates if the link layer acks should be used or not 2010-04-30 07:25:51 +00:00
adamdunkels 798f1c63bd Make it possible to receive multicast UDP packets 2010-04-30 07:19:33 +00:00
adamdunkels a1f69138d1 Avoid adding elements twice 2010-04-30 07:18:24 +00:00
fros4943 18e5718c97 avoid freeing queuebuf multiple times, and free buffer after cancelling connection 2010-04-27 13:08:55 +00:00
fros4943 12b6f35ce7 PRINTF()ed debugging output 2010-04-27 12:56:35 +00:00
nifi 85d6f6c514 removed unused variable 2010-04-26 22:41:50 +00:00
nifi 875ad7ffda Fixed to not change the header if the header allocation fails 2010-04-26 22:05:40 +00:00
nifi b26f45a35b code cleanup 2010-04-26 17:55:11 +00:00
nifi d761b6e89a Added MAC header to handle padding 2010-04-26 17:46:21 +00:00
fros4943 ce1374087b allow elf loader memory configuration at compile time 2010-04-26 14:02:07 +00:00
nifi 14b1bb9f57 Fixed to only use leds when DEBUG is set 2010-04-20 11:41:16 +00:00
nvt-se f9ca4a546d Introduced append-only mode for systems with little available code space left, but which require basic FS support. Removes about 1.5kB ROM when the mode is enabled, i.e., COFFEE_CONF_APPEND_ONLY=1 2010-04-12 13:20:55 +00:00
nvt-se 2e5d97366a ensure matching format and type in debug printf 2010-04-09 16:21:07 +00:00
adamdunkels 3670fac618 Bugfix: timing fixed 2010-04-08 18:23:24 +00:00
adamdunkels f2bf8965d5 MAC sequence number attribute 2010-04-08 09:46:30 +00:00
adamdunkels 91ff8574ad Improved handling of duplicate packets 2010-04-08 09:32:56 +00:00
nvt-se ac4ba199bc Turn off DEBUG mode by default. 2010-04-06 21:37:54 +00:00
anthony-a 694e1498f4 merge change from branch into mainline. <fingers crossed> 2010-04-06 19:10:21 +00:00
nvt-se 75dd41601b Added a macro for checking if an address is link local. 2010-04-06 16:47:18 +00:00
adamdunkels 497111bcc9 Added an optional rate limit for broadcast transmissions 2010-04-06 11:57:43 +00:00
adamdunkels e06a30fdb0 Added MAC-layer duplicate message suppression, which is very helpful when running with duty cycling turned off 2010-04-05 19:28:07 +00:00
adamdunkels c68ee6e577 Bugfix: memory from the wrong memb was freed. 2010-04-04 21:02:09 +00:00
adamdunkels a4c328785a Small timing tweaks 2010-04-04 21:01:24 +00:00
adamdunkels 62039a530d Removed non-existant cooja-debug.h include 2010-04-04 12:31:47 +00:00
adamdunkels 7d6ff0289e Fiddled more with the timing: the phase seems stable now at least. Still bugs left though... 2010-04-04 12:28:29 +00:00
adamdunkels be117afe04 After a lot of tweaking and twiddling with the timing of the ContikiMAC code and the mechanisms in the CC2420 driver, things seem to work somewhat stable now - knock on wood! 2010-04-04 07:49:30 +00:00
adamdunkels a637ddaf4e Flush the rxfifo when turning off the radio instead of when turning it on. This seems to fix a bug that was seen in mspsim and seemed to appear on real hardware too. 2010-04-03 16:01:00 +00:00
adamdunkels 83eaa70f03 Added pending flag 2010-04-03 13:34:20 +00:00
adamdunkels 121ca946e1 Improved phase lock behaviour when neighbor is not duty cycling: senders notify receivers via the 802.15.4 pending bit that they are not duty cycling. Neighbors then will start sending packets immediately and not wait for neighbors' phase. Tweaking of ContikiMAC timers to make it more reliable. 2010-04-03 13:28:30 +00:00
joxe 6ae86d001d made number of phase neighbors configurable 2010-04-01 17:17:36 +00:00
fros4943 59357e8b75 PRINTF():ed debugging output 2010-04-01 11:08:36 +00:00
adamdunkels cc11c9d3f2 Added missing #define 2010-04-01 10:56:00 +00:00
adamdunkels a8d8b6d31d Improved parent management: parent neighbor is retained until a better neighbor is found (with 1 ETX less than parent). Don't drop parent neighbors when loop is detected (loops are transient anyway). 2010-04-01 10:45:21 +00:00
adamdunkels d7457bc340 Improved parent management: parent neighbor is retained until a better neighbor is found (with 1 ETX less than parent). Don't drop parent neighbors when loop is detected (loops are transient anyway). 2010-04-01 10:03:19 +00:00
adamdunkels add426de4b Bugfixed stream mode: node listens 100% for 0.5 seconds in stream mode. Naming change: is_listening changed is_snooping. 2010-04-01 10:02:04 +00:00
adamdunkels 5b121b4829 Set stream bit only on non-FIN TCP segments 2010-04-01 10:01:01 +00:00
adamdunkels b43f7830b3 Fine-tuned the timing and phase lock optimization 2010-03-31 20:27:15 +00:00
adamdunkels c9ca5d61e2 Rewrote the pending_packet() function to check the FIFOP pin instead of the 'pending' variable - works must better on real hardware and is now supported by the latest mspsim 2010-03-31 19:08:56 +00:00
adamdunkels 4e33112d3e Guard against malformed broadcast announcements 2010-03-31 12:17:24 +00:00
adamdunkels 877eb2fbe9 Fiddled with the timing 2010-03-31 11:54:38 +00:00
fros4943 3bd07ea55a bugfix: refresh correct source route 
+
refreshing gateway route whenever data is received via a gateway
 2010-03-31 09:38:42 +00:00
adamdunkels bcfa80102d Had previously not included the waiting time that the CC2420 introduces when sending a packet. Also increased the smallest packet size, just to be on the safe side. 2010-03-30 23:01:32 +00:00
adamdunkels 4d5f112960 New return value for invidating a link-layer collision 2010-03-30 23:00:22 +00:00
adamdunkels 5e7f99a2c0 Reverted the removal of the code that checked the FIFOP pin before reading a packet - checking FIFOP is the correct way to do it. Also added TXONCCA for now, including new radio.h return values to indicate a link-layer collision. 2010-03-30 23:00:05 +00:00
adamdunkels 226abb8ec3 Removed non-existant include file 2010-03-29 22:10:03 +00:00
adamdunkels 4e3268e2e2 Added function that removes the header 2010-03-29 21:53:04 +00:00
adamdunkels 4c3b69dc07 Configuration parameter for number of MAC-layer retransmissions 2010-03-29 21:52:25 +00:00
adamdunkels 9c58768b59 Extend packet size after creating 802.15.4 header; prepare radio chip with packet before waiting for neighbor phase to make phase wait time deterministic 2010-03-29 21:51:36 +00:00
adamdunkels b4b7e942b6 Back off a guard time for every non-ack packet 2010-03-29 21:50:01 +00:00
oliverschmidt 315e446584 Adjusted formal parameter to single existing actual parameter. 2010-03-29 20:26:14 +00:00
fros4943 0fcbfae836 updated function: has_value argument was missing 2010-03-29 12:13:35 +00:00
fros4943 671629dea0 moved packet_sent function, it was in a HC06-specific unit 2010-03-29 11:48:09 +00:00
fros4943 b952f97799 stopping watchdog during find_file 2010-03-29 11:31:35 +00:00
joxe bd6cd03c1d moved prefix to avoid compiler warning 2010-03-26 15:12:57 +00:00
nifi 9508d2c4d7 * Added configurable default number of transmissions for CSMA to use when not specified using packetbuf attributes (CSMA_CONF_MAX_MAC_TRANSMISSIONS). 
* Renamed packetbuf attribute PACKETBUF_ATTR_MAX_MAC_REXMIT to PACKETBUF_ATTR_MAX_MAC_TRANSMISSIONS where value 0 (attribute not set) means that default number of transmissions should be used.
 2010-03-26 12:29:29 +00:00
joxe bec1ccc57d added support for all UDP port compressions in hc06 2010-03-26 10:28:51 +00:00
nifi 0ec8d499e4 Bug fix: only call subscriber if set 2010-03-25 19:30:44 +00:00