[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34609 - gnunet/src/cadet
From: |
gnunet |
Subject: |
[GNUnet-SVN] r34609 - gnunet/src/cadet |
Date: |
Mon, 15 Dec 2014 08:18:18 +0100 |
Author: bartpolot
Date: 2014-12-15 08:18:18 +0100 (Mon, 15 Dec 2014)
New Revision: 34609
Modified:
gnunet/src/cadet/gnunet-service-cadet_connection.c
Log:
- more debug, eliminate bogus assertions
Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c 2014-12-15 07:18:17 UTC
(rev 34608)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c 2014-12-15 07:18:18 UTC
(rev 34609)
@@ -855,7 +855,7 @@
/**
* Send a notification that a connection is broken, when a connection
- * isn't even known to the local peer.
+ * isn't even known to the local peer or soon to be destroyed.
*
* @param connection_id Connection ID.
* @param id1 Peer that has disconnected, probably local peer.
@@ -1333,6 +1333,8 @@
/* If dest, salvage queued traffic. */
if (GCC_is_origin (c, GNUNET_NO) && 0 < c->bck_fc.queue_n)
{
+ send_broken_unknown (&c->id, &my_full_id, NULL,
+ GCP_get_id( get_prev_hop (c)));
resend_messages_and_destroy (c, GNUNET_NO);
return;
}
@@ -1372,6 +1374,8 @@
/* If dest, salvage queued traffic. */
if (GCC_is_origin (c, GNUNET_YES) && 0 < c->fwd_fc.queue_n)
{
+ send_broken_unknown (&c->id, &my_full_id, NULL,
+ GCP_get_id( get_next_hop (c)));
resend_messages_and_destroy (c, GNUNET_YES);
return;
}
@@ -1485,8 +1489,6 @@
peer = get_next_hop (c);
if (GNUNET_OK != GCP_remove_connection (peer, c))
{
- GNUNET_assert (CADET_CONNECTION_NEW == c->state
- || CADET_CONNECTION_DESTROYED <= c->state);
LOG (GNUNET_ERROR_TYPE_DEBUG, " cstate: %u\n", c->state);
if (NULL != c->t) GCT_debug (c->t, GNUNET_ERROR_TYPE_DEBUG);
}
@@ -1494,8 +1496,6 @@
peer = get_prev_hop (c);
if (GNUNET_OK != GCP_remove_connection (peer, c))
{
- GNUNET_assert (CADET_CONNECTION_NEW == c->state
- || CADET_CONNECTION_DESTROYED <= c->state);
LOG (GNUNET_ERROR_TYPE_DEBUG, " cstate: %u\n", c->state);
if (NULL != c->t) GCT_debug (c->t, GNUNET_ERROR_TYPE_DEBUG);
}
@@ -1589,7 +1589,8 @@
c = conn->path->c;
conn->destroy = GNUNET_NO;
conn->path->c = conn;
- LOG (GNUNET_ERROR_TYPE_DEBUG, " found one\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " found duplicate of %s\n", GCC_2s (conn));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " duplicate: %s\n", GCC_2s (c));
GCC_debug (c, GNUNET_ERROR_TYPE_DEBUG);
if (CADET_CONNECTION_READY == c->state)
{
@@ -1605,7 +1606,10 @@
return GNUNET_YES;
}
else
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " %s has no duplicates\n", GCC_2s (conn));
return GNUNET_NO;
+ }
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34609 - gnunet/src/cadet,
gnunet <=