From faf083f09d11d9bf9c0e772799e125414c4dd73b Mon Sep 17 00:00:00 2001
From: nvt-se <nvt-se>
Date: Mon, 6 Apr 2009 13:16:39 +0000
Subject: [PATCH] save copy of a rime address that points to a packet buffer,
 since the packet buffer is cleared and overwritten before the address usage
 is done.

---
 core/net/rime/route-discovery.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/net/rime/route-discovery.c b/core/net/rime/route-discovery.c
index 8ff185694..7cf45f0f1 100644
--- a/core/net/rime/route-discovery.c
+++ b/core/net/rime/route-discovery.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: route-discovery.c,v 1.15 2009/03/24 07:15:04 adamdunkels Exp $
+ * $Id: route-discovery.c,v 1.16 2009/04/06 13:16:39 nvt-se Exp $
  */
 
 /**
@@ -80,8 +80,12 @@ struct rrep_hdr {
 static void
 send_rreq(struct route_discovery_conn *c, const rimeaddr_t *dest)
 {
+  rimeaddr_t dest_copy;
   struct route_msg *msg;
 
+  rimeaddr_copy(&dest_copy, dest);
+  dest = &dest_copy;
+
   packetbuf_clear();
   msg = packetbuf_dataptr();
   packetbuf_set_datalen(sizeof(struct route_msg));
@@ -99,8 +103,12 @@ send_rrep(struct route_discovery_conn *c, rimeaddr_t *dest)
 {
   struct rrep_hdr *rrepmsg;
   struct route_entry *rt;
+  rimeaddr_t saved_dest;
   
+  rimeaddr_copy(&saved_dest, dest);
+
   packetbuf_clear();
+  dest = &saved_dest;
   rrepmsg = packetbuf_dataptr();
   packetbuf_set_datalen(sizeof(struct rrep_hdr));
   rrepmsg->hops = 0;
@@ -113,6 +121,10 @@ send_rrep(struct route_discovery_conn *c, rimeaddr_t *dest)
 	   dest->u8[0],dest->u8[1],
 	   rt->nexthop.u8[0],rt->nexthop.u8[1]);
     unicast_send(&c->rrepconn, &rt->nexthop);
+  } else {
+    PRINTF("%d.%d: no route for rrep to %d.%d\n",
+	   rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
+	   dest->u8[0],dest->u8[1]);
   }
 }
 /*---------------------------------------------------------------------------*/