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

save copy of a rime address that points to a packet buffer, since the

Browse source 
packet buffer is cleared and overwritten before the address usage is done.
This commit is contained in:
nvt-se 2009-04-06 13:16:39 +00:00
parent c531f25c94
commit faf083f09d
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
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.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 static void
send_rreq(struct route_discovery_conn *c, const rimeaddr_t *dest) send_rreq(struct route_discovery_conn *c, const rimeaddr_t *dest)
{ {
rimeaddr_t dest_copy;
struct route_msg *msg; struct route_msg *msg;
rimeaddr_copy(&dest_copy, dest);
dest = &dest_copy;
packetbuf_clear(); packetbuf_clear();
msg = packetbuf_dataptr(); msg = packetbuf_dataptr();
packetbuf_set_datalen(sizeof(struct route_msg)); 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 rrep_hdr *rrepmsg;
struct route_entry *rt; struct route_entry *rt;
rimeaddr_t saved_dest;
rimeaddr_copy(&saved_dest, dest);
packetbuf_clear(); packetbuf_clear();
dest = &saved_dest;
rrepmsg = packetbuf_dataptr(); rrepmsg = packetbuf_dataptr();
packetbuf_set_datalen(sizeof(struct rrep_hdr)); packetbuf_set_datalen(sizeof(struct rrep_hdr));
rrepmsg->hops = 0; rrepmsg->hops = 0;
@ -113,6 +121,10 @@ send_rrep(struct route_discovery_conn *c, rimeaddr_t *dest)
dest->u8[0],dest->u8[1], dest->u8[0],dest->u8[1],
rt->nexthop.u8[0],rt->nexthop.u8[1]); rt->nexthop.u8[0],rt->nexthop.u8[1]);
unicast_send(&c->rrepconn, &rt->nexthop); 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]);
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/