[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30758 - gnunet/src/conversation
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30758 - gnunet/src/conversation |
Date: |
Sat, 16 Nov 2013 20:56:12 +0100 |
Author: grothoff
Date: 2013-11-16 20:56:12 +0100 (Sat, 16 Nov 2013)
New Revision: 30758
Modified:
gnunet/src/conversation/conversation_api.c
gnunet/src/conversation/conversation_api_call.c
gnunet/src/conversation/gnunet-service-conversation.c
Log:
-more debug messages
Modified: gnunet/src/conversation/conversation_api.c
===================================================================
--- gnunet/src/conversation/conversation_api.c 2013-11-16 19:55:51 UTC (rev
30757)
+++ gnunet/src/conversation/conversation_api.c 2013-11-16 19:56:12 UTC (rev
30758)
@@ -553,10 +553,8 @@
{
struct GNUNET_CONVERSATION_Phone *phone = cls;
- GNUNET_break (0);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Internal MQ error %d\n"),
- error);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Connection to conversation service lost, trying to
reconnect\n"));
reconnect_phone (phone);
}
Modified: gnunet/src/conversation/conversation_api_call.c
===================================================================
--- gnunet/src/conversation/conversation_api_call.c 2013-11-16 19:55:51 UTC
(rev 30757)
+++ gnunet/src/conversation/conversation_api_call.c 2013-11-16 19:56:12 UTC
(rev 30758)
@@ -461,10 +461,8 @@
GNUNET_CONVERSATION_call_stop (call);
return;
}
- GNUNET_break (0);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Internal MQ error %d\n"),
- error);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Connection to conversation service lost, trying to
reconnect\n"));
reconnect_call (call);
}
Modified: gnunet/src/conversation/gnunet-service-conversation.c
===================================================================
--- gnunet/src/conversation/gnunet-service-conversation.c 2013-11-16
19:55:51 UTC (rev 30757)
+++ gnunet/src/conversation/gnunet-service-conversation.c 2013-11-16
19:56:12 UTC (rev 30758)
@@ -369,6 +369,8 @@
struct Line *line = ch->line;
struct GNUNET_MESH_Channel *t;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Destroying mesh channels\n");
if (NULL != ch->reliable_mq)
{
GNUNET_MQ_destroy (ch->reliable_mq);
@@ -1322,7 +1324,11 @@
struct ClientPhoneHangupMessage hup;
if (NULL == ch)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Mesh channel destroyed, but channel is unknown to us\n");
return;
+ }
line = ch->line;
if (ch->channel_unreliable == channel)
{
@@ -1332,10 +1338,15 @@
ch->unreliable_mth = NULL;
}
ch->channel_unreliable = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Unreliable channel destroyed\n");
return;
}
if (ch->channel_reliable != channel)
+ {
+ /* recursive call, I'm the one destroying 'ch' right now */
return;
+ }
ch->channel_reliable = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30758 - gnunet/src/conversation,
gnunet <=