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

Changed local rtmetric name from 'local_rtmetric' to 'rtmetric' and updated the neighbor discovery module from nbh to neighbor-discovery

Browse source
This commit is contained in:
adamdunkels 2007-12-09 15:43:09 +00:00
parent 4e1d2906b7
commit 01da62aa25
2 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
core/net/rime/collect.c
View file

@ -1,3 +1,6 @@
/* XXX: send explicit congestion notification if already forwarding
packet + add queue for keeping packets to forward. */
/** /**
* \addtogroup rimecollect * \addtogroup rimecollect
* @{ * @{
@ -33,7 +36,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: collect.c,v 1.1 2007/11/28 16:04:41 adamdunkels Exp $ * $Id: collect.c,v 1.2 2007/12/09 15:43:09 adamdunkels Exp $
*/ */
/** /**
@ -101,7 +104,7 @@ update_rtmetric(struct collect_conn *tc)
struct neighbor *n; struct neighbor *n;
/* We should only update the rtmetric if we are not the sink. */ /* We should only update the rtmetric if we are not the sink. */
if(tc->local_rtmetric != SINK) { if(tc->rtmetric != SINK) {
/* Find the neighbor with the lowest rtmetric. */ /* Find the neighbor with the lowest rtmetric. */
n = neighbor_best(); n = neighbor_best();
@ -112,22 +115,22 @@ update_rtmetric(struct collect_conn *tc)
/* If we have don't have any neighbors, we set our rtmetric to /* If we have don't have any neighbors, we set our rtmetric to
the maximum value to indicate that we do not have a route. */ the maximum value to indicate that we do not have a route. */
if(tc->local_rtmetric != RTMETRIC_MAX) { if(tc->rtmetric != RTMETRIC_MAX) {
PRINTF("%d.%d: didn't find a best neighbor, setting rtmetric to max\n", PRINTF("%d.%d: didn't find a best neighbor, setting rtmetric to max\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]); rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
} }
tc->local_rtmetric = RTMETRIC_MAX; tc->rtmetric = RTMETRIC_MAX;
} else { } else {
/* We set our rtmetric to the rtmetric of our best neighbor plus /* We set our rtmetric to the rtmetric of our best neighbor plus
the expected transmissions to reach that neighbor. */ the expected transmissions to reach that neighbor. */
if(n->rtmetric + neighbor_etx(n) != tc->local_rtmetric) { if(n->rtmetric + neighbor_etx(n) != tc->rtmetric) {
tc->local_rtmetric = n->rtmetric + neighbor_etx(n); tc->rtmetric = n->rtmetric + neighbor_etx(n);
nbh_start(&tc->nbh_conn, tc->local_rtmetric); neighbor_discovery_start(&tc->neighbor_discovery_conn, tc->rtmetric);
/* send_adv(tc, MIN_INTERVAL);*/ /* send_adv(tc, MIN_INTERVAL);*/
PRINTF("%d.%d: new rtmetric %d\n", PRINTF("%d.%d: new rtmetric %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
tc->local_rtmetric); tc->rtmetric);
} }
} }
} }
@ -136,10 +139,10 @@ update_rtmetric(struct collect_conn *tc)
#if NETSIM #if NETSIM
{ {
char buf[8]; char buf[8];
if(tc->local_rtmetric == RTMETRIC_MAX) { if(tc->rtmetric == RTMETRIC_MAX) {
strcpy(buf, " "); strcpy(buf, " ");
} else { } else {
sprintf(buf, "%d", tc->local_rtmetric); sprintf(buf, "%d", tc->rtmetric);
} }
ether_set_text(buf); ether_set_text(buf);
} }
@ -170,7 +173,7 @@ node_packet_received(struct ruc_conn *c, rimeaddr_t *from, u8_t seqno)
rimeaddr_copy(&recent_packets[recent_packet_ptr].originator, &hdr->originator); rimeaddr_copy(&recent_packets[recent_packet_ptr].originator, &hdr->originator);
recent_packet_ptr = (recent_packet_ptr + 1) % NUM_RECENT_PACKETS; recent_packet_ptr = (recent_packet_ptr + 1) % NUM_RECENT_PACKETS;
if(tc->local_rtmetric == SINK) { if(tc->rtmetric == SINK) {
/* If we are the sink, we call the receive function. */ /* If we are the sink, we call the receive function. */
@ -186,7 +189,7 @@ node_packet_received(struct ruc_conn *c, rimeaddr_t *from, u8_t seqno)
hdr->hops); hdr->hops);
} }
return; return;
} else if(hdr->hoplim > 1 && tc->local_rtmetric != RTMETRIC_MAX) { } else if(hdr->hoplim > 1 && tc->rtmetric != RTMETRIC_MAX) {
/* If we are not the sink, we forward the packet to the best /* If we are not the sink, we forward the packet to the best
neighbor. */ neighbor. */
@ -240,10 +243,10 @@ node_packet_timedout(struct ruc_conn *c, rimeaddr_t *to, u8_t retransmissions)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
adv_received(struct nbh_conn *c, rimeaddr_t *from, uint16_t rtmetric) adv_received(struct neighbor_discovery_conn *c, rimeaddr_t *from, uint16_t rtmetric)
{ {
struct collect_conn *tc = (struct collect_conn *) struct collect_conn *tc = (struct collect_conn *)
((char *)c - offsetof(struct collect_conn, nbh_conn)); ((char *)c - offsetof(struct collect_conn, neighbor_discovery_conn));
struct neighbor *n; struct neighbor *n;
n = neighbor_find(from); n = neighbor_find(from);
@ -264,23 +267,23 @@ adv_received(struct nbh_conn *c, rimeaddr_t *from, uint16_t rtmetric)
static const struct ruc_callbacks ruc_callbacks = {node_packet_received, static const struct ruc_callbacks ruc_callbacks = {node_packet_received,
node_packet_sent, node_packet_sent,
node_packet_timedout}; node_packet_timedout};
static const struct nbh_callbacks nbh_callbacks = { adv_received, static const struct neighbor_discovery_callbacks neighbor_discovery_callbacks =
NULL}; { adv_received, NULL};
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
collect_open(struct collect_conn *tc, u16_t channels, collect_open(struct collect_conn *tc, u16_t channels,
const struct collect_callbacks *cb) const struct collect_callbacks *cb)
{ {
nbh_open(&tc->nbh_conn, channels, &nbh_callbacks); neighbor_discovery_open(&tc->neighbor_discovery_conn, channels, &neighbor_discovery_callbacks);
ruc_open(&tc->ruc_conn, channels + 1, &ruc_callbacks); ruc_open(&tc->ruc_conn, channels + 1, &ruc_callbacks);
tc->local_rtmetric = RTMETRIC_MAX; tc->rtmetric = RTMETRIC_MAX;
tc->cb = cb; tc->cb = cb;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
collect_close(struct collect_conn *tc) collect_close(struct collect_conn *tc)
{ {
nbh_close(&tc->nbh_conn); neighbor_discovery_close(&tc->neighbor_discovery_conn);
ruc_close(&tc->ruc_conn); ruc_close(&tc->ruc_conn);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -288,10 +291,10 @@ void
collect_set_sink(struct collect_conn *tc, int should_be_sink) collect_set_sink(struct collect_conn *tc, int should_be_sink)
{ {
if(should_be_sink) { if(should_be_sink) {
tc->local_rtmetric = SINK; tc->rtmetric = SINK;
nbh_start(&tc->nbh_conn, tc->local_rtmetric); neighbor_discovery_start(&tc->neighbor_discovery_conn, tc->rtmetric);
} else { } else {
tc->local_rtmetric = RTMETRIC_MAX; tc->rtmetric = RTMETRIC_MAX;
} }
update_rtmetric(tc); update_rtmetric(tc);
} }
@ -310,7 +313,7 @@ collect_send(struct collect_conn *tc, int rexmits)
hdr->hops = 0; hdr->hops = 0;
hdr->hoplim = MAX_HOPLIM; hdr->hoplim = MAX_HOPLIM;
hdr->rexmits = rexmits; hdr->rexmits = rexmits;
if(tc->local_rtmetric == 0) { if(tc->rtmetric == 0) {
if(tc->cb->recv != NULL) { if(tc->cb->recv != NULL) {
tc->cb->recv(&hdr->originator, hdr->originator_seqno, tc->cb->recv(&hdr->originator, hdr->originator_seqno,
hdr->hops); hdr->hops);
@ -332,7 +335,7 @@ collect_send(struct collect_conn *tc, int rexmits)
int int
collect_depth(struct collect_conn *tc) collect_depth(struct collect_conn *tc)
{ {
return tc->local_rtmetric; return tc->rtmetric;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @} */ /** @} */

8
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.1 2007/11/28 16:04:41 adamdunkels Exp $ * $Id: collect.h,v 1.2 2007/12/09 15:43:09 adamdunkels Exp $
*/ */
/** /**
@ -62,7 +62,7 @@
#include "net/rime/ipolite.h" #include "net/rime/ipolite.h"
#include "net/rime/ruc.h" #include "net/rime/ruc.h"
#include "net/rime/nbh.h" #include "net/rime/neighbor-discovery.h"
struct collect_callbacks { struct collect_callbacks {
void (* recv)(rimeaddr_t *originator, u8_t seqno, void (* recv)(rimeaddr_t *originator, u8_t seqno,
@ -70,12 +70,12 @@ struct collect_callbacks {
}; };
struct collect_conn { struct collect_conn {
struct nbh_conn nbh_conn; struct neighbor_discovery_conn neighbor_discovery_conn;
struct ruc_conn ruc_conn; struct ruc_conn ruc_conn;
const struct collect_callbacks *cb; const struct collect_callbacks *cb;
struct ctimer t; struct ctimer t;
u16_t rtmetric;
u8_t forwarding; u8_t forwarding;
u8_t local_rtmetric;
u8_t seqno; u8_t seqno;
}; };