diff options
Diffstat (limited to 'src/core/core_api.c')
| -rw-r--r-- | src/core/core_api.c | 1640 |
1 files changed, 769 insertions, 871 deletions
diff --git a/src/core/core_api.c b/src/core/core_api.c index 7f7928fd38..c6fcc0b470 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c @@ -116,7 +116,7 @@ struct PeerRecord * SendMessageRequest ID generator for this peer. */ uint16_t smr_id_gen; - + }; @@ -143,7 +143,7 @@ struct ControlMessage * Function to run after transmission failed/succeeded. */ GNUNET_CORE_ControlContinuation cont; - + /** * Closure for 'cont'. */ @@ -190,9 +190,9 @@ struct GNUNET_CORE_Handle /** * Function to call whenever we're notified about a peer changing status. - */ + */ GNUNET_CORE_PeerStatusEventHandler status_events; - + /** * Function to call whenever we receive an inbound message. */ @@ -371,8 +371,7 @@ struct GNUNET_CORE_TransmitHandle * * @param h our handle to the core service */ -static void -reconnect (struct GNUNET_CORE_Handle *h); +static void reconnect (struct GNUNET_CORE_Handle *h); /** @@ -382,15 +381,14 @@ reconnect (struct GNUNET_CORE_Handle *h); * @param tc task context */ static void -reconnect_task (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GNUNET_CORE_Handle *h = cls; h->reconnect_task = GNUNET_SCHEDULER_NO_TASK; #if DEBUG_CORE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Connecting to CORE service after delay\n"); + "Connecting to CORE service after delay\n"); #endif reconnect (h); } @@ -407,8 +405,7 @@ reconnect_task (void *cls, */ static int disconnect_and_free_peer_entry (void *cls, - const GNUNET_HashCode *key, - void *value) + const GNUNET_HashCode * key, void *value) { static struct GNUNET_BANDWIDTH_Value32NBO zero; struct GNUNET_CORE_Handle *h = cls; @@ -418,61 +415,47 @@ disconnect_and_free_peer_entry (void *cls, void *pcic_cls; if (pr->timeout_task != GNUNET_SCHEDULER_NO_TASK) - { - GNUNET_SCHEDULER_cancel (pr->timeout_task); - pr->timeout_task = GNUNET_SCHEDULER_NO_TASK; - } + { + GNUNET_SCHEDULER_cancel (pr->timeout_task); + pr->timeout_task = GNUNET_SCHEDULER_NO_TASK; + } if (pr->ntr_task != GNUNET_SCHEDULER_NO_TASK) - { - GNUNET_SCHEDULER_cancel (pr->ntr_task); - pr->ntr_task = GNUNET_SCHEDULER_NO_TASK; - } - if ( (pr->prev != NULL) || - (pr->next != NULL) || - (h->ready_peer_head == pr) ) - GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, - h->ready_peer_tail, - pr); + { + GNUNET_SCHEDULER_cancel (pr->ntr_task); + pr->ntr_task = GNUNET_SCHEDULER_NO_TASK; + } + if ((pr->prev != NULL) || (pr->next != NULL) || (h->ready_peer_head == pr)) + GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, h->ready_peer_tail, pr); if (h->disconnects != NULL) - h->disconnects (h->cls, - &pr->peer); + h->disconnects (h->cls, &pr->peer); /* all requests should have been cancelled, clean up anyway, just in case */ GNUNET_break (pr->queue_size == 0); if (NULL != (pcic = pr->pcic)) - { - GNUNET_break (0); - pcic_cls = pr->pcic_cls; - GNUNET_CORE_peer_change_preference_cancel (pr->pcic_ptr); - pcic (pcic_cls, - &pr->peer, - zero, - 0, - GNUNET_TIME_UNIT_FOREVER_REL, - 0); - } + { + GNUNET_break (0); + pcic_cls = pr->pcic_cls; + GNUNET_CORE_peer_change_preference_cancel (pr->pcic_ptr); + pcic (pcic_cls, &pr->peer, zero, 0, GNUNET_TIME_UNIT_FOREVER_REL, 0); + } while (NULL != (th = pr->pending_head)) - { - GNUNET_break (0); - GNUNET_CONTAINER_DLL_remove (pr->pending_head, - pr->pending_tail, - th); - pr->queue_size--; - if (th->cm != NULL) - th->cm->th = NULL; - GNUNET_free (th); - } + { + GNUNET_break (0); + GNUNET_CONTAINER_DLL_remove (pr->pending_head, pr->pending_tail, th); + pr->queue_size--; + if (th->cm != NULL) + th->cm->th = NULL; + GNUNET_free (th); + } /* done with 'voluntary' cleanups, now on to normal freeing */ GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_remove (h->peers, - key, - pr)); + GNUNET_CONTAINER_multihashmap_remove (h->peers, key, pr)); GNUNET_assert (pr->pending_head == NULL); GNUNET_assert (pr->pending_tail == NULL); GNUNET_assert (pr->ch = h); GNUNET_assert (pr->queue_size == 0); GNUNET_assert (pr->timeout_task == GNUNET_SCHEDULER_NO_TASK); GNUNET_assert (pr->ntr_task == GNUNET_SCHEDULER_NO_TASK); - GNUNET_free (pr); + GNUNET_free (pr); return GNUNET_YES; } @@ -491,41 +474,36 @@ reconnect_later (struct GNUNET_CORE_Handle *h) GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK); if (NULL != h->cth) - { - GNUNET_CLIENT_notify_transmit_ready_cancel (h->cth); - h->cth = NULL; - } + { + GNUNET_CLIENT_notify_transmit_ready_cancel (h->cth); + h->cth = NULL; + } if (h->client != NULL) - { - GNUNET_CLIENT_disconnect (h->client, GNUNET_NO); - h->client = NULL; - } + { + GNUNET_CLIENT_disconnect (h->client, GNUNET_NO); + h->client = NULL; + } h->currently_down = GNUNET_YES; GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK); h->reconnect_task = GNUNET_SCHEDULER_add_delayed (h->retry_backoff, - &reconnect_task, - h); + &reconnect_task, h); while (NULL != (cm = h->control_pending_head)) - { - GNUNET_CONTAINER_DLL_remove (h->control_pending_head, - h->control_pending_tail, - cm); - if (cm->th != NULL) - cm->th->cm = NULL; - if (cm->cont != NULL) - cm->cont (cm->cont_cls, GNUNET_NO); - GNUNET_free (cm); - } + { + GNUNET_CONTAINER_DLL_remove (h->control_pending_head, + h->control_pending_tail, cm); + if (cm->th != NULL) + cm->th->cm = NULL; + if (cm->cont != NULL) + cm->cont (cm->cont_cls, GNUNET_NO); + GNUNET_free (cm); + } GNUNET_CONTAINER_multihashmap_iterate (h->peers, - &disconnect_and_free_peer_entry, - h); - while (NULL != (pr = h->ready_peer_head)) - GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, - h->ready_peer_tail, - pr); + &disconnect_and_free_peer_entry, h); + while (NULL != (pr = h->ready_peer_head)) + GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, h->ready_peer_tail, pr); GNUNET_assert (h->control_pending_head == NULL); h->retry_backoff = GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS, - h->retry_backoff); + h->retry_backoff); h->retry_backoff = GNUNET_TIME_relative_multiply (h->retry_backoff, 2); } @@ -538,8 +516,7 @@ reconnect_later (struct GNUNET_CORE_Handle *h) * @param ignore_currently_down transmit message even if not initialized? */ static void -trigger_next_request (struct GNUNET_CORE_Handle *h, - int ignore_currently_down); +trigger_next_request (struct GNUNET_CORE_Handle *h, int ignore_currently_down); /** @@ -550,8 +527,7 @@ trigger_next_request (struct GNUNET_CORE_Handle *h, * @param tc context, can be NULL (!) */ static void -transmission_timeout (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc); +transmission_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); /** @@ -569,27 +545,27 @@ request_next_transmission (struct PeerRecord *pr) struct GNUNET_CORE_TransmitHandle *th; if (pr->timeout_task != GNUNET_SCHEDULER_NO_TASK) - { - GNUNET_SCHEDULER_cancel (pr->timeout_task); - pr->timeout_task = GNUNET_SCHEDULER_NO_TASK; - } + { + GNUNET_SCHEDULER_cancel (pr->timeout_task); + pr->timeout_task = GNUNET_SCHEDULER_NO_TASK; + } if (NULL == (th = pr->pending_head)) - { - trigger_next_request (h, GNUNET_NO); - return; - } + { + trigger_next_request (h, GNUNET_NO); + return; + } if (th->cm != NULL) - return; /* already done */ + return; /* already done */ GNUNET_assert (pr->prev == NULL); GNUNET_assert (pr->next == NULL); - pr->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining (th->timeout), - &transmission_timeout, - pr); - cm = GNUNET_malloc (sizeof (struct ControlMessage) + - sizeof (struct SendMessageRequest)); + pr->timeout_task = + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining + (th->timeout), &transmission_timeout, pr); + cm = GNUNET_malloc (sizeof (struct ControlMessage) + + sizeof (struct SendMessageRequest)); th->cm = cm; cm->th = th; - smr = (struct SendMessageRequest*) &cm[1]; + smr = (struct SendMessageRequest *) &cm[1]; smr->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_SEND_REQUEST); smr->header.size = htons (sizeof (struct SendMessageRequest)); smr->priority = htonl (th->priority); @@ -599,12 +575,11 @@ request_next_transmission (struct PeerRecord *pr) smr->size = htons (th->msize); smr->smr_id = htons (th->smr_id = pr->smr_id_gen++); GNUNET_CONTAINER_DLL_insert_tail (h->control_pending_head, - h->control_pending_tail, - cm); + h->control_pending_tail, cm); #if DEBUG_CORE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Adding SEND REQUEST for peer `%s' to message queue\n", - GNUNET_i2s (&pr->peer)); + "Adding SEND REQUEST for peer `%s' to message queue\n", + GNUNET_i2s (&pr->peer)); #endif trigger_next_request (h, GNUNET_NO); } @@ -618,33 +593,26 @@ request_next_transmission (struct PeerRecord *pr) * @param tc context, can be NULL (!) */ static void -transmission_timeout (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +transmission_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct PeerRecord *pr = cls; struct GNUNET_CORE_Handle *h = pr->ch; struct GNUNET_CORE_TransmitHandle *th; - + pr->timeout_task = GNUNET_SCHEDULER_NO_TASK; th = pr->pending_head; - GNUNET_CONTAINER_DLL_remove (pr->pending_head, - pr->pending_tail, - th); + GNUNET_CONTAINER_DLL_remove (pr->pending_head, pr->pending_tail, th); pr->queue_size--; - if ( (pr->prev != NULL) || - (pr->next != NULL) || - (pr == h->ready_peer_head) ) - { - /* the request that was 'approved' by core was - canceled before it could be transmitted; remove - us from the 'ready' list */ - GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, - h->ready_peer_tail, - pr); - } + if ((pr->prev != NULL) || (pr->next != NULL) || (pr == h->ready_peer_head)) + { + /* the request that was 'approved' by core was + * canceled before it could be transmitted; remove + * us from the 'ready' list */ + GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, h->ready_peer_tail, pr); + } #if DEBUG_CORE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Signalling timeout of request for transmission to CORE service\n"); + "Signalling timeout of request for transmission to CORE service\n"); #endif request_next_transmission (pr); GNUNET_assert (0 == th->get_message (th->get_message_cls, 0, NULL)); @@ -656,9 +624,7 @@ transmission_timeout (void *cls, * Transmit the next message to the core service. */ static size_t -transmit_message (void *cls, - size_t size, - void *buf) +transmit_message (void *cls, size_t size, void *buf) { struct GNUNET_CORE_Handle *h = cls; struct ControlMessage *cm; @@ -672,117 +638,108 @@ transmit_message (void *cls, GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK); h->cth = NULL; if (buf == NULL) - { + { #if DEBUG_CORE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Transmission failed, initiating reconnect\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Transmission failed, initiating reconnect\n"); #endif - reconnect_later (h); - return 0; - } + reconnect_later (h); + return 0; + } /* first check for control messages */ if (NULL != (cm = h->control_pending_head)) + { + hdr = (const struct GNUNET_MessageHeader *) &cm[1]; + msize = ntohs (hdr->size); + if (size < msize) { - hdr = (const struct GNUNET_MessageHeader*) &cm[1]; - msize = ntohs (hdr->size); - if (size < msize) - { - trigger_next_request (h, GNUNET_NO); - return 0; - } -#if DEBUG_CORE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Transmitting control message with %u bytes of type %u to core.\n", - (unsigned int) msize, - (unsigned int) ntohs (hdr->type)); -#endif - memcpy (buf, hdr, msize); - GNUNET_CONTAINER_DLL_remove (h->control_pending_head, - h->control_pending_tail, - cm); - if (cm->th != NULL) - cm->th->cm = NULL; - if (NULL != cm->cont) - cm->cont (cm->cont_cls, GNUNET_OK); - GNUNET_free (cm); trigger_next_request (h, GNUNET_NO); - return msize; + return 0; } +#if DEBUG_CORE + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Transmitting control message with %u bytes of type %u to core.\n", + (unsigned int) msize, (unsigned int) ntohs (hdr->type)); +#endif + memcpy (buf, hdr, msize); + GNUNET_CONTAINER_DLL_remove (h->control_pending_head, + h->control_pending_tail, cm); + if (cm->th != NULL) + cm->th->cm = NULL; + if (NULL != cm->cont) + cm->cont (cm->cont_cls, GNUNET_OK); + GNUNET_free (cm); + trigger_next_request (h, GNUNET_NO); + return msize; + } /* now check for 'ready' P2P messages */ if (NULL != (pr = h->ready_peer_head)) + { + GNUNET_assert (pr->pending_head != NULL); + th = pr->pending_head; + if (size < th->msize + sizeof (struct SendMessage)) + { + trigger_next_request (h, GNUNET_NO); + return 0; + } + GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, h->ready_peer_tail, pr); + GNUNET_CONTAINER_DLL_remove (pr->pending_head, pr->pending_tail, th); + pr->queue_size--; + if (pr->timeout_task != GNUNET_SCHEDULER_NO_TASK) { - GNUNET_assert (pr->pending_head != NULL); - th = pr->pending_head; - if (size < th->msize + sizeof (struct SendMessage)) - { - trigger_next_request (h, GNUNET_NO); - return 0; - } - GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, - h->ready_peer_tail, - pr); - GNUNET_CONTAINER_DLL_remove (pr->pending_head, - pr->pending_tail, - th); - pr->queue_size--; - if (pr->timeout_task != GNUNET_SCHEDULER_NO_TASK) - { - GNUNET_SCHEDULER_cancel (pr->timeout_task); - pr->timeout_task = GNUNET_SCHEDULER_NO_TASK; - } + GNUNET_SCHEDULER_cancel (pr->timeout_task); + pr->timeout_task = GNUNET_SCHEDULER_NO_TASK; + } #if DEBUG_CORE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Transmitting SEND request to `%s' with %u bytes.\n", - GNUNET_i2s (&pr->peer), - (unsigned int) th->msize); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Transmitting SEND request to `%s' with %u bytes.\n", + GNUNET_i2s (&pr->peer), (unsigned int) th->msize); #endif - sm = (struct SendMessage *) buf; - sm->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_SEND); - sm->priority = htonl (th->priority); - sm->deadline = GNUNET_TIME_absolute_hton (th->timeout); - sm->peer = pr->peer; - sm->cork = htonl ((uint32_t) th->cork); - sm->reserved = htonl (0); - ret = th->get_message (th->get_message_cls, - size - sizeof (struct SendMessage), - &sm[1]); - + sm = (struct SendMessage *) buf; + sm->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_SEND); + sm->priority = htonl (th->priority); + sm->deadline = GNUNET_TIME_absolute_hton (th->timeout); + sm->peer = pr->peer; + sm->cork = htonl ((uint32_t) th->cork); + sm->reserved = htonl (0); + ret = th->get_message (th->get_message_cls, + size - sizeof (struct SendMessage), &sm[1]); + #if DEBUG_CORE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Transmitting SEND request to `%s' yielded %u bytes.\n", - GNUNET_i2s (&pr->peer), - ret); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Transmitting SEND request to `%s' yielded %u bytes.\n", + GNUNET_i2s (&pr->peer), ret); #endif - GNUNET_free (th); - if (0 == ret) - { + GNUNET_free (th); + if (0 == ret) + { #if DEBUG_CORE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Size of clients message to peer %s is 0!\n", - GNUNET_i2s(&pr->peer)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Size of clients message to peer %s is 0!\n", + GNUNET_i2s (&pr->peer)); #endif - /* client decided to send nothing! */ - request_next_transmission (pr); - return 0; - } + /* client decided to send nothing! */ + request_next_transmission (pr); + return 0; + } #if DEBUG_CORE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Produced SEND message to core with %u bytes payload\n", - (unsigned int) ret); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Produced SEND message to core with %u bytes payload\n", + (unsigned int) ret); #endif - GNUNET_assert (ret >= sizeof (struct GNUNET_MessageHeader)); - if (ret + sizeof (struct SendMessage) >= GNUNET_SERVER_MAX_MESSAGE_SIZE) - { - GNUNET_break (0); - request_next_transmission (pr); - return 0; - } - ret += sizeof (struct SendMessage); - sm->header.size = htons (ret); - GNUNET_assert (ret <= size); + GNUNET_assert (ret >= sizeof (struct GNUNET_MessageHeader)); + if (ret + sizeof (struct SendMessage) >= GNUNET_SERVER_MAX_MESSAGE_SIZE) + { + GNUNET_break (0); request_next_transmission (pr); - return ret; + return 0; } + ret += sizeof (struct SendMessage); + sm->header.size = htons (ret); + GNUNET_assert (ret <= size); + request_next_transmission (pr); + return ret; + } return 0; } @@ -795,45 +752,46 @@ transmit_message (void *cls, * @param ignore_currently_down transmit message even if not initialized? */ static void -trigger_next_request (struct GNUNET_CORE_Handle *h, - int ignore_currently_down) +trigger_next_request (struct GNUNET_CORE_Handle *h, int ignore_currently_down) { uint16_t msize; - if ( (GNUNET_YES == h->currently_down) && - (ignore_currently_down == GNUNET_NO) ) - { + if ((GNUNET_YES == h->currently_down) && (ignore_currently_down == GNUNET_NO)) + { #if DEBUG_CORE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Core connection down, not processing queue\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Core connection down, not processing queue\n"); #endif - return; - } + return; + } if (NULL != h->cth) - { + { #if DEBUG_CORE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Request pending, not processing queue\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Request pending, not processing queue\n"); #endif - return; - } + return; + } if (h->control_pending_head != NULL) - msize = ntohs (((struct GNUNET_MessageHeader*) &h->control_pending_head[1])->size); - else if (h->ready_peer_head != NULL) - msize = h->ready_peer_head->pending_head->msize + sizeof (struct SendMessage); + msize = + ntohs (((struct GNUNET_MessageHeader *) &h-> + control_pending_head[1])->size); + else if (h->ready_peer_head != NULL) + msize = + h->ready_peer_head->pending_head->msize + sizeof (struct SendMessage); else - { + { #if DEBUG_CORE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Request queue empty, not processing queue\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Request queue empty, not processing queue\n"); #endif - return; /* no pending message */ - } + return; /* no pending message */ + } h->cth = GNUNET_CLIENT_notify_transmit_ready (h->client, - msize, - GNUNET_TIME_UNIT_FOREVER_REL, - GNUNET_NO, - &transmit_message, h); + msize, + GNUNET_TIME_UNIT_FOREVER_REL, + GNUNET_NO, + &transmit_message, h); } @@ -844,8 +802,7 @@ trigger_next_request (struct GNUNET_CORE_Handle *h, * @param msg the message received from the core service */ static void -main_notify_handler (void *cls, - const struct GNUNET_MessageHeader *msg) +main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg) { struct GNUNET_CORE_Handle *h = cls; const struct InitReplyMessage *m; @@ -868,13 +825,13 @@ main_notify_handler (void *cls, uint32_t ats_count; if (msg == NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _ - ("Client was disconnected from core service, trying to reconnect.\n")); - reconnect_later (h); - return; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + _ + ("Client was disconnected from core service, trying to reconnect.\n")); + reconnect_later (h); + return; + } msize = ntohs (msg->size); #if DEBUG_CORE > 2 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -882,425 +839,401 @@ main_notify_handler (void *cls, ntohs (msg->type), msize); #endif switch (ntohs (msg->type)) + { + case GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY: + if (ntohs (msg->size) != sizeof (struct InitReplyMessage)) { - case GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY: - if (ntohs (msg->size) != sizeof (struct InitReplyMessage)) - { - GNUNET_break (0); - reconnect_later (h); - return; - } - m = (const struct InitReplyMessage *) msg; - GNUNET_break (0 == ntohl (m->reserved)); - /* start our message processing loop */ - if (GNUNET_YES == h->currently_down) - { - h->currently_down = GNUNET_NO; - trigger_next_request (h, GNUNET_NO); - } - h->retry_backoff = GNUNET_TIME_UNIT_MILLISECONDS; - GNUNET_CRYPTO_hash (&m->publicKey, - sizeof (struct - GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), - &h->me.hashPubKey); - if (NULL != (init = h->init)) - { - /* mark so we don't call init on reconnect */ - h->init = NULL; + GNUNET_break (0); + reconnect_later (h); + return; + } + m = (const struct InitReplyMessage *) msg; + GNUNET_break (0 == ntohl (m->reserved)); + /* start our message processing loop */ + if (GNUNET_YES == h->currently_down) + { + h->currently_down = GNUNET_NO; + trigger_next_request (h, GNUNET_NO); + } + h->retry_backoff = GNUNET_TIME_UNIT_MILLISECONDS; + GNUNET_CRYPTO_hash (&m->publicKey, + sizeof (struct + GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), + &h->me.hashPubKey); + if (NULL != (init = h->init)) + { + /* mark so we don't call init on reconnect */ + h->init = NULL; #if DEBUG_CORE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Connected to core service of peer `%s'.\n", - GNUNET_i2s (&h->me)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Connected to core service of peer `%s'.\n", + GNUNET_i2s (&h->me)); #endif - init (h->cls, h, &h->me, &m->publicKey); - } - else - { + init (h->cls, h, &h->me, &m->publicKey); + } + else + { #if DEBUG_CORE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Successfully reconnected to core service.\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Successfully reconnected to core service.\n"); #endif - } - /* fake 'connect to self' */ - pr = GNUNET_CONTAINER_multihashmap_get (h->peers, - &h->me.hashPubKey); - GNUNET_assert (pr == NULL); - pr = GNUNET_malloc (sizeof (struct PeerRecord)); - pr->peer = h->me; - pr->ch = h; - GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_put (h->peers, - &h->me.hashPubKey, - pr, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)); - if (NULL != h->connects) - h->connects (h->cls, - &h->me, - NULL); - break; - case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT: - if (msize < sizeof (struct ConnectNotifyMessage)) - { - GNUNET_break (0); - reconnect_later (h); - return; - } - cnm = (const struct ConnectNotifyMessage *) msg; - ats_count = ntohl (cnm->ats_count); - if ( (msize != sizeof (struct ConnectNotifyMessage) + ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information)) || - (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR != ntohl ((&cnm->ats)[ats_count].type)) ) - { - GNUNET_break (0); - reconnect_later (h); - return; - } + } + /* fake 'connect to self' */ + pr = GNUNET_CONTAINER_multihashmap_get (h->peers, &h->me.hashPubKey); + GNUNET_assert (pr == NULL); + pr = GNUNET_malloc (sizeof (struct PeerRecord)); + pr->peer = h->me; + pr->ch = h; + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multihashmap_put (h->peers, + &h->me.hashPubKey, + pr, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)); + if (NULL != h->connects) + h->connects (h->cls, &h->me, NULL); + break; + case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT: + if (msize < sizeof (struct ConnectNotifyMessage)) + { + GNUNET_break (0); + reconnect_later (h); + return; + } + cnm = (const struct ConnectNotifyMessage *) msg; + ats_count = ntohl (cnm->ats_count); + if ((msize != + sizeof (struct ConnectNotifyMessage) + + ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information)) || + (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR != + ntohl ((&cnm->ats)[ats_count].type))) + { + GNUNET_break (0); + reconnect_later (h); + return; + } #if DEBUG_CORE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received notification about connection from `%s'.\n", - GNUNET_i2s (&cnm->peer)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received notification about connection from `%s'.\n", + GNUNET_i2s (&cnm->peer)); #endif - if (0 == memcmp (&h->me, - &cnm->peer, - sizeof (struct GNUNET_PeerIdentity))) - { - /* connect to self!? */ - GNUNET_break (0); - return; - } - pr = GNUNET_CONTAINER_multihashmap_get (h->peers, - &cnm->peer.hashPubKey); - if (pr != NULL) - { - GNUNET_break (0); - reconnect_later (h); - return; - } - pr = GNUNET_malloc (sizeof (struct PeerRecord)); - pr->peer = cnm->peer; - pr->ch = h; - GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_put (h->peers, - &cnm->peer.hashPubKey, - pr, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)); - if (NULL != h->connects) - h->connects (h->cls, - &cnm->peer, - &cnm->ats); - break; - case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT: - if (msize != sizeof (struct DisconnectNotifyMessage)) - { - GNUNET_break (0); - reconnect_later (h); - return; - } - dnm = (const struct DisconnectNotifyMessage *) msg; - if (0 == memcmp (&h->me, - &dnm->peer, - sizeof (struct GNUNET_PeerIdentity))) - { - /* connection to self!? */ - GNUNET_break (0); - return; - } - GNUNET_break (0 == ntohl (dnm->reserved)); + if (0 == memcmp (&h->me, &cnm->peer, sizeof (struct GNUNET_PeerIdentity))) + { + /* connect to self!? */ + GNUNET_break (0); + return; + } + pr = GNUNET_CONTAINER_multihashmap_get (h->peers, &cnm->peer.hashPubKey); + if (pr != NULL) + { + GNUNET_break (0); + reconnect_later (h); + return; + } + pr = GNUNET_malloc (sizeof (struct PeerRecord)); + pr->peer = cnm->peer; + pr->ch = h; + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multihashmap_put (h->peers, + &cnm->peer.hashPubKey, + pr, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)); + if (NULL != h->connects) + h->connects (h->cls, &cnm->peer, &cnm->ats); + break; + case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT: + if (msize != sizeof (struct DisconnectNotifyMessage)) + { + GNUNET_break (0); + reconnect_later (h); + return; + } + dnm = (const struct DisconnectNotifyMessage *) msg; + if (0 == memcmp (&h->me, &dnm->peer, sizeof (struct GNUNET_PeerIdentity))) + { + /* connection to self!? */ + GNUNET_break (0); + return; + } + GNUNET_break (0 == ntohl (dnm->reserved)); #if DEBUG_CORE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received notification about disconnect from `%s'.\n", - GNUNET_i2s (&dnm->peer)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received notification about disconnect from `%s'.\n", + GNUNET_i2s (&dnm->peer)); #endif - pr = GNUNET_CONTAINER_multihashmap_get (h->peers, - &dnm->peer.hashPubKey); - if (pr == NULL) - { - GNUNET_break (0); - reconnect_later (h); - return; - } - trigger = ( (pr->prev != NULL) || - (pr->next != NULL) || - (h->ready_peer_head == pr) ); - disconnect_and_free_peer_entry (h, &dnm->peer.hashPubKey, pr); - if (trigger) - trigger_next_request (h, GNUNET_NO); - break; - case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_STATUS_CHANGE: - if (NULL == h->status_events) - { - GNUNET_break (0); - return; - } - if (msize < sizeof (struct PeerStatusNotifyMessage)) - { - GNUNET_break (0); - reconnect_later (h); - return; - } - psnm = (const struct PeerStatusNotifyMessage *) msg; - if (0 == memcmp (&h->me, - &psnm->peer, - sizeof (struct GNUNET_PeerIdentity))) - { - /* self-change!? */ - GNUNET_break (0); - return; - } - ats_count = ntohl (psnm->ats_count); - if ( (msize != sizeof (struct PeerStatusNotifyMessage) + ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information)) || - (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR != ntohl ((&psnm->ats)[ats_count].type)) ) - { - GNUNET_break (0); - reconnect_later (h); - return; - } + pr = GNUNET_CONTAINER_multihashmap_get (h->peers, &dnm->peer.hashPubKey); + if (pr == NULL) + { + GNUNET_break (0); + reconnect_later (h); + return; + } + trigger = ((pr->prev != NULL) || + (pr->next != NULL) || (h->ready_peer_head == pr)); + disconnect_and_free_peer_entry (h, &dnm->peer.hashPubKey, pr); + if (trigger) + trigger_next_request (h, GNUNET_NO); + break; + case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_STATUS_CHANGE: + if (NULL == h->status_events) + { + GNUNET_break (0); + return; + } + if (msize < sizeof (struct PeerStatusNotifyMessage)) + { + GNUNET_break (0); + reconnect_later (h); + return; + } + psnm = (const struct PeerStatusNotifyMessage *) msg; + if (0 == memcmp (&h->me, &psnm->peer, sizeof (struct GNUNET_PeerIdentity))) + { + /* self-change!? */ + GNUNET_break (0); + return; + } + ats_count = ntohl (psnm->ats_count); + if ((msize != + sizeof (struct PeerStatusNotifyMessage) + + ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information)) || + (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR != + ntohl ((&psnm->ats)[ats_count].type))) + { + GNUNET_break (0); + reconnect_later (h); + return; + } #if DEBUG_CORE > 1 - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received notification about status change by `%s'.\n", - GNUNET_i2s (&psnm->peer)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received notification about status change by `%s'.\n", + GNUNET_i2s (&psnm->peer)); #endif - pr = GNUNET_CONTAINER_multihashmap_get (h->peers, - &psnm->peer.hashPubKey); - if (pr == NULL) - { - GNUNET_break (0); - reconnect_later (h); - return; - } - h->status_events (h->cls, - &psnm->peer, - psnm->bandwidth_in, - psnm->bandwidth_out, - GNUNET_TIME_absolute_ntoh (psnm->timeout), - &psnm->ats); - break; - case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_INBOUND: - if (msize < sizeof (struct NotifyTrafficMessage)) - { - GNUNET_break (0); - reconnect_later (h); - return; - } - ntm = (const struct NotifyTrafficMessage *) msg; - - ats_count = ntohl (ntm->ats_count); - if ( (msize < sizeof (struct NotifyTrafficMessage) + ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) - + sizeof (struct GNUNET_MessageHeader)) || - (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR != ntohl ((&ntm->ats)[ats_count].type)) ) - { - GNUNET_break (0); - reconnect_later (h); - return; - } - em = (const struct GNUNET_MessageHeader *) &(&ntm->ats)[ats_count+1]; + pr = GNUNET_CONTAINER_multihashmap_get (h->peers, &psnm->peer.hashPubKey); + if (pr == NULL) + { + GNUNET_break (0); + reconnect_later (h); + return; + } + h->status_events (h->cls, + &psnm->peer, + psnm->bandwidth_in, + psnm->bandwidth_out, + GNUNET_TIME_absolute_ntoh (psnm->timeout), &psnm->ats); + break; + case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_INBOUND: + if (msize < sizeof (struct NotifyTrafficMessage)) + { + GNUNET_break (0); + reconnect_later (h); + return; + } + ntm = (const struct NotifyTrafficMessage *) msg; + + ats_count = ntohl (ntm->ats_count); + if ((msize < + sizeof (struct NotifyTrafficMessage) + + ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) + + sizeof (struct GNUNET_MessageHeader)) || + (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR != + ntohl ((&ntm->ats)[ats_count].type))) + { + GNUNET_break (0); + reconnect_later (h); + return; + } + em = (const struct GNUNET_MessageHeader *) &(&ntm->ats)[ats_count + 1]; #if DEBUG_CORE - GNUNET_log (GNUNET_ERROR |