* @brief core service; this is the main API for encrypted P2P
* communications
* @author Christian Grothoff
- *
- * TODO:
- * - implement atsi parsing and passing
*/
#include "platform.h"
#include "gnunet_constants.h"
struct ControlMessage *prev;
/**
- * Function to run after successful transmission (or call with
- * reason 'TIMEOUT' on error); called with scheduler context 'NULL'
- * on disconnect.
+ * Function to run after transmission failed/succeeded.
*/
- GNUNET_SCHEDULER_Task cont;
-
+ GNUNET_CORE_ControlContinuation cont;
+
/**
* Closure for 'cont'.
*/
/**
* Head of doubly-linked list of pending requests.
*/
- struct ControlMessage *pending_head;
+ struct ControlMessage *control_pending_head;
/**
* Tail of doubly-linked list of pending requests.
*/
- struct ControlMessage *pending_tail;
+ struct ControlMessage *control_pending_tail;
/**
* Head of doubly-linked list of peers that are core-approved
struct ControlMessage *cm;
struct PeerRecord *pr;
- while (NULL != (cm = h->pending_head))
- {
- GNUNET_CONTAINER_DLL_remove (h->pending_head,
- h->pending_tail,
- cm);
- if (cm->th != NULL)
- cm->th->cm = NULL;
- if (cm->cont != NULL)
- cm->cont (cm->cont_cls, NULL);
- GNUNET_free (cm);
- }
+ GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
if (h->client != NULL)
{
GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
GNUNET_CONTAINER_DLL_remove (h->ready_peer_head,
h->ready_peer_tail,
pr);
-
- GNUNET_assert (h->pending_head == NULL);
h->currently_down = GNUNET_YES;
- GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
- h->retry_backoff = GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS,
- h->retry_backoff);
h->reconnect_task = GNUNET_SCHEDULER_add_delayed (h->retry_backoff,
&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_assert (h->control_pending_head == NULL);
+ h->retry_backoff = GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS,
+ h->retry_backoff);
h->retry_backoff = GNUNET_TIME_relative_multiply (h->retry_backoff, 2);
}
trigger_next_request (h, GNUNET_NO);
return;
}
+ if (th->cm != NULL)
+ 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),
smr->queue_size = htonl (pr->queue_size);
smr->size = htons (th->msize);
smr->smr_id = htons (th->smr_id = pr->smr_id_gen++);
- GNUNET_CONTAINER_DLL_insert_after (h->pending_head,
- h->pending_tail,
- h->pending_tail,
+ GNUNET_CONTAINER_DLL_insert_after (h->control_pending_head,
+ h->control_pending_tail,
+ h->control_pending_tail,
cm);
#if DEBUG_CORE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
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);
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 DEBUG_CORE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Signalling timeout of request for transmission to CORE service\n");
uint16_t msize;
size_t ret;
+ GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
h->cth = NULL;
if (buf == NULL)
{
return 0;
}
/* first check for control messages */
- if (NULL != (cm = h->pending_head))
+ if (NULL != (cm = h->control_pending_head))
{
hdr = (const struct GNUNET_MessageHeader*) &cm[1];
msize = ntohs (hdr->size);
(unsigned int) ntohs (hdr->type));
#endif
memcpy (buf, hdr, msize);
- GNUNET_CONTAINER_DLL_remove (h->pending_head,
- h->pending_tail,
+ 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)
- GNUNET_SCHEDULER_add_continuation (cm->cont,
- cm->cont_cls,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ cm->cont (cm->cont_cls, GNUNET_OK);
GNUNET_free (cm);
trigger_next_request (h, GNUNET_NO);
return msize;
#endif
return;
}
- if (h->pending_head != NULL)
- msize = ntohs (((struct GNUNET_MessageHeader*) &h->pending_head[1])->size);
+ 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);
else
int trigger;
uint16_t msize;
uint16_t et;
+ uint32_t ats_count;
if (msg == NULL)
{
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_CRYPTO_hash (&m->publicKey,
- sizeof (struct
- GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &h->me.hashPubKey);
#if DEBUG_CORE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connected to core service of peer `%s'.\n",
"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))
+ 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",
&cnm->peer,
sizeof (struct GNUNET_PeerIdentity)))
{
- /* disconnect from self!? */
+ /* connect to self!? */
GNUNET_break (0);
return;
}
if (NULL != h->connects)
h->connects (h->cls,
&cnm->peer,
- NULL /* FIXME: atsi! */);
+ &cnm->ats);
break;
case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT:
if (msize != sizeof (struct DisconnectNotifyMessage))
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",
if (NULL == h->status_events)
{
GNUNET_break (0);
- break;
}
- if (msize != sizeof (struct PeerStatusNotifyMessage))
+ if (msize < sizeof (struct PeerStatusNotifyMessage))
{
GNUNET_break (0);
reconnect_later (h);
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
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received notification about status change by `%s'.\n",
psnm->bandwidth_in,
psnm->bandwidth_out,
GNUNET_TIME_absolute_ntoh (psnm->timeout),
- NULL /* FIXME: atsi */);
+ &psnm->ats);
break;
case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_INBOUND:
- if (msize <
- sizeof (struct NotifyTrafficMessage) +
- sizeof (struct GNUNET_MessageHeader))
+ if (msize < sizeof (struct NotifyTrafficMessage))
{
GNUNET_break (0);
reconnect_later (h);
return;
}
ntm = (const struct NotifyTrafficMessage *) msg;
- if (0 == memcmp (&h->me,
- &ntm->peer,
- sizeof (struct GNUNET_PeerIdentity)))
- {
- /* self-change!? */
- GNUNET_break (0);
+
+ 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[1];
+ }
+ em = (const struct GNUNET_MessageHeader *) &(&ntm->ats)[ats_count+1];
#if DEBUG_CORE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received message of type %u and size %u from peer `%4s'\n",
return;
}
if ((GNUNET_NO == h->inbound_hdr_only) &&
- (msize != ntohs (em->size) + sizeof (struct NotifyTrafficMessage)))
+ (msize != ntohs (em->size) + sizeof (struct NotifyTrafficMessage) +
+ + ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information)) )
{
GNUNET_break (0);
reconnect_later (h);
}
if (GNUNET_OK !=
h->handlers[hpos].callback (h->cls, &ntm->peer, em,
- NULL /* FIXME: atsi */))
+ &ntm->ats))
{
/* error in processing, do not process other messages! */
break;
}
if (NULL != h->inbound_notify)
h->inbound_notify (h->cls, &ntm->peer, em,
- NULL /* FIXME: atsi */);
+ &ntm->ats);
break;
case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_OUTBOUND:
- if (msize <
- sizeof (struct NotifyTrafficMessage) +
- sizeof (struct GNUNET_MessageHeader))
+ if (msize < sizeof (struct NotifyTrafficMessage))
{
GNUNET_break (0);
reconnect_later (h);
GNUNET_break (0);
return;
}
- em = (const struct GNUNET_MessageHeader *) &ntm[1];
+ 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,
&ntm->peer.hashPubKey);
if (pr == NULL)
GNUNET_i2s (&ntm->peer));
#endif
if ((GNUNET_NO == h->outbound_hdr_only) &&
- (msize != ntohs (em->size) + sizeof (struct NotifyTrafficMessage)))
+ (msize != ntohs (em->size) + sizeof (struct NotifyTrafficMessage)
+ + ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information)) )
{
GNUNET_break (0);
reconnect_later (h);
break;
}
h->outbound_notify (h->cls, &ntm->peer, em,
- NULL /* FIXME: atsi? */);
+ &ntm->ats);
break;
case GNUNET_MESSAGE_TYPE_CORE_SEND_READY:
if (msize != sizeof (struct SendMessageReady))
return;
}
smr = (const struct SendMessageReady *) msg;
- if (0 == memcmp (&h->me,
- &smr->peer,
- sizeof (struct GNUNET_PeerIdentity)))
- {
- /* self-change!? */
- GNUNET_break (0);
- return;
- }
pr = GNUNET_CONTAINER_multihashmap_get (h->peers,
&smr->peer.hashPubKey);
if (pr == NULL)
return;
}
if (pr->rim_id != ntohl (cim->rim_id))
- break;
+ {
+#if DEBUG_CORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Reservation ID mismatch in notification...\n");
+#endif
+ break;
+ }
pcic = pr->pcic;
pr->pcic = NULL;
if (pcic != NULL)
* Starts our 'receive' loop.
*
* @param cls the 'struct GNUNET_CORE_Handle'
- * @param tc task context
+ * @param success were we successful
*/
static void
init_done_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+ int success)
{
struct GNUNET_CORE_Handle *h = cls;
- if (tc == NULL)
- return; /* error */
- if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+ if (success == GNUNET_SYSERR)
+ return; /* shutdown */
+ if (success == GNUNET_NO)
{
#if DEBUG_CORE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to exchange INIT with core, retrying\n");
#endif
- reconnect_later (h);
+ if (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK)
+ reconnect_later (h);
return;
}
GNUNET_CLIENT_receive (h->client,
ts = (uint16_t *) &init[1];
for (hpos = 0; hpos < h->hcnt; hpos++)
ts[hpos] = htons (h->handlers[hpos].type);
- GNUNET_CONTAINER_DLL_insert (h->pending_head,
- h->pending_tail,
+ GNUNET_CONTAINER_DLL_insert (h->control_pending_head,
+ h->control_pending_tail,
cm);
trigger_next_request (h, GNUNET_YES);
}
GNUNET_CLIENT_disconnect (handle->client, GNUNET_NO);
handle->client = NULL;
}
- if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (handle->reconnect_task);
- handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
- }
- while (NULL != (cm = handle->pending_head))
+ while (NULL != (cm = handle->control_pending_head))
{
- GNUNET_CONTAINER_DLL_remove (handle->pending_head,
- handle->pending_tail,
+ GNUNET_CONTAINER_DLL_remove (handle->control_pending_head,
+ handle->control_pending_tail,
cm);
if (cm->th != NULL)
cm->th->cm = NULL;
if (cm->cont != NULL)
- cm->cont (cm->cont_cls, NULL);
+ cm->cont (cm->cont_cls, GNUNET_SYSERR);
GNUNET_free (cm);
}
+ if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (handle->reconnect_task);
+ handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ }
GNUNET_CONTAINER_multihashmap_iterate (handle->peers,
&disconnect_and_free_peer_entry,
handle);
/**
* Ask the core to call "notify" once it is ready to transmit the
- * given number of bytes to the specified "target". If we are not yet
- * connected to the specified peer, a call to this function will cause
- * us to try to establish a connection.
+ * given number of bytes to the specified "target". Must only be
+ * called after a connection to the respective peer has been
+ * established (and the client has been informed about this).
*
* @param handle connection to core service
* @param priority how important is the message?
GNUNET_SERVER_MAX_MESSAGE_SIZE);
th = GNUNET_malloc (sizeof (struct GNUNET_CORE_TransmitHandle));
th->peer = pr;
+ GNUNET_assert(NULL != notify);
th->get_message = notify;
th->get_message_cls = notify_cls;
th->timeout = GNUNET_TIME_relative_to_absolute (maxdelay);
/* bound queue size */
if (pr->queue_size == handle->queue_size)
{
- /* find lowest-priority entry */
- minp = pr->pending_head;
- prev = minp->next;
+ /* find lowest-priority entry, but skip the head of the list */
+ minp = pr->pending_head->next;
+ prev = minp;
while (prev != NULL)
{
if (prev->priority < minp->priority)
{
GNUNET_break (handle->queue_size != 0);
GNUNET_break (pr->queue_size == 0);
+ GNUNET_free(th);
return NULL;
}
if (priority <= minp->priority)
if (th->cm != NULL)
{
/* we're currently in the control queue, remove */
- GNUNET_CONTAINER_DLL_remove (h->pending_head,
- h->pending_tail,
+ GNUNET_CONTAINER_DLL_remove (h->control_pending_head,
+ h->control_pending_tail,
th->cm);
GNUNET_free (th->cm);
}
/**
* Continuation to run when done.
*/
- GNUNET_SCHEDULER_Task cont;
+ GNUNET_CORE_ControlContinuation cont;
/**
* Closure for 'cont'.
* resources.
*
* @param cls the 'struct GNUNET_CORE_PeerRequestHandle'
- * @param tc scheduler context
+ * @param success was the request transmitted?
*/
static void
peer_request_connect_cont (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+ int success)
{
struct GNUNET_CORE_PeerRequestHandle *ret = cls;
if (ret->cont != NULL)
- {
- if (tc == NULL)
- GNUNET_SCHEDULER_add_now (ret->cont,
- ret->cont_cls);
- else
- ret->cont (ret->cont_cls, tc);
- }
+ ret->cont (ret->cont_cls, success);
GNUNET_free (ret);
}
* @param peer who should we connect to
* @param cont function to call once the request has been completed (or timed out)
* @param cont_cls closure for cont
- * @return NULL on error (cont will not be called), otherwise handle for cancellation
+ *
+ * @return NULL on error or already connected,
+ * otherwise handle for cancellation
*/
struct GNUNET_CORE_PeerRequestHandle *
GNUNET_CORE_peer_request_connect (struct GNUNET_CORE_Handle *h,
struct GNUNET_TIME_Relative timeout,
const struct GNUNET_PeerIdentity * peer,
- GNUNET_SCHEDULER_Task cont,
+ GNUNET_CORE_ControlContinuation cont,
void *cont_cls)
{
struct GNUNET_CORE_PeerRequestHandle *ret;
struct ControlMessage *cm;
struct ConnectMessage *msg;
+
+ if (NULL != GNUNET_CONTAINER_multihashmap_get (h->peers,
+ &peer->hashPubKey))
+ return NULL; /* Already connected, means callback should have happened already! */
+
cm = GNUNET_malloc (sizeof (struct ControlMessage) +
sizeof (struct ConnectMessage));
msg->reserved = htonl (0);
msg->timeout = GNUNET_TIME_relative_hton (timeout);
msg->peer = *peer;
- GNUNET_CONTAINER_DLL_insert (h->pending_head,
- h->pending_tail,
+ GNUNET_CONTAINER_DLL_insert (h->control_pending_head,
+ h->control_pending_tail,
cm);
ret = GNUNET_malloc (sizeof (struct GNUNET_CORE_PeerRequestHandle));
ret->h = h;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Queueing REQUEST_CONNECT request\n");
#endif
- if (h->pending_head == cm)
+ if (h->control_pending_head == cm)
trigger_next_request (h, GNUNET_NO);
return ret;
}
struct GNUNET_CORE_Handle *h = req->h;
struct ControlMessage *cm = req->cm;
- GNUNET_CONTAINER_DLL_remove (h->pending_head,
- h->pending_tail,
+ GNUNET_CONTAINER_DLL_remove (h->control_pending_head,
+ h->control_pending_tail,
cm);
GNUNET_free (cm);
GNUNET_free (req);
* CM was sent, remove link so we don't double-free.
*
* @param cls the 'struct GNUNET_CORE_InformationRequestContext'
- * @param tc scheduler context
+ * @param success were we successful?
*/
static void
change_preference_send_continuation (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+ int success)
{
struct GNUNET_CORE_InformationRequestContext *irc = cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Queueing CHANGE PREFERENCE request\n");
#endif
- GNUNET_CONTAINER_DLL_insert (h->pending_head,
- h->pending_tail,
+ GNUNET_CONTAINER_DLL_insert (h->control_pending_head,
+ h->control_pending_tail,
cm);
pr->pcic = info;
pr->pcic_cls = info_cls;
- if (h->pending_head == cm)
+ if (h->control_pending_head == cm)
trigger_next_request (h, GNUNET_NO);
return irc;
}
if (irc->cm != NULL)
{
- GNUNET_CONTAINER_DLL_remove (h->pending_head,
- h->pending_tail,
+ GNUNET_CONTAINER_DLL_remove (h->control_pending_head,
+ h->control_pending_tail,
irc->cm);
GNUNET_free (irc->cm);
}
projects / oweals / gnunet.git / blobdiff