[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31396 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31396 - gnunet/src/mesh |
Date: |
Mon, 16 Dec 2013 10:25:18 +0100 |
Author: bartpolot
Date: 2013-12-16 10:25:18 +0100 (Mon, 16 Dec 2013)
New Revision: 31396
Modified:
gnunet/src/mesh/gnunet-service-mesh_connection.c
gnunet/src/mesh/gnunet-service-mesh_peer.c
gnunet/src/mesh/gnunet-service-mesh_tunnel.c
Log:
- various minor fixes and breaks
Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c 2013-12-15 17:23:48 UTC
(rev 31395)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c 2013-12-16 09:25:18 UTC
(rev 31396)
@@ -1151,7 +1151,7 @@
if (GMC_is_origin (c, GNUNET_YES))
GNUNET_STATISTICS_update (stats, "# local bad paths", 1, GNUNET_NO);
GNUNET_STATISTICS_update (stats, "# bad paths", 1, GNUNET_NO);
-
+
LOG (GNUNET_ERROR_TYPE_DEBUG, " register neighbors failed\n");
LOG (GNUNET_ERROR_TYPE_DEBUG, " prev: %s, %d\n",
GMP_2s (prev_peer), GMP_is_neighbor (prev_peer));
@@ -1292,7 +1292,7 @@
}
LOG (GNUNET_ERROR_TYPE_DEBUG, " Own position: %u\n", own_pos);
GMP_add_path_to_all (path, GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " Creating connection\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " Creating connection\n");
c = GMC_new (cid, NULL, path_duplicate (path), own_pos);
if (NULL == c)
{
@@ -2204,20 +2204,17 @@
c = GNUNET_new (struct MeshConnection);
c->id = *cid;
- GNUNET_CONTAINER_multihashmap_put (connections, &c->id, c,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (connections,
+ &c->id, c,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
fc_init (&c->fwd_fc);
fc_init (&c->bck_fc);
c->fwd_fc.c = c;
c->bck_fc.c = c;
c->t = t;
- if (own_pos > p->length - 1)
- {
- GNUNET_break (0);
- GMC_destroy (c);
- return NULL;
- }
+ GNUNET_assert (own_pos <= p->length - 1);
c->own_pos = own_pos;
c->path = p;
Modified: gnunet/src/mesh/gnunet-service-mesh_peer.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_peer.c 2013-12-15 17:23:48 UTC (rev
31395)
+++ gnunet/src/mesh/gnunet-service-mesh_peer.c 2013-12-16 09:25:18 UTC (rev
31396)
@@ -1325,7 +1325,7 @@
*
* Re-running the DHT GET should give core time to callback.
*/
- GNUNET_break(0);
+ GNUNET_break (0);
rerun_search = GNUNET_YES;
}
else
Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.c 2013-12-15 17:23:48 UTC
(rev 31395)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.c 2013-12-16 09:25:18 UTC
(rev 31396)
@@ -2001,7 +2001,7 @@
}
if (own_pos > p->length - 1)
{
- GNUNET_break (0);
+ GNUNET_break_op (0);
return NULL;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31396 - gnunet/src/mesh,
gnunet <=