deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Increased the max ETX to allow for longer paths even with the initial conservative ETX estimate; made collect use announcements by default

Browse source
This commit is contained in:
adamdunkels 2011-01-09 23:48:33 +00:00
parent acf45ec648
commit 50a3e6ea23
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/net/rime/collect.h
View file

@ -47,7 +47,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: collect.h,v 1.25 2010/12/16 22:46:34 adamdunkels Exp $ * $Id: collect.h,v 1.26 2011/01/09 23:48:33 adamdunkels Exp $
*/ */
/** /**
@ -84,14 +84,23 @@ struct collect_callbacks {
uint8_t hops); uint8_t hops);
}; };
/* COLLECT_CONF_ANNOUNCEMENTS defines if the Collect implementation
should use Contiki's announcement primitive to announce its routes
or if it should use periodic broadcasts. */
#ifndef COLLECT_CONF_ANNOUNCEMENTS
#define COLLECT_ANNOUNCEMENTS 1
#else
#define COLLECT_ANNOUNCEMENTS COLLECT_CONF_ANNOUNCEMENTS
#endif /* COLLECT_CONF_ANNOUNCEMENTS */
struct collect_conn { struct collect_conn {
struct unicast_conn unicast_conn; struct unicast_conn unicast_conn;
#if ! COLLECT_CONF_ANNOUNCEMENTS #if ! COLLECT_ANNOUNCEMENTS
struct neighbor_discovery_conn neighbor_discovery_conn; struct neighbor_discovery_conn neighbor_discovery_conn;
#else /* ! COLLECT_CONF_ANNOUNCEMENTS */ #else /* ! COLLECT_ANNOUNCEMENTS */
struct announcement announcement; struct announcement announcement;
struct ctimer transmit_after_scan_timer; struct ctimer transmit_after_scan_timer;
#endif /* COLLECT_CONF_ANNOUNCEMENTS */ #endif /* COLLECT_ANNOUNCEMENTS */
const struct collect_callbacks *cb; const struct collect_callbacks *cb;
struct ctimer retransmission_timer; struct ctimer retransmission_timer;
LIST_STRUCT(send_queue_list); LIST_STRUCT(send_queue_list);
@ -134,7 +143,7 @@ void collect_set_keepalive(struct collect_conn *c, clock_time_t period);
void collect_print_stats(void); void collect_print_stats(void);
#define COLLECT_MAX_DEPTH (COLLECT_LINK_ESTIMATE_UNIT * 32 - 1) #define COLLECT_MAX_DEPTH (COLLECT_LINK_ESTIMATE_UNIT * 64 - 1)
#endif /* __COLLECT_H__ */ #endif /* __COLLECT_H__ */
/** @} */ /** @} */