[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30653 - in gnunet/src: include multicast psycstore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30653 - in gnunet/src: include multicast psycstore |
Date: |
Sun, 10 Nov 2013 00:12:19 +0100 |
Author: tg
Date: 2013-11-10 00:12:19 +0100 (Sun, 10 Nov 2013)
New Revision: 30653
Modified:
gnunet/src/include/gnunet_protocols.h
gnunet/src/multicast/multicast_api.c
gnunet/src/psycstore/psycstore_api.c
Log:
log msg and comment fixes
Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h 2013-11-09 23:12:16 UTC (rev
30652)
+++ gnunet/src/include/gnunet_protocols.h 2013-11-09 23:12:19 UTC (rev
30653)
@@ -2172,12 +2172,12 @@
#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_REGISTER 730
/**
- * Client -> Server meessage to reject/hangup a call
+ * Client -> Server message to reject/hangup a call
*/
#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICK_UP 731
/**
- * Client -> Server meessage to reject/hangup a call
+ * Client -> Server message to reject/hangup a call
*/
#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP 732
Modified: gnunet/src/multicast/multicast_api.c
===================================================================
--- gnunet/src/multicast/multicast_api.c 2013-11-09 23:12:16 UTC (rev
30652)
+++ gnunet/src/multicast/multicast_api.c 2013-11-09 23:12:19 UTC (rev
30653)
@@ -383,7 +383,7 @@
msg->message_id = mh->message_id;
msg->group_generation = mh->group_generation;
- /* FIXME: add fragment ID and signature in the service */
+ /* FIXME: add fragment ID and signature in the service instead of here */
msg->fragment_id = orig->next_fragment_id++;
msg->fragment_offset = mh->fragment_offset;
mh->fragment_offset += buf_size;
Modified: gnunet/src/psycstore/psycstore_api.c
===================================================================
--- gnunet/src/psycstore/psycstore_api.c 2013-11-09 23:12:16 UTC (rev
30652)
+++ gnunet/src/psycstore/psycstore_api.c 2013-11-09 23:12:19 UTC (rev
30653)
@@ -254,7 +254,7 @@
return;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received message of type %d from PSYCstore service\n",
+ "Received message of type %d from PSYCstore service.\n",
ntohs (msg->type));
uint16_t size = ntohs (msg->size);
uint16_t type = ntohs (msg->type);
@@ -287,13 +287,16 @@
op = find_op_by_id (h, ntohl (opres->op_id));
if (NULL == op)
{
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "Received result message (type %d) "
- "with an unknown operation ID: %ld\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "No callback registered for operation with ID %ld.\n",
type, ntohl (opres->op_id));
}
else
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received result message (type %d) with operation ID: %ld\n",
+ type, op->op_id);
+
GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, op);
if (NULL != op->res_cb)
{
@@ -338,10 +341,9 @@
op = find_op_by_id (h, ntohl (cres->op_id));
if (NULL == op)
{
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "Received counters result message (type %d) "
- "with an unknown operation ID: %ld\n",
- ntohl (cres->op_id));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "No callback registered for operation with ID %ld.\n",
+ type, ntohl (cres->op_id));
}
else
{
@@ -387,9 +389,8 @@
op = find_op_by_id (h, ntohl (fres->op_id));
if (NULL == op)
{
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "Received fragment result message (type %d) "
- "with an unknown operation ID: %ld\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "No callback registered for operation with ID %ld.\n",
type, ntohl (fres->op_id));
}
else
@@ -429,9 +430,8 @@
op = find_op_by_id (h, ntohl (sres->op_id));
if (NULL == op)
{
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "Received state result message (type %d) "
- "with an unknown operation ID: %ld\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "No callback registered for operation with ID %ld.\n",
type, ntohl (sres->op_id));
}
else
@@ -479,8 +479,8 @@
return 0;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending message of type %d to PSYCstore service\n",
- ntohs (op->msg->type));
+ "Sending message of type %d to PSYCstore service. ID: %u\n",
+ ntohs (op->msg->type), op->op_id);
memcpy (buf, op->msg, ret);
GNUNET_CONTAINER_DLL_remove (h->transmit_head, h->transmit_tail, op);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30653 - in gnunet/src: include multicast psycstore,
gnunet <=