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

avoid freeing queuebuf multiple times, and free buffer after cancelling connection

Browse source
This commit is contained in:
fros4943 2010-04-27 13:08:55 +00:00
parent 12b6f35ce7
commit 18e5718c97
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/net/rime/stunicast.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: stunicast.c,v 1.4 2010/02/23 18:38:05 adamdunkels Exp $ * $Id: stunicast.c,v 1.5 2010/04/27 13:08:55 fros4943 Exp $
*/ */
/** /**
@ -95,10 +95,7 @@ void
stunicast_close(struct stunicast_conn *c) stunicast_close(struct stunicast_conn *c)
{ {
unicast_close(&c->c); unicast_close(&c->c);
ctimer_stop(&c->t); stunicast_cancel(c);
if(c->buf != NULL) {
queuebuf_free(c->buf);
}
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
rimeaddr_t * rimeaddr_t *
@ -168,6 +165,10 @@ void
stunicast_cancel(struct stunicast_conn *c) stunicast_cancel(struct stunicast_conn *c)
{ {
ctimer_stop(&c->t); ctimer_stop(&c->t);
if(c->buf != NULL) {
queuebuf_free(c->buf);
c->buf = NULL;
}
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @} */ /** @} */