[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17324 - gnunet/src/core
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17324 - gnunet/src/core |
Date: |
Mon, 10 Oct 2011 14:31:58 +0200 |
Author: grothoff
Date: 2011-10-10 14:31:57 +0200 (Mon, 10 Oct 2011)
New Revision: 17324
Modified:
gnunet/src/core/gnunet-service-core_kx.c
gnunet/src/core/gnunet-service-core_neighbours.c
gnunet/src/core/gnunet-service-core_sessions.c
Log:
fixes
Modified: gnunet/src/core/gnunet-service-core_kx.c
===================================================================
--- gnunet/src/core/gnunet-service-core_kx.c 2011-10-10 11:54:09 UTC (rev
17323)
+++ gnunet/src/core/gnunet-service-core_kx.c 2011-10-10 12:31:57 UTC (rev
17324)
@@ -590,7 +590,6 @@
struct GSC_KeyExchangeInfo *kx = cls;
struct SetKeyMessage *skm;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == kx->retry_set_key_task);
if (err_msg != NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -623,6 +622,7 @@
GNUNET_break (0);
return;
}
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == kx->retry_set_key_task);
kx->public_key =
GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
if (GNUNET_OK != GNUNET_HELLO_get_key (hello, kx->public_key))
Modified: gnunet/src/core/gnunet-service-core_neighbours.c
===================================================================
--- gnunet/src/core/gnunet-service-core_neighbours.c 2011-10-10 11:54:09 UTC
(rev 17323)
+++ gnunet/src/core/gnunet-service-core_neighbours.c 2011-10-10 12:31:57 UTC
(rev 17324)
@@ -459,9 +459,9 @@
me->deadline = GNUNET_TIME_relative_to_absolute (timeout);
me->size = msize;
memcpy (&me[1], msg, msize);
- GNUNET_CONTAINER_DLL_insert (n->message_head,
- n->message_tail,
- me);
+ GNUNET_CONTAINER_DLL_insert_tail (n->message_head,
+ n->message_tail,
+ me);
process_queue (n);
}
Modified: gnunet/src/core/gnunet-service-core_sessions.c
===================================================================
--- gnunet/src/core/gnunet-service-core_sessions.c 2011-10-10 11:54:09 UTC
(rev 17323)
+++ gnunet/src/core/gnunet-service-core_sessions.c 2011-10-10 12:31:57 UTC
(rev 17324)
@@ -444,10 +444,10 @@
min_deadline = GNUNET_TIME_UNIT_FOREVER_ABS;
/* check 'ready' messages */
pos = session->sme_head;
- GNUNET_assert (pos->size < GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
while ( (NULL != pos) &&
(msize + pos->size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE) )
{
+ GNUNET_assert (pos->size < GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
msize += pos->size;
min_deadline = GNUNET_TIME_absolute_min (min_deadline,
pos->deadline);
@@ -565,6 +565,8 @@
struct Session *session;
session = find_session (pid);
+ if (NULL == session)
+ return;
session->ready_to_transmit = GNUNET_YES;
try_transmission (session);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17324 - gnunet/src/core,
gnunet <=