From 2e6dbad62b75b29fd22e1308f8c3c78e0b9c7d5b Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Thu, 15 Mar 2007 21:25:06 +0000 Subject: [PATCH] node_id -> rimeaddr_node_addr --- core/net/rime/tree.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/net/rime/tree.c b/core/net/rime/tree.c index 75d64844b..84a93d844 100644 --- a/core/net/rime/tree.c +++ b/core/net/rime/tree.c @@ -28,7 +28,7 @@ * * 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; } else if(hdr->hoplim > 1 && tc.hello.hopcount != HOPCOUNT_MAX) { 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) { tc.forwarding = 1; n = neighbor_best(); @@ -162,7 +162,8 @@ node_packet_received(struct ruc_conn *c, rimeaddr_t *from, u8_t seqno) return 1; } 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; } }