projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
41ff212
)
- reorder shutdown
author
Bart Polot
<bart@net.in.tum.de>
Fri, 15 Nov 2013 09:53:00 +0000
(09:53 +0000)
committer
Bart Polot
<bart@net.in.tum.de>
Fri, 15 Nov 2013 09:53:00 +0000
(09:53 +0000)
src/mesh/gnunet-service-mesh_peer.c
patch
|
blob
|
history
diff --git
a/src/mesh/gnunet-service-mesh_peer.c
b/src/mesh/gnunet-service-mesh_peer.c
index 0d0480c32957497f3805e40e12d062e443777353..3768da895ca7f9f915351fe3a792bcf0904a7a16 100644
(file)
--- a/
src/mesh/gnunet-service-mesh_peer.c
+++ b/
src/mesh/gnunet-service-mesh_peer.c
@@
-277,28
+277,29
@@
core_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
static void
core_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
static void
core_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
- struct MeshPeer *p
i
;
+ struct MeshPeer *p;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Peer disconnected\n");
LOG (GNUNET_ERROR_TYPE_DEBUG, "Peer disconnected\n");
- p
i
= GNUNET_CONTAINER_multipeermap_get (peers, peer);
- if (NULL == p
i
)
+ p = GNUNET_CONTAINER_multipeermap_get (peers, peer);
+ if (NULL == p)
{
GNUNET_break (0);
return;
}
{
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 (p
i
->core_transmit);
- p
i
->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;
GNUNET_STATISTICS_update (stats, "# peers", -1, GNUNET_NO);
return;
@@
-1599,7
+1600,7
@@
GMP_remove_connection (struct MeshPeer *peer,
if (NULL == peer || NULL == peer->connections)
{
GNUNET_break (0);
if (NULL == peer || NULL == peer->connections)
{
GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_
DEBU
G,
+ LOG (GNUNET_ERROR_TYPE_
WARNIN
G,
"Peer %s is not a neighbor!\n",
GMP_2s (peer));
return GNUNET_SYSERR;
"Peer %s is not a neighbor!\n",
GMP_2s (peer));
return GNUNET_SYSERR;