From b548f49cfae30fbea2c0fd720dc7dfb544b856c0 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Mon, 21 Jul 2014 09:52:18 +0000 Subject: [PATCH] - more debug info on buildbots --- src/cadet/gnunet-service-cadet_channel.c | 1 + src/cadet/gnunet-service-cadet_connection.c | 2 ++ src/cadet/gnunet-service-cadet_tunnel.c | 15 ++++++++------- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c index f7d2ed860..0aa2b03db 100644 --- a/src/cadet/gnunet-service-cadet_channel.c +++ b/src/cadet/gnunet-service-cadet_channel.c @@ -2384,6 +2384,7 @@ GCCH_send_prebuilt_message (const struct GNUNET_MessageHeader *message, if (NULL == chq->tq) { GNUNET_break (0); + GCT_debug (ch->t, GNUNET_ERROR_TYPE_ERROR); GNUNET_free (chq); chq = NULL; return; diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c index 397d4d2ff..9d2583d5f 100644 --- a/src/cadet/gnunet-service-cadet_connection.c +++ b/src/cadet/gnunet-service-cadet_connection.c @@ -956,6 +956,7 @@ connection_maintain (struct CadetConnection *c, int fwd) if (NULL == c->t) { GNUNET_break (0); + GCC_debug (c, GNUNET_ERROR_TYPE_ERROR); return; } @@ -1832,6 +1833,7 @@ GCC_handle_broken (void* cls, { /* A terminal connection should not have 't' set to NULL. */ GNUNET_break (0); + GCC_debug (c, GNUNET_ERROR_TYPE_ERROR); return GNUNET_OK; } neighbor = get_hop (c, !fwd); diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c index 6e5137925..e0f8567e7 100644 --- a/src/cadet/gnunet-service-cadet_tunnel.c +++ b/src/cadet/gnunet-service-cadet_tunnel.c @@ -1269,12 +1269,12 @@ send_kx (struct CadetTunnel *t, /* Must have a connection. */ if (NULL == t->connection_head && CADET_TUNNEL_SEARCHING != t->cstate) { - LOG (GNUNET_ERROR_TYPE_WARNING, "\n\n\n"); + LOG (GNUNET_ERROR_TYPE_ERROR, "\n\n\n"); GNUNET_break (0); - LOG (GNUNET_ERROR_TYPE_WARNING, "sending %s\n", GC_m2s (type)); - GCT_debug (t, GNUNET_ERROR_TYPE_WARNING); - GCP_debug (t->peer, GNUNET_ERROR_TYPE_WARNING); - LOG (GNUNET_ERROR_TYPE_WARNING, "\n\n\n"); + LOG (GNUNET_ERROR_TYPE_ERROR, "no connection, sending %s\n", GC_m2s (type)); + GCT_debug (t, GNUNET_ERROR_TYPE_ERROR); + GCP_debug (t->peer, GNUNET_ERROR_TYPE_ERROR); + LOG (GNUNET_ERROR_TYPE_ERROR, "\n\n\n"); return; } @@ -1286,7 +1286,7 @@ send_kx (struct CadetTunnel *t, { GNUNET_break (GNUNET_SCHEDULER_NO_TASK != t->destroy_task || CADET_TUNNEL_READY != t->cstate); - GCT_debug (t, GNUNET_ERROR_TYPE_WARNING); + GCT_debug (t, GNUNET_ERROR_TYPE_ERROR); return; } switch (type) @@ -1878,8 +1878,9 @@ handle_ping (struct CadetTunnel *t, t_decrypt (t, &res.target, &msg->target, ping_encryption_size (), msg->iv); if (0 != memcmp (&my_full_id, &res.target, sizeof (my_full_id))) { + /* probably peer hasn't got our new EPHM yet and derived the wrong keys */ GNUNET_STATISTICS_update (stats, "# malformed PINGs", 1, GNUNET_NO); - LOG (GNUNET_ERROR_TYPE_WARNING, " malformed PING on %s\n", GCT_2s (t)); + LOG (GNUNET_ERROR_TYPE_INFO, " malformed PING on %s\n", GCT_2s (t)); LOG (GNUNET_ERROR_TYPE_DEBUG, " e got %u\n", msg->nonce); LOG (GNUNET_ERROR_TYPE_DEBUG, " e towards %s\n", GNUNET_i2s (&msg->target)); LOG (GNUNET_ERROR_TYPE_DEBUG, " got %u\n", res.nonce); -- 2.25.1