Commit graph

408 commits

Author SHA1 Message Date
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
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
adamdunkels 1cb3bad088 Multiple bugfixes and updates to xmac code by Niclas 2007-11-12 22:29:37 +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
adamdunkels 67aa9e8589 Made initialization function return a pointer to the MAC driver structure, to make initialization nicer 2007-10-23 21:27:57 +00:00
adamdunkels f638c628d7 Made initialization function return a pointer to the MAC driver structure, to make initialization nicer 2007-10-23 20:57:37 +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
matsutsuka a6527b34d9 When UIP_UDP is off, turn off udp functions more accurately. 2007-09-29 03:54:18 +00:00
nifi 1abf2c4c16 fixed compiler warning 2007-09-26 11:34:49 +00:00
fros4943 aa99049af0 simple tdma rtimer implemetation 2007-09-18 10:37:17 +00:00
fros4943 19b3035e36 simple tdma ctimer implementation 2007-09-18 10:36:36 +00:00
fros4943 25d2514541 xmac ctimer implementation 2007-09-18 10:35:39 +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 8fd76351eb removed debugging printf 2007-09-08 16:12:54 +00:00
matsutsuka 4cd7302ecb make an old debbuging printf optional 2007-09-08 15:32:30 +00:00
nvt-se 1d1b99c0aa refer to PSOCK_NEWDATA. 2007-09-04 12:39:00 +00:00
fros4943 858e2682e6 platform independent simple slotted tdma mac protocol
observe: uses event timers, not real-time timers!
2007-08-31 13:42:22 +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
ksb bbdffcbc86 Use uip_ipaddr_copy in places where addresses are copied. 2007-08-22 10:47:37 +00:00
ksb 3337165590 Made it possible to override uip_ipaddr_copy .
Use uip_ipaddr_copy in some places where addresses are copied.
2007-08-22 10:45:42 +00:00
nifi df4ae2a91f corrected function signature 2007-08-06 13:14:09 +00:00
bg- 74af5c6e47 * Sprinkle () in boolean expression to aid readability. 2007-06-28 15:16:41 +00:00
bg- cd5b4d0e64 * Add bad hop extension to RREQ messages (#ifdef:ed AODV_BAD_HOP_EXTENSION) 2007-06-28 15:06:56 +00:00
bg- 8b8f23962e * Send RREP-ACKs if we can. 2007-06-05 10:04:20 +00:00
bg- f4a9e896fd * Put back code for sending fake RREPs in response to HEELOs but now
#ifdef:ed AODV_RESPOND_TO_HELLOS.
2007-06-01 14:49:54 +00:00
bg- e1cd724f37 * #ifndef NOINIT around NOINIT define. 2007-05-31 14:24:20 +00:00
bg- f528ff9fe2 * Increase MY_ROUTE_TIMEOUT but real value should be even larger.
* Honor ip::ttl when processing and forwarding RREQs.

* Fix obob for when to jump my_hseqno after a reboot.

* No longer send fake RREPs in response to HELLO messages.

* If we received a RERR message with flag UAODV_RERR_UNKNOWN set then
  clear flag and set bad routes seqno from our route.
2007-05-31 10:10:26 +00:00
bg- ad43dbf25f * Route lifetime is a 32 bit quantity. 2007-05-28 16:41:06 +00:00
bg- 67d94fd579 * Optional AODV BAD_HOP extension. 2007-05-28 16:32:43 +00:00
oliverschmidt c5608ad99f Moved uIP ppp support into backyard as it was never ported to Contiki 2.x. 2007-05-26 07:14:15 +00:00
adamdunkels 52eb372890 Modified to use the new MAC layer API 2007-05-25 08:06:44 +00:00
adamdunkels b07cfde31b Generic API for MAC layers 2007-05-25 06:40:19 +00:00
oliverschmidt e025faf68f Moved network related stuff that depends on the service paradigm into backyard. 2007-05-23 23:27:57 +00:00
oliverschmidt 6275ef313c Removed the empty PROCESS_NO_BROADCAST macro. 2007-05-23 22:16:05 +00:00
oliverschmidt 7904a7e294 Made it compile again. 2007-05-22 22:10:30 +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 edd509acf5 Added nicer configuration options. Added hack for optimizing X-MAC for unicast packets. Added statistics gathering. Turn radio off when someone else is receiving a packet. Queueing packets when X-MAC cannot send immediately (since someone else is transmitting). 2007-05-22 20:55:24 +00:00
adamdunkels a495d1230b Added Rime statistics 2007-05-22 20:53:24 +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 fdded2f77f no message 2007-05-22 20:32:32 +00:00
bg- 6c19bed556 * Rename field reserved to prefix_sz.
* Literal constant RSSI_THRESHOLD.

* Send fake RREPs to implementations that insist on sending HELLOs.

* Ignore and clear ACK flag in RREPs.
2007-05-21 15:26:57 +00:00
bg- 0d908b24c8 * Rename field reserved to prefix_sz. 2007-05-21 15:24:44 +00:00
fros4943 75e2463b17 removed:
uip_fw_init() called from process, causing all network interfaces to be reset *after* earlier initialization routines.
2007-05-21 14:30:38 +00:00
oliverschmidt 5f3296e943 Changed packet drivers from services to plain processes.
Now tcpip_output() is a function pointer that is supposed to be set via the macro tcpip_set_outputfunc(). Packet drivers do so on process startup.

Thus if there are several packet drivers in a Contiki system the one started last is the one actually used. This behaviour is especially useful for the 'IP forwarding' "meta" packet driver.
2007-05-20 21:29:39 +00:00
fros4943 42a952981b bugfix: could not store last seen rreqs 2007-05-20 20:08:28 +00:00
oliverschmidt c32b2ca581 Replaced function with macro. 2007-05-20 00:04:18 +00:00
oliverschmidt c15984eb24 Avoid function pointer mismatch in set_receive_function(). 2007-05-19 13:19:22 +00:00
oliverschmidt 0e9c61ca0c The PT_* macros contain return statements so a function using them must return a value. 2007-05-19 13:12:00 +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 18825e05b6 Strobes for unicast packets are now acked immediately. Sleep cycle is now configurable. Many bugfixes 2007-05-15 08:07:07 +00:00
adamdunkels 434a6376d7 Added nullmac 2007-05-15 08:06:07 +00:00
adamdunkels d1c6b2eb0d Added output functions 2007-05-15 08:05:52 +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 5728570aa4 A 'null' MAC protocol that does not do anything 2007-05-15 07:40:22 +00:00
bg- 5fb8871fb6 * NULL pointer spotted by Vlasios. 2007-05-13 15:14:48 +00:00