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

Add route_discovery_explicit_open()

Browse source 
For route discovery connections, 2 logical channels are used:
One channel for netflood messages, and one for unicast.
When opening a route discovery connection using
route_discovery_open(), only the netflood channel number is
specified, and the unicast channel number is hard-coded to be the
next channel (+1).
This commit adds an alternative function for opening
route-discovery connections, allowing the user to specify both
channels independently, to gain improved control and readability.
This commit is contained in:
Amit Geron 2015-11-30 00:18:16 +02:00
parent f0c3d29e8a
commit 1b8c889e41
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/net/rime/route-discovery.c
View file

@ -271,14 +271,24 @@ static const struct unicast_callbacks rrep_callbacks = {rrep_packet_received};
static const struct netflood_callbacks rreq_callbacks = {rreq_packet_received, NULL, NULL}; static const struct netflood_callbacks rreq_callbacks = {rreq_packet_received, NULL, NULL};
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
route_discovery_expicit_open(struct route_discovery_conn *c,
clock_time_t time,
uint16_t netflood_channel,
uint16_t unicast_channel,
const struct route_discovery_callbacks *callbacks)
{
netflood_open(&c->rreqconn, time, netflood_channel, &rreq_callbacks);
unicast_open(&c->rrepconn, unicast_channel, &rrep_callbacks);
c->cb = callbacks;
}
/*---------------------------------------------------------------------------*/
void
route_discovery_open(struct route_discovery_conn *c, route_discovery_open(struct route_discovery_conn *c,
clock_time_t time, clock_time_t time,
uint16_t channels, uint16_t channels,
const struct route_discovery_callbacks *callbacks) const struct route_discovery_callbacks *callbacks)
{ {
netflood_open(&c->rreqconn, time, channels + 0, &rreq_callbacks); route_discovery_expicit_open(c, time, channels + 0, channels + 1, callbacks);
unicast_open(&c->rrepconn, channels + 1, &rrep_callbacks);
c->cb = callbacks;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void

4
core/net/rime/route-discovery.h
View file

@ -83,6 +83,10 @@ struct route_discovery_conn {
void route_discovery_open(struct route_discovery_conn *c, clock_time_t time, void route_discovery_open(struct route_discovery_conn *c, clock_time_t time,
uint16_t channels, uint16_t channels,
const struct route_discovery_callbacks *callbacks); const struct route_discovery_callbacks *callbacks);
void route_discovery_explicit_open(struct route_discovery_conn *c, clock_time_t time,
uint16_t netflood_channel,
uint16_t unicast_channel,
const struct route_discovery_callbacks *callbacks);
int route_discovery_discover(struct route_discovery_conn *c, const linkaddr_t *dest, int route_discovery_discover(struct route_discovery_conn *c, const linkaddr_t *dest,
clock_time_t timeout); clock_time_t timeout);