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

node_id -> rimeaddr_node_addr

Browse source
This commit is contained in:
adamdunkels 2007-03-15 21:25:06 +00:00
parent e4e57fca96
commit 2e6dbad62b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
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.1 2007/03/15 20:04:30 adamdunkels Exp $ * $Id: tree.c,v 1.2 2007/03/15 21:25:06 adamdunkels Exp $
*/ */
/** /**
@ -152,7 +152,7 @@ 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) {
printf("%d: packet received from %d, forwarding %d, best neighbor %p\n", printf("%d: packet received from %d, forwarding %d, best neighbor %p\n",
node_id, from->u16, tc.forwarding, neighbor_best()); rimeaddr_node_addr.u16, from->u16, tc.forwarding, neighbor_best());
if(!tc.forwarding) { if(!tc.forwarding) {
tc.forwarding = 1; tc.forwarding = 1;
n = neighbor_best(); n = neighbor_best();
@ -162,7 +162,8 @@ node_packet_received(struct ruc_conn *c, rimeaddr_t *from, u8_t seqno)
return 1; return 1;
} else { } else {
printf("%d: still forwarding another packet, not sending ACK\n", node_id); printf("%d: still forwarding another packet, not sending ACK\n",
rimeaddr_node_addr.u16);
return 0; return 0;
} }
} }