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

Added debug output

Browse source
This commit is contained in:
adamdunkels 2009-05-10 21:10:23 +00:00
parent 02734c9806
commit 5308a09dd3
1 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: route-discovery.c,v 1.16 2009/04/06 13:16:39 nvt-se Exp $ * $Id: route-discovery.c,v 1.17 2009/05/10 21:10:23 adamdunkels Exp $
*/ */
/** /**
@ -49,6 +49,7 @@
#include "net/rime/route-discovery.h" #include "net/rime/route-discovery.h"
#include <stddef.h> /* For offsetof */ #include <stddef.h> /* For offsetof */
#include <stdio.h>
struct route_msg { struct route_msg {
rimeaddr_t dest; rimeaddr_t dest;
@ -71,7 +72,7 @@ struct rrep_hdr {
#define DEBUG 0 #define DEBUG 0
#if DEBUG #if DEBUG
#include <stdio.h> #include <stdio.h>
#define PRINTF(...) printf(__VA_ARGS__) #define PRINTF(...) PRINTF(__VA_ARGS__)
#else #else
#define PRINTF(...) #define PRINTF(...)
#endif #endif
@ -131,7 +132,15 @@ send_rrep(struct route_discovery_conn *c, rimeaddr_t *dest)
static void static void
insert_route(rimeaddr_t *originator, rimeaddr_t *last_hop, uint8_t hops) insert_route(rimeaddr_t *originator, rimeaddr_t *last_hop, uint8_t hops)
{ {
struct route_entry *rt; PRINTF("%d.%d: Inserting %d.%d into routing table, next hop %d.%d, hop count %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
originator->u8[0], originator->u8[1],
last_hop->u8[0], last_hop->u8[1],
hops);
route_add(originator, last_hop, hops, 0);
/*
struct route_entry *rt;
rt = route_lookup(originator); rt = route_lookup(originator);
if(rt == NULL || hops < rt->hop_count) { if(rt == NULL || hops < rt->hop_count) {
@ -145,7 +154,7 @@ insert_route(rimeaddr_t *originator, rimeaddr_t *last_hop, uint8_t hops)
ether_set_line(last_hop->u8[0], last_hop->u8[1]); ether_set_line(last_hop->u8[0], last_hop->u8[1]);
#endif #endif
} }*/
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
@ -163,6 +172,12 @@ rrep_packet_received(struct unicast_conn *uc, rimeaddr_t *from)
msg->dest.u8[0],msg->dest.u8[1], msg->dest.u8[0],msg->dest.u8[1],
packetbuf_datalen()); packetbuf_datalen());
PRINTF("from %d.%d hops %d rssi %d lqi %d\n",
from->u8[0], from->u8[1],
msg->hops,
packetbuf_attr(PACKETBUF_ATTR_RSSI),
packetbuf_attr(PACKETBUF_ATTR_LINK_QUALITY));
insert_route(&msg->originator, from, msg->hops); insert_route(&msg->originator, from, msg->hops);
if(rimeaddr_cmp(&msg->dest, &rimeaddr_node_addr)) { if(rimeaddr_cmp(&msg->dest, &rimeaddr_node_addr)) {
@ -217,6 +232,12 @@ rreq_packet_received(struct netflood_conn *nf, rimeaddr_t *from,
if(rimeaddr_cmp(&msg->dest, &rimeaddr_node_addr)) { if(rimeaddr_cmp(&msg->dest, &rimeaddr_node_addr)) {
PRINTF("%d.%d: route_packet_received: route request for our address\n", PRINTF("%d.%d: route_packet_received: route request for our address\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]); rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
PRINTF("from %d.%d hops %d rssi %d lqi %d\n",
from->u8[0], from->u8[1],
hops,
packetbuf_attr(PACKETBUF_ATTR_RSSI),
packetbuf_attr(PACKETBUF_ATTR_LINK_QUALITY));
insert_route(originator, from, hops); insert_route(originator, from, hops);
/* Send route reply back to source. */ /* Send route reply back to source. */
@ -224,6 +245,11 @@ rreq_packet_received(struct netflood_conn *nf, rimeaddr_t *from,
return 0; /* Don't continue to flood the rreq packet. */ return 0; /* Don't continue to flood the rreq packet. */
} else { } else {
/* PRINTF("route request for %d\n", msg->dest_id);*/ /* PRINTF("route request for %d\n", msg->dest_id);*/
PRINTF("from %d.%d hops %d rssi %d lqi %d\n",
from->u8[0], from->u8[1],
hops,
packetbuf_attr(PACKETBUF_ATTR_RSSI),
packetbuf_attr(PACKETBUF_ATTR_LINK_QUALITY));
insert_route(originator, from, hops); insert_route(originator, from, hops);
} }