Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-23 01:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Added hop counting, remade the rimeaddr_t u16 to be an array rather than a scalar

Browse Source
This commit is contained in:
adamdunkels 2007-03-21 23:22:42 +00:00
parent b7afd2baf0
commit d1de1e0001
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/net/rime/tree.c
View File

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: tree.c,v 1.4 2007/03/19 22:10:17 adamdunkels Exp $ * $Id: tree.c,v 1.5 2007/03/21 23:22:42 adamdunkels Exp $
*/ */
/** /**
@ -42,6 +42,7 @@
#include "net/rime.h" #include "net/rime.h"
#include "net/rime/neighbor.h" #include "net/rime/neighbor.h"
#include "net/rime/tree.h"
#include "dev/radio-sensor.h" #include "dev/radio-sensor.h"
@ -151,8 +152,9 @@ node_packet_received(struct ruc_conn *c, rimeaddr_t *from, u8_t seqno)
} }
return 1; return 1;
} else if(hdr->hoplim > 1 && tc.hello.hopcount != HOPCOUNT_MAX) { } else if(hdr->hoplim > 1 && tc.hello.hopcount != HOPCOUNT_MAX) {
hdr->hoplim--;
printf("%d: packet received from %d, forwarding %d, best neighbor %p\n", printf("%d: packet received from %d, forwarding %d, best neighbor %p\n",
rimeaddr_node_addr.u16, from->u16, tc.forwarding, neighbor_best()); rimeaddr_node_addr.u16[0], from->u16[0], tc.forwarding, neighbor_best());
if(!tc.forwarding) { if(!tc.forwarding) {
tc.forwarding = 1; tc.forwarding = 1;
n = neighbor_best(); n = neighbor_best();
@ -163,7 +165,7 @@ node_packet_received(struct ruc_conn *c, rimeaddr_t *from, u8_t seqno)
} else { } else {
printf("%d: still forwarding another packet, not sending ACK\n", printf("%d: still forwarding another packet, not sending ACK\n",
rimeaddr_node_addr.u16); rimeaddr_node_addr.u16[0]);
return 0; return 0;
} }
} }