[GNUnet-SVN] r29435 - msh/src

[gnunet]

Author: harsha
Date: 2013-09-20 15:43:59 +0200 (Fri, 20 Sep 2013)
New Revision: 29435

Modified:
   msh/src/mshd.c
Log:
- cleanup leaking connections


Modified: msh/src/mshd.c
===================================================================
--- msh/src/mshd.c      2013-09-20 13:31:48 UTC (rev 29434)
+++ msh/src/mshd.c      2013-09-20 13:43:59 UTC (rev 29435)
@@ -592,10 +592,12 @@
  * @param ctx the context
  */
 static void
-cleanup_verifiyaddressctx (struct VerifyAddressesCtx *ctx)
+cleanup_verifyaddressctx (struct VerifyAddressesCtx *ctx)
 {
   if (GNUNET_SCHEDULER_NO_TASK != ctx->close_task)
     GNUNET_SCHEDULER_cancel (ctx->close_task);
+  if (NULL != ctx->conn)
+    GNUNET_CONNECTION_destroy (ctx->conn);
   GNUNET_CONTAINER_DLL_remove (vactx_head, vactx_tail, ctx);  
   GNUNET_free (ctx);  
 }
@@ -619,7 +621,7 @@
   atask = GNUNET_SCHEDULER_NO_TASK;
   while (NULL != (ctx = vactx_head))
   {
-    cleanup_verifiyaddressctx (ctx);
+    cleanup_verifyaddressctx (ctx);
   }
   for (cnt = 0; cnt < rwidth; cnt++)
     instance_address_info_destroy (riainfos[cnt]);
@@ -660,7 +662,7 @@
   bitmap_set (bitmap, off, 1);
   addressmap_add (addrmap, instance_address_info_get_rank (ctx->iainfo),
                   ctx->port, ctx->ip);
-  cleanup_verifiyaddressctx (ctx);
+  cleanup_verifyaddressctx (ctx);
 }
 
 
@@ -707,15 +709,15 @@
     return rsize;
   case VERIFY_ADDRESS_CTX_CLOSE:
     ctx->close_task = GNUNET_SCHEDULER_add_now (&conn_close_task, ctx);
+    GNUNET_CONNECTION_destroy (ctx->conn);
+    ctx->conn = NULL;
     return 0;
   default:
     GNUNET_assert (0);
   }
 
  clo_ret:
-  GNUNET_CONTAINER_DLL_remove (vactx_head, vactx_tail, ctx);
-  GNUNET_CONNECTION_destroy (ctx->conn);
-  GNUNET_free (ctx);
+  cleanup_verifyaddressctx (ctx);
   return size;
 }