From 5add96019deec64775c8229e99dce6fa6d4f8728 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 10 Oct 2011 12:31:57 +0000 Subject: [PATCH] fixes --- src/core/gnunet-service-core_kx.c | 2 +- src/core/gnunet-service-core_neighbours.c | 6 +++--- src/core/gnunet-service-core_sessions.c | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index ba3ab87b9..8daf49826 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c @@ -590,7 +590,6 @@ process_hello (void *cls, const struct GNUNET_PeerIdentity *peer, 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 @@ process_hello (void *cls, const struct GNUNET_PeerIdentity *peer, 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)) diff --git a/src/core/gnunet-service-core_neighbours.c b/src/core/gnunet-service-core_neighbours.c index 3603fc073..60ce0e512 100644 --- a/src/core/gnunet-service-core_neighbours.c +++ b/src/core/gnunet-service-core_neighbours.c @@ -459,9 +459,9 @@ GSC_NEIGHBOURS_transmit (const struct GNUNET_PeerIdentity *target, 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); } diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c index 4a3fc1e87..a1b40129c 100644 --- a/src/core/gnunet-service-core_sessions.c +++ b/src/core/gnunet-service-core_sessions.c @@ -444,10 +444,10 @@ try_transmission (struct Session *session) 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 @@ GSC_SESSIONS_solicit (const struct GNUNET_PeerIdentity *pid) struct Session *session; session = find_session (pid); + if (NULL == session) + return; session->ready_to_transmit = GNUNET_YES; try_transmission (session); } -- 2.25.1