[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35638 - gnunet/src/cadet
From: |
gnunet |
Subject: |
[GNUnet-SVN] r35638 - gnunet/src/cadet |
Date: |
Mon, 27 Apr 2015 21:15:38 +0200 |
Author: bartpolot
Date: 2015-04-27 21:15:38 +0200 (Mon, 27 Apr 2015)
New Revision: 35638
Modified:
gnunet/src/cadet/gnunet-service-cadet_connection.c
gnunet/src/cadet/gnunet-service-cadet_peer.c
Log:
- use ax as payload
Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c 2015-04-27 19:15:36 UTC
(rev 35637)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c 2015-04-27 19:15:38 UTC
(rev 35638)
@@ -601,7 +601,8 @@
}
GNUNET_free (q);
}
- else if (type == GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED)
+ else if (type == GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED
+ || type == GNUNET_MESSAGE_TYPE_CADET_AX)
{
/* If NULL == q and ENCRYPTED == type, message must have been ch_mngmnt */
forced = GNUNET_YES;
@@ -640,6 +641,7 @@
break;
case GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED:
+ case GNUNET_MESSAGE_TYPE_CADET_AX:
if (GNUNET_YES == sent)
{
GNUNET_assert (NULL != q);
@@ -3209,7 +3211,8 @@
GNUNET_break (0);
LOG (GNUNET_ERROR_TYPE_DEBUG, "queue full: %u/%u\n",
fc->queue_n, fc->queue_max);
- if (GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED == type)
+ if (GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED == type
+ || GNUNET_MESSAGE_TYPE_CADET_AX == type)
{
fc->queue_n--;
}
Modified: gnunet/src/cadet/gnunet-service-cadet_peer.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_peer.c 2015-04-27 19:15:36 UTC
(rev 35637)
+++ gnunet/src/cadet/gnunet-service-cadet_peer.c 2015-04-27 19:15:38 UTC
(rev 35638)
@@ -676,7 +676,8 @@
}
/* Bulky payload has lower priority, control traffic has higher. */
- if (GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED == q->type)
+ if (GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED == q->type
+ || GNUNET_MESSAGE_TYPE_CADET_AX == q->type)
return low;
else
return high;
@@ -1568,6 +1569,8 @@
case GNUNET_MESSAGE_TYPE_CADET_KX:
case GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED:
+ case GNUNET_MESSAGE_TYPE_CADET_AX:
+ case GNUNET_MESSAGE_TYPE_CADET_AX_KX:
msg = (struct GNUNET_MessageHeader *) q->cls;
dest = GCP_queue_destroy (q, GNUNET_NO, GNUNET_NO, 0);
if (GNUNET_YES == dest)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35638 - gnunet/src/cadet,
gnunet <=