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
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
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
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
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
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
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
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
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
1e1e44a3f8
Fixed compiler warnings to make code compile with gcc's -pedantic switch
2007-11-17 18:01:00 +00:00
adamdunkels
7fd1eca954
Added debug output
2007-11-17 10:34:17 +00:00
adamdunkels
9bd3c0c07c
Re-added hop count to header, fixes related to ETX computation: adv packets do not add a good etx, timedout packets do not restore the neighbor age, removed unused code
2007-11-17 10:32:54 +00:00
adamdunkels
5e7cbff22a
Fixed compiler warnings
2007-11-17 10:12:19 +00:00
adamdunkels
a7102829e3
Updated ruc callback types to fix compiler warnings
2007-11-17 09:59:48 +00:00
adamdunkels
0a8b1cbd76
Updated ruc callback types to fix compiler warnings
2007-11-17 09:47:55 +00:00
fros4943
532d9814c2
configurable rudolph datasize
2007-11-16 09:17:22 +00:00
nifi
c989d425dc
fixed compiler warning
2007-11-15 13:33:09 +00:00
nifi
a6d827fa1f
moved initialization of ctimer to allow MAC layer to use ctimers
2007-11-15 13:07:42 +00:00
fros4943
c645cad175
fixed conflicting types: nbh.c vs nbh.h
2007-11-15 08:10:42 +00:00
adamdunkels
0a7f35d62c
Added neighborhood discovery module
2007-11-13 21:01:54 +00:00
adamdunkels
1386b8ae8f
Added API to retrieve address of current receiver
2007-11-13 21:00:10 +00:00
adamdunkels
c40dde1209
Updated ruc to send ACKs before notifying applications, and API support for the etx-based tree code
2007-11-13 20:58:46 +00:00
adamdunkels
6845d2a1aa
Updated tree to use expected transmissions (etx) as routing metric
2007-11-13 20:39:29 +00:00
nifi
44480fc7b7
added fix to enable start of ctimers before etimer process has started
2007-11-13 15:13:03 +00:00
nvt-se
6b7173809d
anonymous -> identified.
2007-11-12 12:34:29 +00:00
adamdunkels
feed6cf679
const parameter to rimbuef_copyfrom()
2007-10-25 12:48:46 +00:00
nifi
9a11bc1543
only update rimestats rexmit for retransmissions + added debug output when retransmitting
2007-10-23 14:00:36 +00:00
nifi
0bf47de9ba
fixed compiler warning
2007-10-19 13:50:01 +00:00
nifi
d5580ae7ee
corrected debug print
2007-10-02 13:41:12 +00:00
nifi
1abf2c4c16
fixed compiler warning
2007-09-26 11:34:49 +00:00
nvt-se
33687d8e6f
A function declared in lib/random.h is used, so this file should be included
...
instead of lib/rand.h.
2007-09-14 20:26:52 +00:00
matsutsuka
9d4fc0a1a8
Support for z80(sdcc) port.
...
In order to support, some core modules are modified as follows:
core/sys/dsc.h
- If CTK_CONF_ICONS is diabled, the whole icon-related code is disabled.
- DSC_HEADER is changed to remove extra semicolon.
core/sys/process.h
- process_data_t is expressed by void* in signatures (known bug on sdcc).
core/sys/autostart.h
- autostart_processes is changed to remove extra semicolon.
core/sys/cc.h
- CC_CONF_ASSIGN_AGGREGATE is introduced.
- CC_CONF_INC_CAST_POINTER is introduced, a workaround of a kind
of sdcc bug for an increment.
core/net/hc.c
core/net/uip_arp.c
core/net/uaodv.c
- Aggregation assignments are changed to uip_ipaddr_copy.
core/net/psock.c
core/net/uipbuf.c
core/net/dhcpc.c
apps/shell/shell.c
core/ctk/vnc-server.c
core/ctk/vnc-out.c
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
core/net/uip-over-mesh.c
- An extra semicolon is removed.
apps/dhcp/dhcp-dsc.c
apps/shell/shell-dsc.
apps/ftp/ftp-dsc.c
apps/process-list/process-list-dsc.c
apps/email/email-dsc.c
apps/webserver/webserver-dsc.c
apps/vnc/vnc-dsc.c
apps/vnc/vnc-viewer.h
apps/webbrowser/www-dsc.c
apps/about/about-dsc.c
apps/irc/irc-dsc.c
apps/telnet/telnet-dsc.c
apps/telnetd/telnetd-dsc.c
apps/netconf/netconf-dsc.c
apps/directory/directory-dsc.c
pps/calc/calc-dsc.c
- Modify an extern type to a real declaration, which is static
to prevent a compile error.
core/net/mac/xmac.c
- Variables cannot be defined in a head of block on sdcc.
core/ctk/ctk.h
core/ctk/ctk.c
apps/program-handler/program-handler.c
- If CTK_CONF_ICONS is diabled, the whole icon-related code is disabled.
Makefile.include
- Add a set of configuration for an assembler.
- $(CLEAN) variable is introduced for customized cleanup.
apps/process-list/process-list.c
- PROCESSLIST_CONF_HEIGHT is introduced to address smaller screen size.
core/lib/ctk-filedialog.c
- FILES_CONF_HEIGHT is introduced to address smaller screen size.
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
apps/vnc/vnc-viewer.c
- A cast is added to prevent a compile error.
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
apps/webbrowser/webclient.c
- CC_CONF_INC_CAST_POINTER is introduced, a workaround of a kind
of sdcc bug for an increment.
core/loader/elfloader.c
- A cast is added to prevent a compile error.
core/net/rime/rimeaddr.c
- An initialization is added to prevent a compile error.
core/net/rime/rudolph0.c
- NULL is changed to 0, because NULL causes a compile error.
core/net/rime/route-discovery.c
- Add an argument to match the definition of nf_callbacks.
cpu/z80/strcasecmp.h
cpu/z80/strcasecmp.c
cpu/z80/contiki-sdcc-conf.h
cpu/z80/mtarch.c
cpu/z80/mtarch.h
cpu/z80/Makefile.z80
- New files to make compilation availble on sdcc.
- Added support for multithreading.
2007-08-30 14:39:16 +00:00
adamdunkels
52eb372890
Modified to use the new MAC layer API
2007-05-25 08:06:44 +00:00
adamdunkels
0e6b5e0099
Turn debug output off (which was inadvertedly left on)
2007-05-22 21:53:15 +00:00
adamdunkels
37993d254d
Increased default neighbor lifetime, removed debug output
2007-05-22 21:15:17 +00:00
adamdunkels
26903043a3
Updated format of debug output
2007-05-22 20:58:00 +00:00
adamdunkels
e18b609039
Amount of retransmissions now configurable on a per-packet basis
2007-05-22 20:57:44 +00:00
adamdunkels
c0d3b9111a
Stubborn timer now configurable on a per-transmission basis.
2007-05-22 20:57:20 +00:00
adamdunkels
af43f26ed2
Multiplicative increase in retransmission time. Statistics. Max amount of retransmissions now configurable on a per-packet basis
2007-05-22 20:56:52 +00:00
adamdunkels
525b37ca7a
Added Rime statistics.
2007-05-22 20:56:10 +00:00
adamdunkels
396e8094c6
Added Rime statistics, rmh and rucb
2007-05-22 20:55:53 +00:00
adamdunkels
a68b8a0a0d
Rime statistics gathering
2007-05-22 20:48:41 +00:00
adamdunkels
0a26f4a712
Reliable single-hop unicast bulk transfer
2007-05-22 20:45:49 +00:00
adamdunkels
0206e1cd3b
Hop-by-hop reliable multi-hop communication primitive (untested)
2007-05-22 20:45:18 +00:00
oliverschmidt
e5d6dd1db5
Removed sources from makefile which don't exist in the CVS repository.
2007-05-17 19:22:04 +00:00
adamdunkels
940da856de
Bugfixes, updates
2007-05-15 08:09:21 +00:00
adamdunkels
a9e8e9f4fe
Replaced uabc with polite, uibc with ipolite, added rudolph2
2007-05-15 08:08:05 +00:00
adamdunkels
ac9ba33bd5
Yet another network bulk flooding protocol
2007-05-15 08:07:46 +00:00
adamdunkels
db0571bef3
Identified polite broadcast primitive
2007-05-15 07:41:36 +00:00
adamdunkels
f539f4efd8
Polite broadcast primitive
2007-05-15 07:41:22 +00:00
adamdunkels
cda806dc84
Bugfix: rudolph1 sometimes failed because the first packet was received from a neighbor
2007-04-02 19:12:37 +00:00
adamdunkels
2d42bd9e2a
Now keeps track of highest chunk number heard and sends NACKs until it sees it
2007-04-02 17:53:27 +00:00
adamdunkels
a26906f478
Made send intervals configurable when sending a new file
2007-04-02 09:51:45 +00:00
adamdunkels
ac3b3ea3ca
Removed unused file
2007-03-31 18:36:03 +00:00
adamdunkels
6dc06d09af
Made the number of retransmissions configurable
2007-03-31 18:33:27 +00:00
adamdunkels
91aa54dc77
Made advertisments for new shorter routes quicker, and advertisements for longer routes slower
2007-03-31 18:33:04 +00:00
adamdunkels
0650a014b5
Documentation updates
2007-03-31 18:31:27 +00:00
adamdunkels
bc1bb96809
Documentation fixes
2007-03-29 23:18:47 +00:00
adamdunkels
2f079ca8e2
Debug output
2007-03-29 23:18:22 +00:00
adamdunkels
4cde369174
Added call to timedout callback
2007-03-29 22:22:44 +00:00
adamdunkels
81b469d4b7
Made buffer sizes configurable from contiki-conf.h
2007-03-29 22:22:20 +00:00
adamdunkels
8e0ae73fa5
Increased default packet size to 64, removed out-commented code
2007-03-28 19:52:27 +00:00