From a03e899c278c8777f9f3741521b460d681fe1b2c Mon Sep 17 00:00:00 2001 From: nvt-se Date: Fri, 18 Dec 2009 14:57:15 +0000 Subject: [PATCH] Signal the result of transmissions attempts made in the mesh module. Patch from Moritz Struebe --- core/net/rime/mesh.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/net/rime/mesh.c b/core/net/rime/mesh.c index 22fe94eaf..5547f1f60 100644 --- a/core/net/rime/mesh.c +++ b/core/net/rime/mesh.c @@ -33,7 +33,7 @@ * * This file is part of the Contiki operating system. * - * $Id: mesh.c,v 1.19 2009/11/08 19:40:17 adamdunkels Exp $ + * $Id: mesh.c,v 1.20 2009/12/18 14:57:15 nvt-se Exp $ */ /** @@ -109,7 +109,11 @@ found_route(struct route_discovery_conn *rdc, const rimeaddr_t *dest) queuebuf_to_packetbuf(c->queued_data); queuebuf_free(c->queued_data); c->queued_data = NULL; - multihop_send(&c->multihop, dest); + if(multihop_send(&c->multihop, dest)) { + c->cb->sent(c); + } else { + c->cb->timedout(c); + } } } /*---------------------------------------------------------------------------*/ @@ -177,7 +181,7 @@ mesh_send(struct mesh_conn *c, const rimeaddr_t *to) PACKET_TIMEOUT); return 0; } - + c->cb->sent(c); return 1; } /*---------------------------------------------------------------------------*/