From c6a43333d2bc197e21bc47603b2c4fb7ae6c9bf1 Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Tue, 8 Jan 2008 07:58:49 +0000
Subject: [PATCH] Call the timeout function only if it is non-NULL

---
 core/net/rime/ruc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/net/rime/ruc.c b/core/net/rime/ruc.c
index 8cd5d6594..6fcc23e38 100644
--- a/core/net/rime/ruc.c
+++ b/core/net/rime/ruc.c
@@ -34,7 +34,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ruc.c,v 1.15 2007/12/16 14:33:32 adamdunkels Exp $
+ * $Id: ruc.c,v 1.16 2008/01/08 07:58:49 adamdunkels Exp $
  */
 
 /**
@@ -73,7 +73,7 @@ sent_by_suc(struct suc_conn *suc)
 {
   struct ruc_conn *c = (struct ruc_conn *)suc;
 
-  if(c->rxmit) {
+  if(c->rxmit != 0) {
     RIMESTATS_ADD(rexmit);
     PRINTF("%d.%d: ruc: packet %u resent %u\n",
 	   rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
@@ -84,7 +84,9 @@ sent_by_suc(struct suc_conn *suc)
   if(c->rxmit >= c->max_rxmit) {
     RIMESTATS_ADD(timedout);
     suc_cancel(&c->c);
-    c->u->timedout(c, suc_receiver(&c->c), c->rxmit);
+    if(c->u->timedout) {
+      c->u->timedout(c, suc_receiver(&c->c), c->rxmit);
+    }
     PRINTF("%d.%d: ruc: packet %d timed out\n",
 	   rimeaddr_node_addr.u8[0],rimeaddr_node_addr.u8[1],
 	   c->sndnxt);