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

Bugfixes, updates

Browse source
This commit is contained in:
adamdunkels 2007-05-15 08:09:21 +00:00
parent a9e8e9f4fe
commit 940da856de
27 changed files with 557 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/net/rime/mesh.c
View file

@ -33,7 +33,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: mesh.c,v 1.7 2007/03/29 23:18:48 adamdunkels Exp $
* $Id: mesh.c,v 1.8 2007/05/15 08:09:21 adamdunkels Exp $
*/
/**
@ -84,7 +84,8 @@ found_route(struct route_discovery_conn *rdc, rimeaddr_t *dest)
struct mesh_conn *c = (struct mesh_conn *)
((char *)rdc - offsetof(struct mesh_conn, route_discovery_conn));
if(rimeaddr_cmp(dest, &c->queued_data_dest)) {
if(c->queued_data != NULL &&
rimeaddr_cmp(dest, &c->queued_data_dest)) {
queuebuf_to_rimebuf(c->queued_data);
queuebuf_free(c->queued_data);
c->queued_data = NULL;
@ -100,6 +101,7 @@ route_timed_out(struct route_discovery_conn *rdc)
if(c->queued_data != NULL) {
queuebuf_free(c->queued_data);
c->queued_data = NULL;
}
if(c->cb->timedout) {