[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30713 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30713 - gnunet/src/mesh |
Date: |
Fri, 15 Nov 2013 10:53:01 +0100 |
Author: bartpolot
Date: 2013-11-15 10:53:00 +0100 (Fri, 15 Nov 2013)
New Revision: 30713
Modified:
gnunet/src/mesh/gnunet-service-mesh_peer.c
Log:
- reorder shutdown
Modified: gnunet/src/mesh/gnunet-service-mesh_peer.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_peer.c 2013-11-15 09:52:11 UTC (rev
30712)
+++ gnunet/src/mesh/gnunet-service-mesh_peer.c 2013-11-15 09:53:00 UTC (rev
30713)
@@ -277,28 +277,29 @@
static void
core_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
- struct MeshPeer *pi;
+ struct MeshPeer *p;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Peer disconnected\n");
- pi = GNUNET_CONTAINER_multipeermap_get (peers, peer);
- if (NULL == pi)
+ p = GNUNET_CONTAINER_multipeermap_get (peers, peer);
+ if (NULL == p)
{
GNUNET_break (0);
return;
}
+ if (myid == p->id)
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " (self)\n");
+ else
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " %s\n", GMP_2s (p));
- GNUNET_CONTAINER_multihashmap_iterate (pi->connections, ¬ify_broken, pi);
- GNUNET_CONTAINER_multihashmap_destroy (pi->connections);
- pi->connections = NULL;
- if (NULL != pi->core_transmit)
+
+ GNUNET_CONTAINER_multihashmap_iterate (p->connections, ¬ify_broken, p);
+ GNUNET_CONTAINER_multihashmap_destroy (p->connections);
+ p->connections = NULL;
+ if (NULL != p->core_transmit)
{
- GNUNET_CORE_notify_transmit_ready_cancel (pi->core_transmit);
- pi->core_transmit = NULL;
+ GNUNET_CORE_notify_transmit_ready_cancel (p->core_transmit);
+ p->core_transmit = NULL;
}
- if (myid == pi->id)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, " (self)\n");
- }
GNUNET_STATISTICS_update (stats, "# peers", -1, GNUNET_NO);
return;
@@ -1599,7 +1600,7 @@
if (NULL == peer || NULL == peer->connections)
{
GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_WARNING,
"Peer %s is not a neighbor!\n",
GMP_2s (peer));
return GNUNET_SYSERR;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30713 - gnunet/src/mesh,
gnunet <=