/*
This file is part of GNUnet.
- (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009-2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
-
/**
* @file core/core_api.c
* @brief core service; this is the main API for encrypted P2P
* @author Christian Grothoff
*/
#include "platform.h"
+#include "gnunet_util_lib.h"
#include "gnunet_constants.h"
#include "gnunet_core_service.h"
#include "core.h"
GNUNET_CONNECTION_TransmitReadyNotify get_message;
/**
- * Closure for get_message.
+ * Closure for @e get_message.
*/
void *get_message_cls;
/**
* How important is this message?
*/
- uint32_t priority;
+ enum GNUNET_CORE_Priority priority;
+
+ /**
+ * Is corking allowed?
+ */
+ int cork;
/**
* Size of this request.
*/
uint16_t smr_id;
- /**
- * Is corking allowed?
- */
- int cork;
-
};
*/
struct PeerRecord *next;
- /**
- * Peer the record is about.
- */
- struct GNUNET_PeerIdentity peer;
-
/**
* Corresponding core handle.
*/
*/
struct GNUNET_CORE_TransmitHandle th;
+ /**
+ * Peer the record is about.
+ */
+ struct GNUNET_PeerIdentity peer;
+
/**
* ID of timeout task for the 'pending_head' handle
* which is the one with the smallest timeout.
*/
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+ struct GNUNET_SCHEDULER_Task * timeout_task;
/**
* ID of task to run 'next_request_transmission'.
*/
- GNUNET_SCHEDULER_TaskIdentifier ntr_task;
+ struct GNUNET_SCHEDULER_Task * ntr_task;
/**
* SendMessageRequest ID generator for this peer.
* Type of function called upon completion.
*
* @param cls closure
- * @param success GNUNET_OK on success (which for request_connect
+ * @param success #GNUNET_OK on success (which for request_connect
* ONLY means that we transmitted the connect request to CORE,
* it does not mean that we are actually now connected!);
- * GNUNET_NO on timeout,
- * GNUNET_SYSERR if core was shut down
+ * #GNUNET_NO on timeout,
+ * #GNUNET_SYSERR if core was shut down
*/
-typedef void (*GNUNET_CORE_ControlContinuation) (void *cls, int success);
+typedef void
+(*GNUNET_CORE_ControlContinuation) (void *cls,
+ int success);
/**
GNUNET_CORE_ControlContinuation cont;
/**
- * Closure for 'cont'.
+ * Closure for @e cont.
*/
void *cont_cls;
* Hash map listing all of the peers that we are currently
* connected to.
*/
- struct GNUNET_CONTAINER_MultiHashMap *peers;
+ struct GNUNET_CONTAINER_MultiPeerMap *peers;
/**
* Identity of this peer.
/**
* ID of reconnect task (if any).
*/
- GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
+ struct GNUNET_SCHEDULER_Task * reconnect_task;
/**
* Current delay we use for re-trying to connect to core.
/**
* Task schedule to try to re-connect to core.
*
- * @param cls the 'struct GNUNET_CORE_Handle'
+ * @param cls the `struct GNUNET_CORE_Handle`
* @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;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to CORE service after delay\n");
+ h->reconnect_task = NULL;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Connecting to CORE service after delay\n");
reconnect (h);
}
* Notify clients about disconnect and free
* the entry for connected peer.
*
- * @param cls the 'struct GNUNET_CORE_Handle*'
+ * @param cls the `struct GNUNET_CORE_Handle *`
* @param key the peer identity (not used)
- * @param value the 'struct PeerRecord' to free.
- * @return GNUNET_YES (continue)
+ * @param value the `struct PeerRecord` to free.
+ * @return #GNUNET_YES (continue)
*/
static int
-disconnect_and_free_peer_entry (void *cls, const struct GNUNET_HashCode * key,
+disconnect_and_free_peer_entry (void *cls,
+ const struct GNUNET_PeerIdentity *key,
void *value)
{
struct GNUNET_CORE_Handle *h = cls;
struct GNUNET_CORE_TransmitHandle *th;
struct PeerRecord *pr = value;
- if (GNUNET_SCHEDULER_NO_TASK != pr->timeout_task)
+ if (NULL != pr->timeout_task)
{
GNUNET_SCHEDULER_cancel (pr->timeout_task);
- pr->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ pr->timeout_task = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != pr->ntr_task)
+ if (NULL != pr->ntr_task)
{
GNUNET_SCHEDULER_cancel (pr->ntr_task);
- pr->ntr_task = GNUNET_SCHEDULER_NO_TASK;
+ pr->ntr_task = NULL;
}
- if ((NULL != pr->prev) || (NULL != pr->next) || (h->ready_peer_head == pr))
- GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, h->ready_peer_tail, pr);
+ if ( (NULL != pr->prev) ||
+ (NULL != pr->next) ||
+ (h->ready_peer_head == pr) )
+ GNUNET_CONTAINER_DLL_remove (h->ready_peer_head,
+ h->ready_peer_tail,
+ pr);
if (NULL != h->disconnects)
- h->disconnects (h->cls, &pr->peer);
+ h->disconnects (h->cls,
+ &pr->peer);
/* all requests should have been cancelled, clean up anyway, just in case */
th = &pr->th;
if (NULL != th->peer)
}
/* done with 'voluntary' cleanups, now on to normal freeing */
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (h->peers, key, pr));
+ GNUNET_CONTAINER_multipeermap_remove (h->peers, key, pr));
GNUNET_assert (pr->ch == h);
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pr->timeout_task);
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pr->ntr_task);
+ GNUNET_assert (NULL == pr->timeout_task);
+ GNUNET_assert (NULL == pr->ntr_task);
GNUNET_free (pr);
return GNUNET_YES;
}
struct ControlMessage *cm;
struct PeerRecord *pr;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == h->reconnect_task);
+ GNUNET_assert (NULL == h->reconnect_task);
if (NULL != h->cth)
{
GNUNET_CLIENT_notify_transmit_ready_cancel (h->cth);
h->client = NULL;
}
h->currently_down = GNUNET_YES;
- GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
+ GNUNET_assert (h->reconnect_task == NULL);
h->reconnect_task =
- GNUNET_SCHEDULER_add_delayed (h->retry_backoff, &reconnect_task, h);
+ 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);
+ h->control_pending_tail,
+ cm);
if (NULL != cm->th)
cm->th->cm = NULL;
if (NULL != cm->cont)
cm->cont (cm->cont_cls, GNUNET_NO);
GNUNET_free (cm);
}
- GNUNET_CONTAINER_multihashmap_iterate (h->peers,
+ GNUNET_CONTAINER_multipeermap_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);
- GNUNET_assert (h->control_pending_head == NULL);
+ GNUNET_CONTAINER_DLL_remove (h->ready_peer_head,
+ h->ready_peer_tail,
+ pr);
+ GNUNET_assert (NULL == h->control_pending_head);
h->retry_backoff = GNUNET_TIME_STD_BACKOFF (h->retry_backoff);
}
* @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);
/**
* @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 SendMessageRequest *smr;
struct GNUNET_CORE_TransmitHandle *th;
- if (pr->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ if (pr->timeout_task != NULL)
{
GNUNET_SCHEDULER_cancel (pr->timeout_task);
- pr->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ pr->timeout_task = NULL;
}
th = &pr->th;
if (NULL == th->peer)
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);
+ 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;
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);
+ smr->priority = htonl ((uint32_t) th->priority);
smr->deadline = GNUNET_TIME_absolute_hton (th->timeout);
smr->peer = pr->peer;
smr->reserved = htonl (0);
* @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;
- if (GNUNET_SCHEDULER_NO_TASK != pr->ntr_task)
+ pr->timeout_task = NULL;
+ if (NULL != pr->ntr_task)
{
GNUNET_SCHEDULER_cancel (pr->ntr_task);
- pr->ntr_task = GNUNET_SCHEDULER_NO_TASK;
+ pr->ntr_task = NULL;
}
th = &pr->th;
th->peer = NULL;
- if ((NULL != pr->prev) || (NULL != pr->next) || (pr == h->ready_peer_head))
+ if ( (NULL != pr->prev) ||
+ (NULL != pr->next) ||
+ (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);
+ GNUNET_CONTAINER_DLL_remove (h->ready_peer_head,
+ h->ready_peer_tail,
+ pr);
}
if (NULL != th->cm)
{
/**
* Transmit the next message to the core service.
*
- * @param cls closure with the 'struct GNUNET_CORE_Handle'
- * @param size number of bytes available in buf
+ * @param cls closure with the `struct GNUNET_CORE_Handle`
+ * @param size number of bytes available in @a buf
* @param buf where the callee should write the message
- * @return number of bytes written to buf
+ * @return number of bytes written to @a buf
*/
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;
uint16_t msize;
size_t ret;
- GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
+ GNUNET_assert (h->reconnect_task == NULL);
h->cth = NULL;
if (NULL == buf)
{
}
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));
+ (unsigned int) msize,
+ (unsigned int) ntohs (hdr->type));
memcpy (buf, hdr, msize);
GNUNET_CONTAINER_DLL_remove (h->control_pending_head,
h->control_pending_tail, cm);
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 (h->ready_peer_head,
+ h->ready_peer_tail,
+ pr);
th->peer = NULL;
- if (GNUNET_SCHEDULER_NO_TASK != pr->timeout_task)
+ if (NULL != pr->timeout_task)
{
GNUNET_SCHEDULER_cancel (pr->timeout_task);
- pr->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ pr->timeout_task = NULL;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Transmitting SEND request to `%s' with %u bytes.\n",
- GNUNET_i2s (&pr->peer), (unsigned int) th->msize);
+ GNUNET_i2s (&pr->peer),
+ (unsigned int) th->msize);
sm = (struct SendMessage *) buf;
sm->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_SEND);
- sm->priority = htonl (th->priority);
+ sm->priority = htonl ((uint32_t) 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]);
-
+ size - sizeof (struct SendMessage),
+ &sm[1]);
+
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Transmitting SEND request to `%s' yielded %u bytes.\n",
- GNUNET_i2s (&pr->peer), ret);
+ GNUNET_i2s (&pr->peer),
+ ret);
if (0 == ret)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
/**
- * Check the list of pending requests, send the next
- * one to the core.
+ * Check the list of pending requests, send the next one to the core.
*
* @param h core handle
* @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) &&
+ (GNUNET_NO == ignore_currently_down) )
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Core connection down, not processing queue\n");
}
if (NULL != h->cth)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Request pending, not processing queue\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Request pending, not processing queue\n");
return;
}
if (NULL != h->control_pending_head)
h->cth =
GNUNET_CLIENT_notify_transmit_ready (h->client, msize,
GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_NO, &transmit_message, h);
+ GNUNET_NO,
+ &transmit_message, h);
}
/**
* Handler for notification messages received from the core.
*
- * @param cls our "struct GNUNET_CORE_Handle"
+ * @param cls our `struct GNUNET_CORE_Handle`
* @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;
const struct GNUNET_MessageHeader *em;
const struct SendMessageReady *smr;
const struct GNUNET_CORE_MessageHandler *mh;
- const struct GNUNET_ATS_Information *ats;
GNUNET_CORE_StartupCallback init;
struct PeerRecord *pr;
struct GNUNET_CORE_TransmitHandle *th;
int trigger;
uint16_t msize;
uint16_t et;
- uint32_t ats_count;
if (NULL == msg)
{
{
/* mark so we don't call init on reconnect */
h->init = NULL;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Connected to core service of peer `%s'.\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Connected to core service of peer `%s'.\n",
GNUNET_i2s (&h->me));
- init (h->cls, h, &h->me);
+ init (h->cls, &h->me);
}
else
{
"Successfully reconnected to core service.\n");
}
/* fake 'connect to self' */
- pr = GNUNET_CONTAINER_multihashmap_get (h->peers, &h->me.hashPubKey);
+ pr = GNUNET_CONTAINER_multipeermap_get (h->peers, &h->me);
GNUNET_assert (NULL == pr);
- pr = GNUNET_malloc (sizeof (struct PeerRecord));
+ pr = GNUNET_new (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_multipeermap_put (h->peers,
+ &h->me, pr,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
if (NULL != h->connects)
- h->connects (h->cls, &h->me, NULL, 0);
+ h->connects (h->cls, &pr->peer);
break;
case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT:
if (msize < sizeof (struct ConnectNotifyMessage))
return;
}
cnm = (const struct ConnectNotifyMessage *) msg;
- ats_count = ntohl (cnm->ats_count);
if (msize !=
- sizeof (struct ConnectNotifyMessage) +
- ats_count * sizeof (struct GNUNET_ATS_Information))
+ sizeof (struct ConnectNotifyMessage))
{
GNUNET_break (0);
reconnect_later (h);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received notification about connection from `%s'.\n",
GNUNET_i2s (&cnm->peer));
- if (0 == memcmp (&h->me, &cnm->peer, sizeof (struct GNUNET_PeerIdentity)))
+ 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);
+ pr = GNUNET_CONTAINER_multipeermap_get (h->peers, &cnm->peer);
if (NULL != pr)
{
GNUNET_break (0);
reconnect_later (h);
return;
}
- pr = GNUNET_malloc (sizeof (struct PeerRecord));
+ pr = GNUNET_new (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_multipeermap_put (h->peers,
+ &cnm->peer, pr,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
- ats = (const struct GNUNET_ATS_Information *) &cnm[1];
if (NULL != h->connects)
- h->connects (h->cls, &cnm->peer, ats, ats_count);
+ h->connects (h->cls, &pr->peer);
break;
case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT:
if (msize != sizeof (struct DisconnectNotifyMessage))
return;
}
dnm = (const struct DisconnectNotifyMessage *) msg;
- if (0 == memcmp (&h->me, &dnm->peer, sizeof (struct GNUNET_PeerIdentity)))
+ if (0 == memcmp (&h->me,
+ &dnm->peer,
+ sizeof (struct GNUNET_PeerIdentity)))
{
/* connection to self!? */
GNUNET_break (0);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received notification about disconnect from `%s'.\n",
GNUNET_i2s (&dnm->peer));
- pr = GNUNET_CONTAINER_multihashmap_get (h->peers, &dnm->peer.hashPubKey);
+ pr = GNUNET_CONTAINER_multipeermap_get (h->peers, &dnm->peer);
if (NULL == pr)
{
GNUNET_break (0);
}
trigger = ((pr->prev != NULL) || (pr->next != NULL) ||
(h->ready_peer_head == pr));
- disconnect_and_free_peer_entry (h, &dnm->peer.hashPubKey, pr);
+ disconnect_and_free_peer_entry (h, &dnm->peer, pr);
if (trigger)
trigger_next_request (h, GNUNET_NO);
break;
return;
}
ntm = (const struct NotifyTrafficMessage *) msg;
- ats_count = ntohl (ntm->ats_count);
if ((msize <
sizeof (struct NotifyTrafficMessage) +
- ats_count * sizeof (struct GNUNET_ATS_Information) +
sizeof (struct GNUNET_MessageHeader)) )
{
GNUNET_break (0);
reconnect_later (h);
return;
}
- ats = (const struct GNUNET_ATS_Information*) &ntm[1];
- em = (const struct GNUNET_MessageHeader *) &ats[ats_count];
+ em = (const struct GNUNET_MessageHeader *) &ntm[1];
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received message of type %u and size %u from peer `%4s'\n",
ntohs (em->type), ntohs (em->size), GNUNET_i2s (&ntm->peer));
if ((GNUNET_NO == h->inbound_hdr_only) &&
(msize !=
- ntohs (em->size) + sizeof (struct NotifyTrafficMessage) +
- +ats_count * sizeof (struct GNUNET_ATS_Information)))
+ ntohs (em->size) + sizeof (struct NotifyTrafficMessage)))
{
GNUNET_break (0);
reconnect_later (h);
GNUNET_break_op (0);
continue;
}
- pr = GNUNET_CONTAINER_multihashmap_get (h->peers, &ntm->peer.hashPubKey);
+ pr = GNUNET_CONTAINER_multipeermap_get (h->peers, &ntm->peer);
if (NULL == pr)
{
GNUNET_break (0);
return;
}
if (GNUNET_OK !=
- h->handlers[hpos].callback (h->cls, &ntm->peer, em, ats,
- ats_count))
+ h->handlers[hpos].callback (h->cls, &ntm->peer, em))
{
/* error in processing, do not process other messages! */
break;
}
}
if (NULL != h->inbound_notify)
- h->inbound_notify (h->cls, &ntm->peer, em, ats, ats_count);
+ h->inbound_notify (h->cls, &ntm->peer, em);
break;
case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_OUTBOUND:
if (msize < sizeof (struct NotifyTrafficMessage))
return;
}
ntm = (const struct NotifyTrafficMessage *) msg;
- ats_count = ntohl (ntm->ats_count);
if ((msize <
sizeof (struct NotifyTrafficMessage) +
- ats_count * sizeof (struct GNUNET_ATS_Information) +
sizeof (struct GNUNET_MessageHeader)) )
{
GNUNET_break (0);
reconnect_later (h);
return;
}
- ats = (const struct GNUNET_ATS_Information*) &ntm[1];
- em = (const struct GNUNET_MessageHeader *) &ats[ats_count];
+ em = (const struct GNUNET_MessageHeader *) &ntm[1];
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received notification about transmission to `%s'.\n",
GNUNET_i2s (&ntm->peer));
if ((GNUNET_NO == h->outbound_hdr_only) &&
(msize !=
- ntohs (em->size) + sizeof (struct NotifyTrafficMessage) +
- ats_count * sizeof (struct GNUNET_ATS_Information)))
+ ntohs (em->size) + sizeof (struct NotifyTrafficMessage)))
{
GNUNET_break (0);
reconnect_later (h);
GNUNET_break (0);
break;
}
- h->outbound_notify (h->cls, &ntm->peer, em, ats, ats_count);
+ h->outbound_notify (h->cls, &ntm->peer, em);
break;
case GNUNET_MESSAGE_TYPE_CORE_SEND_READY:
if (msize != sizeof (struct SendMessageReady))
return;
}
smr = (const struct SendMessageReady *) msg;
- pr = GNUNET_CONTAINER_multihashmap_get (h->peers, &smr->peer.hashPubKey);
+ pr = GNUNET_CONTAINER_multipeermap_get (h->peers,
+ &smr->peer);
if (NULL == pr)
{
GNUNET_break (0);
* ignore! (we should have already sent another request) */
break;
}
- if ((NULL != pr->prev) || (NULL != pr->next) || (h->ready_peer_head == pr))
+ if ( (NULL != pr->prev) ||
+ (NULL != pr->next) ||
+ (h->ready_peer_head == pr) )
{
/* we should not already be on the ready list... */
GNUNET_break (0);
reconnect_later (h);
return;
}
- GNUNET_CONTAINER_DLL_insert (h->ready_peer_head, h->ready_peer_tail, pr);
+ GNUNET_CONTAINER_DLL_insert (h->ready_peer_head,
+ h->ready_peer_tail,
+ pr);
trigger_next_request (h, GNUNET_NO);
break;
default:
reconnect_later (h);
return;
}
- GNUNET_CLIENT_receive (h->client, &main_notify_handler, h,
+ GNUNET_CLIENT_receive (h->client,
+ &main_notify_handler, h,
GNUNET_TIME_UNIT_FOREVER_REL);
}
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Failed to exchange INIT with core, retrying\n");
- if (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK)
+ if (h->reconnect_task == NULL)
reconnect_later (h);
return;
}
- GNUNET_CLIENT_receive (h->client, &main_notify_handler, h,
+ GNUNET_CLIENT_receive (h->client,
+ &main_notify_handler, h,
GNUNET_TIME_UNIT_FOREVER_REL);
}
unsigned int hpos;
GNUNET_assert (NULL == h->client);
- GNUNET_assert (h->currently_down == GNUNET_YES);
+ GNUNET_assert (GNUNET_YES == h->currently_down);
+ GNUNET_assert (NULL != h->cfg);
h->client = GNUNET_CLIENT_connect ("core", h->cfg);
if (NULL == h->client)
{
init->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT);
init->header.size = htons (msize);
opt = 0;
- if (h->inbound_notify != NULL)
+ if (NULL != h->inbound_notify)
{
if (h->inbound_hdr_only)
opt |= GNUNET_CORE_OPTION_SEND_HDR_INBOUND;
else
opt |= GNUNET_CORE_OPTION_SEND_FULL_INBOUND;
}
- if (h->outbound_notify != NULL)
+ if (NULL != h->outbound_notify)
{
if (h->outbound_hdr_only)
opt |= GNUNET_CORE_OPTION_SEND_HDR_OUTBOUND;
else
opt |= GNUNET_CORE_OPTION_SEND_FULL_OUTBOUND;
}
- LOG (GNUNET_ERROR_TYPE_INFO,
+ LOG (GNUNET_ERROR_TYPE_INFO,
"(Re)connecting to CORE service, monitoring messages of type %u\n",
opt);
ts = (uint16_t *) & init[1];
for (hpos = 0; hpos < h->hcnt; hpos++)
ts[hpos] = htons (h->handlers[hpos].type);
- GNUNET_CONTAINER_DLL_insert (h->control_pending_head, h->control_pending_tail,
+ GNUNET_CONTAINER_DLL_insert (h->control_pending_head,
+ h->control_pending_tail,
cm);
trigger_next_request (h, GNUNET_YES);
}
* @param connects function to call on peer connect, can be NULL
* @param disconnects function to call on peer disconnect / timeout, can be NULL
* @param inbound_notify function to call for all inbound messages, can be NULL
- * @param inbound_hdr_only set to GNUNET_YES if inbound_notify will only read the
+ * @param inbound_hdr_only set to #GNUNET_YES if inbound_notify will only read the
* GNUNET_MessageHeader and hence we do not need to give it the full message;
- * can be used to improve efficiency, ignored if inbound_notify is NULLL
+ * can be used to improve efficiency, ignored if @a inbound_notify is NULLL
* @param outbound_notify function to call for all outbound messages, can be NULL
- * @param outbound_hdr_only set to GNUNET_YES if outbound_notify will only read the
+ * @param outbound_hdr_only set to #GNUNET_YES if outbound_notify will only read the
* GNUNET_MessageHeader and hence we do not need to give it the full message
- * can be used to improve efficiency, ignored if outbound_notify is NULLL
+ * can be used to improve efficiency, ignored if @a outbound_notify is NULLL
* @param handlers callbacks for messages we care about, NULL-terminated
* @return handle to the core service (only useful for disconnect until 'init' is called);
* NULL on error (in this case, init is never called)
{
struct GNUNET_CORE_Handle *h;
- h = GNUNET_malloc (sizeof (struct GNUNET_CORE_Handle));
+ GNUNET_assert (NULL != cfg);
+ h = GNUNET_new (struct GNUNET_CORE_Handle);
h->cfg = cfg;
h->cls = cls;
h->init = init;
h->handlers = handlers;
h->hcnt = 0;
h->currently_down = GNUNET_YES;
- h->peers = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
+ h->peers = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
if (NULL != handlers)
while (handlers[h->hcnt].callback != NULL)
h->hcnt++;
GNUNET_assert (h->hcnt <
(GNUNET_SERVER_MAX_MESSAGE_SIZE -
sizeof (struct InitMessage)) / sizeof (uint16_t));
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to CORE service\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Connecting to CORE service\n");
reconnect (h);
return h;
}
/**
* Disconnect from the core service. This function can only
- * be called *after* all pending 'GNUNET_CORE_notify_transmit_ready'
+ * be called *after* all pending #GNUNET_CORE_notify_transmit_ready()
* requests have been explicitly canceled.
*
* @param handle connection to core to disconnect
{
struct ControlMessage *cm;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from CORE service\n");
+ GNUNET_assert (NULL != handle);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnecting from CORE service\n");
if (NULL != handle->cth)
{
GNUNET_CLIENT_notify_transmit_ready_cancel (handle->cth);
while (NULL != (cm = handle->control_pending_head))
{
GNUNET_CONTAINER_DLL_remove (handle->control_pending_head,
- handle->control_pending_tail, cm);
+ handle->control_pending_tail,
+ cm);
if (NULL != cm->th)
cm->th->cm = NULL;
if (NULL != cm->cont)
GNUNET_CLIENT_disconnect (handle->client);
handle->client = NULL;
}
- GNUNET_CONTAINER_multihashmap_iterate (handle->peers,
+ GNUNET_CONTAINER_multipeermap_iterate (handle->peers,
&disconnect_and_free_peer_entry,
handle);
- if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
+ if (handle->reconnect_task != NULL)
{
GNUNET_SCHEDULER_cancel (handle->reconnect_task);
- handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ handle->reconnect_task = NULL;
}
- GNUNET_CONTAINER_multihashmap_destroy (handle->peers);
+ GNUNET_CONTAINER_multipeermap_destroy (handle->peers);
handle->peers = NULL;
GNUNET_break (handle->ready_peer_head == NULL);
GNUNET_free (handle);
/**
* Task that calls 'request_next_transmission'.
*
- * @param cls the 'struct PeerRecord*'
+ * @param cls the 'struct PeerRecord *'
* @param tc scheduler context
*/
static void
{
struct PeerRecord *pr = cls;
- pr->ntr_task = GNUNET_SCHEDULER_NO_TASK;
+ pr->ntr_task = NULL;
request_next_transmission (pr);
}
/**
- * Ask the core to call "notify" once it is ready to transmit the
- * given number of bytes to the specified "target". Must only be
+ * Ask the core to call @a notify once it is ready to transmit the
+ * given number of bytes to the specified @a target. Must only be
* called after a connection to the respective peer has been
* established (and the client has been informed about this). You may
* have one request of this type pending for each connected peer at
* any time. If a peer disconnects, the application MUST call
- * "GNUNET_CORE_notify_transmit_ready_cancel" on the respective
+ * #GNUNET_CORE_notify_transmit_ready_cancel on the respective
* transmission request, if one such request is pending.
*
* @param handle connection to core service
* @param cork is corking allowed for this transmission?
* @param priority how important is the message?
- * @param maxdelay how long can the message wait?
+ * @param maxdelay how long can the message wait? Only effective if @a cork is #GNUNET_YES
* @param target who should receive the message, never NULL (can be this peer's identity for loopback)
- * @param notify_size how many bytes of buffer space does notify want?
+ * @param notify_size how many bytes of buffer space does @a notify want?
* @param notify function to call when buffer space is available;
* will be called with NULL on timeout; clients MUST cancel
* all pending transmission requests DURING the disconnect
* handler
- * @param notify_cls closure for notify
+ * @param notify_cls closure for @a notify
* @return non-NULL if the notify callback was queued,
* NULL if we can not even queue the request (request already pending);
- * if NULL is returned, "notify" will NOT be called.
+ * if NULL is returned, @a notify will NOT be called.
*/
struct GNUNET_CORE_TransmitHandle *
-GNUNET_CORE_notify_transmit_ready (struct GNUNET_CORE_Handle *handle, int cork,
- uint32_t priority,
+GNUNET_CORE_notify_transmit_ready (struct GNUNET_CORE_Handle *handle,
+ int cork,
+ enum GNUNET_CORE_Priority priority,
struct GNUNET_TIME_Relative maxdelay,
const struct GNUNET_PeerIdentity *target,
size_t notify_size,
"Asking core for transmission of %u bytes to `%s'\n",
(unsigned int) notify_size,
GNUNET_i2s (target));
- pr = GNUNET_CONTAINER_multihashmap_get (handle->peers, &target->hashPubKey);
+ pr = GNUNET_CONTAINER_multipeermap_get (handle->peers,
+ target);
if (NULL == pr)
{
/* attempt to send to peer that is not connected */
th->priority = priority;
th->msize = notify_size;
th->cork = cork;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pr->ntr_task);
+ GNUNET_assert (NULL == pr->ntr_task);
pr->ntr_task =
GNUNET_SCHEDULER_add_now (&run_request_next_transmission, pr);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmission request added to queue\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmission request added to queue\n");
return th;
}
struct PeerRecord *pr = th->peer;
struct GNUNET_CORE_Handle *h;
+ GNUNET_assert (NULL != th);
GNUNET_assert (NULL != pr);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Aborting transmission request to core for %u bytes to `%s'\n",
{
/* we're currently in the control queue, remove */
GNUNET_CONTAINER_DLL_remove (h->control_pending_head,
- h->control_pending_tail, th->cm);
+ h->control_pending_tail,
+ th->cm);
GNUNET_free (th->cm);
th->cm = NULL;
}
- if ((NULL != pr->prev) || (NULL != pr->next) || (pr == h->ready_peer_head))
+ if ( (NULL != pr->prev) ||
+ (NULL != pr->next) ||
+ (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);
+ GNUNET_CONTAINER_DLL_remove (h->ready_peer_head,
+ h->ready_peer_tail,
+ pr);
}
- if (GNUNET_SCHEDULER_NO_TASK != pr->ntr_task)
+ if (NULL != pr->ntr_task)
{
GNUNET_SCHEDULER_cancel (pr->ntr_task);
- pr->ntr_task = GNUNET_SCHEDULER_NO_TASK;
+ pr->ntr_task = NULL;
}
}
* Check if the given peer is currently connected. This function is for special
* cirumstances (GNUNET_TESTBED uses it), normal users of the CORE API are
* expected to track which peers are connected based on the connect/disconnect
- * callbacks from GNUNET_CORE_connect. This function is NOT part of the
+ * callbacks from #GNUNET_CORE_connect(). This function is NOT part of the
* 'versioned', 'official' API. The difference between this function and the
* function GNUNET_CORE_is_peer_connected() is that this one returns
* synchronously after looking in the CORE API cache. The function
*
* @param h the core handle
* @param pid the identity of the peer to check if it has been connected to us
- * @return GNUNET_YES if the peer is connected to us; GNUNET_NO if not
+ * @return #GNUNET_YES if the peer is connected to us; #GNUNET_NO if not
*/
int
GNUNET_CORE_is_peer_connected_sync (const struct GNUNET_CORE_Handle *h,
{
GNUNET_assert (NULL != h);
GNUNET_assert (NULL != pid);
- return GNUNET_CONTAINER_multihashmap_contains (h->peers, &pid->hashPubKey);
+ return GNUNET_CONTAINER_multipeermap_contains (h->peers, pid);
}
projects / oweals / gnunet.git / blobdiff