#include "gnunet_core_service.h"
#include "core.h"
+#define LOG(kind,...) GNUNET_log_from (kind, "core-api",__VA_ARGS__)
/**
* Information we track for each peer.
*/
struct GNUNET_CORE_TransmitHandle *pending_tail;
- /**
- * Pending callback waiting for peer information, or NULL for none.
- */
- GNUNET_CORE_PeerConfigurationInfoCallback pcic;
-
- /**
- * Closure for pcic.
- */
- void *pcic_cls;
-
- /**
- * Pointer to free when we call pcic and to use to cancel
- * preference change on disconnect.
- */
- struct GNUNET_CORE_InformationRequestContext *pcic_ptr;
-
- /**
- * Request information ID for the given pcic (needed in case a
- * request is cancelled after being submitted to core and a new
- * one is generated; in this case, we need to avoid matching the
- * reply to the first (cancelled) request to the second request).
- */
- uint32_t rim_id;
-
/**
* ID of timeout task for the 'pending_head' handle
* which is the one with the smallest timeout.
*/
GNUNET_CORE_DisconnectEventHandler disconnects;
- /**
- * 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.
*/
*/
struct GNUNET_TIME_Relative retry_backoff;
- /**
- * Request information ID generator.
- */
- uint32_t rim_id_gen;
-
/**
* Number of messages we are allowed to queue per target.
*/
h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connecting to CORE service after delay\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to CORE service after delay\n");
#endif
reconnect (h);
}
struct GNUNET_CORE_Handle *h = cls;
struct GNUNET_CORE_TransmitHandle *th;
struct PeerRecord *pr = value;
- GNUNET_CORE_PeerConfigurationInfoCallback pcic;
- void *pcic_cls;
if (pr->timeout_task != GNUNET_SCHEDULER_NO_TASK)
{
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, 0, GNUNET_TIME_UNIT_FOREVER_REL);
- }
while (NULL != (th = pr->pending_head))
{
GNUNET_break (0);
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->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_CONTAINER_DLL_insert_tail (h->control_pending_head,
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));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding SEND REQUEST for peer `%s' to message queue\n",
+ GNUNET_i2s (&pr->peer));
#endif
trigger_next_request (h, GNUNET_NO);
}
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");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "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));
if (buf == NULL)
{
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmission failed, initiating reconnect\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmission failed, initiating reconnect\n");
#endif
reconnect_later (h);
return 0;
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));
+ 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,
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);
+ 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);
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);
+ 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)
{
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Size of clients message to peer %s is 0!\n",
- GNUNET_i2s (&pr->peer));
+ 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;
}
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Produced SEND message to core with %u bytes payload\n",
- (unsigned int) ret);
+ 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)
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");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Core connection down, not processing queue\n");
#endif
return;
}
if (NULL != h->cth)
{
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Request pending, not processing queue\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Request pending, not processing queue\n");
#endif
return;
}
else
{
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Request queue empty, not processing queue\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Request queue empty, not processing queue\n");
#endif
return; /* no pending message */
}
const struct DisconnectNotifyMessage *dnm;
const struct NotifyTrafficMessage *ntm;
const struct GNUNET_MessageHeader *em;
- const struct ConfigurationInfoMessage *cim;
- const struct PeerStatusNotifyMessage *psnm;
const struct SendMessageReady *smr;
const struct GNUNET_CORE_MessageHandler *mh;
+ const struct GNUNET_ATS_Information *ats;
GNUNET_CORE_StartupCallback init;
- GNUNET_CORE_PeerConfigurationInfoCallback pcic;
struct PeerRecord *pr;
struct GNUNET_CORE_TransmitHandle *th;
unsigned int hpos;
if (msg == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _
- ("Client was disconnected from core service, trying to reconnect.\n"));
+ 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,
- "Processing message of type %u and size %u from core service\n",
- ntohs (msg->type), msize);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing message of type %u and size %u from core service\n",
+ ntohs (msg->type), msize);
#endif
switch (ntohs (msg->type))
{
/* 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));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Connected to core service of peer `%s'.\n",
+ GNUNET_i2s (&h->me));
#endif
init (h->cls, h, &h->me);
}
else
{
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Successfully reconnected to core service.\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Successfully reconnected to core service.\n");
#endif
}
/* fake 'connect to self' */
&h->me.hashPubKey, pr,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
if (NULL != h->connects)
- h->connects (h->cls, &h->me, NULL);
+ h->connects (h->cls, &h->me, NULL, 0);
break;
case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT:
if (msize < sizeof (struct ConnectNotifyMessage))
}
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)))
+ if (msize !=
+ sizeof (struct ConnectNotifyMessage) +
+ ats_count * sizeof (struct GNUNET_ATS_Information))
{
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));
+ 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)))
{
GNUNET_CONTAINER_multihashmap_put (h->peers,
&cnm->peer.hashPubKey, pr,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
+ ats = (const struct GNUNET_ATS_Information *) &cnm[1];
if (NULL != h->connects)
- h->connects (h->cls, &cnm->peer, &cnm->ats);
+ h->connects (h->cls, &cnm->peer, ats, ats_count);
break;
case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT:
if (msize != sizeof (struct DisconnectNotifyMessage))
}
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));
+ 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)
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));
-#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))
{
ats_count = ntohl (ntm->ats_count);
if ((msize <
sizeof (struct NotifyTrafficMessage) +
- ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) +
+ ats_count * sizeof (struct GNUNET_ATS_Information) +
sizeof (struct GNUNET_MessageHeader)) ||
- (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR !=
- ntohl ((&ntm->ats)[ats_count].type)))
+ (GNUNET_ATS_ARRAY_TERMINATOR != ntohl ((&ntm->ats)[ats_count].type)))
{
GNUNET_break (0);
reconnect_later (h);
}
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",
- ntohs (em->type), ntohs (em->size), GNUNET_i2s (&ntm->peer));
+ 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));
#endif
pr = GNUNET_CONTAINER_multihashmap_get (h->peers, &ntm->peer.hashPubKey);
if (pr == NULL)
if ((GNUNET_NO == h->inbound_hdr_only) &&
(msize !=
ntohs (em->size) + sizeof (struct NotifyTrafficMessage) +
- +ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information)))
+ +ats_count * sizeof (struct GNUNET_ATS_Information)))
{
GNUNET_break (0);
reconnect_later (h);
continue;
if ((mh->expected_size != ntohs (em->size)) && (mh->expected_size != 0))
{
- GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unexpected message size %u for message of type %u from peer `%4s'\n",
+ htons (em->size), mh->type, GNUNET_i2s (&ntm->peer));
+ GNUNET_break_op (0);
continue;
}
if (GNUNET_OK !=
- h->handlers[hpos].callback (h->cls, &ntm->peer, em, &ntm->ats))
+ h->handlers[hpos].callback (h->cls, &ntm->peer, em, &ntm->ats,
+ ats_count))
{
/* error in processing, do not process other messages! */
break;
}
}
if (NULL != h->inbound_notify)
- h->inbound_notify (h->cls, &ntm->peer, em, &ntm->ats);
+ h->inbound_notify (h->cls, &ntm->peer, em, &ntm->ats, ats_count);
break;
case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_OUTBOUND:
if (msize < sizeof (struct NotifyTrafficMessage))
ats_count = ntohl (ntm->ats_count);
if ((msize <
sizeof (struct NotifyTrafficMessage) +
- ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) +
+ ats_count * sizeof (struct GNUNET_ATS_Information) +
sizeof (struct GNUNET_MessageHeader)) ||
- (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR !=
- ntohl ((&ntm->ats)[ats_count].type)))
+ (GNUNET_ATS_ARRAY_TERMINATOR != ntohl ((&ntm->ats)[ats_count].type)))
{
GNUNET_break (0);
reconnect_later (h);
return;
}
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received notification about transmission to `%s'.\n",
- GNUNET_i2s (&ntm->peer));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received notification about transmission to `%s'.\n",
+ GNUNET_i2s (&ntm->peer));
#endif
if ((GNUNET_NO == h->outbound_hdr_only) &&
(msize !=
ntohs (em->size) + sizeof (struct NotifyTrafficMessage) +
- ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information)))
+ ats_count * sizeof (struct GNUNET_ATS_Information)))
{
GNUNET_break (0);
reconnect_later (h);
GNUNET_break (0);
break;
}
- h->outbound_notify (h->cls, &ntm->peer, em, &ntm->ats);
+ h->outbound_notify (h->cls, &ntm->peer, em, &ntm->ats, ats_count);
break;
case GNUNET_MESSAGE_TYPE_CORE_SEND_READY:
if (msize != sizeof (struct SendMessageReady))
return;
}
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received notification about transmission readiness to `%s'.\n",
- GNUNET_i2s (&smr->peer));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received notification about transmission readiness to `%s'.\n",
+ GNUNET_i2s (&smr->peer));
#endif
if (pr->pending_head == NULL)
{
GNUNET_CONTAINER_DLL_insert (h->ready_peer_head, h->ready_peer_tail, pr);
trigger_next_request (h, GNUNET_NO);
break;
- case GNUNET_MESSAGE_TYPE_CORE_CONFIGURATION_INFO:
- if (ntohs (msg->size) != sizeof (struct ConfigurationInfoMessage))
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- cim = (const struct ConfigurationInfoMessage *) msg;
- if (0 == memcmp (&h->me, &cim->peer, sizeof (struct GNUNET_PeerIdentity)))
- {
- /* self-change!? */
- GNUNET_break (0);
- return;
- }
-#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received notification about configuration update for `%s' with RIM %u.\n",
- GNUNET_i2s (&cim->peer), (unsigned int) ntohl (cim->rim_id));
-#endif
- pr = GNUNET_CONTAINER_multihashmap_get (h->peers, &cim->peer.hashPubKey);
- if (pr == NULL)
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- if (pr->rim_id != ntohl (cim->rim_id))
- {
-#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Reservation ID mismatch in notification...\n");
-#endif
- break;
- }
- pcic = pr->pcic;
- pr->pcic = NULL;
- GNUNET_free_non_null (pr->pcic_ptr);
- pr->pcic_ptr = NULL;
- if (pcic != NULL)
- pcic (pr->pcic_cls, &pr->peer, ntohl (cim->reserved_amount),
- GNUNET_TIME_relative_ntoh (cim->reserve_delay));
- break;
default:
reconnect_later (h);
return;
if (success == GNUNET_NO)
{
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Failed to exchange INIT with core, retrying\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to exchange INIT with core, retrying\n");
#endif
if (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK)
reconnect_later (h);
unsigned int hpos;
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Reconnecting to CORE service\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Reconnecting to CORE service\n");
#endif
GNUNET_assert (h->client == NULL);
GNUNET_assert (h->currently_down == GNUNET_YES);
init = (struct InitMessage *) &cm[1];
init->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT);
init->header.size = htons (msize);
- opt = GNUNET_CORE_OPTION_SEND_CONNECT | GNUNET_CORE_OPTION_SEND_DISCONNECT;
- if (h->status_events != NULL)
- opt |= GNUNET_CORE_OPTION_SEND_STATUS_CHANGE;
+ opt = 0;
if (h->inbound_notify != NULL)
{
if (h->inbound_hdr_only)
* connected to the core service; note that timeout is only meaningful if init is not NULL
* @param connects function to call on peer connect, can be NULL
* @param disconnects function to call on peer disconnect / timeout, can be NULL
- * @param status_events function to call on changes to peer connection status, 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
* GNUNET_MessageHeader and hence we do not need to give it the full message;
GNUNET_CORE_StartupCallback init,
GNUNET_CORE_ConnectEventHandler connects,
GNUNET_CORE_DisconnectEventHandler disconnects,
- GNUNET_CORE_PeerStatusEventHandler status_events,
GNUNET_CORE_MessageCallback inbound_notify,
int inbound_hdr_only,
GNUNET_CORE_MessageCallback outbound_notify,
h->init = init;
h->connects = connects;
h->disconnects = disconnects;
- h->status_events = status_events;
h->inbound_notify = inbound_notify;
h->outbound_notify = outbound_notify;
h->inbound_hdr_only = inbound_hdr_only;
(GNUNET_SERVER_MAX_MESSAGE_SIZE -
sizeof (struct InitMessage)) / sizeof (uint16_t));
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to CORE service\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to CORE service\n");
#endif
reconnect (h);
return h;
struct ControlMessage *cm;
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from CORE service\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from CORE service\n");
#endif
if (handle->cth != NULL)
{
if (NULL == pr)
{
/* attempt to send to peer that is not connected */
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Attempting to send to peer `%s' from peer `%s', but not connected!\n",
- GNUNET_i2s (target), GNUNET_h2s (&handle->me.hashPubKey));
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Attempting to send to peer `%s' from peer `%s', but not connected!\n",
+ GNUNET_i2s (target), GNUNET_h2s (&handle->me.hashPubKey));
GNUNET_break (0);
return NULL;
}
GNUNET_break (pr->queue_size == 1);
GNUNET_free (th);
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Dropping transmission request: cannot drop queue head and limit is one\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Dropping transmission request: cannot drop queue head and limit is one\n");
#endif
return NULL;
}
if (priority <= minp->priority)
{
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Dropping transmission request: priority too low\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Dropping transmission request: priority too low\n");
#endif
GNUNET_free (th);
return NULL; /* priority too low */
GNUNET_free (minp);
}
- /* Order entries by deadline, but SKIP 'HEAD' if
- * we're in the 'ready_peer_*' DLL */
+ /* Order entries by deadline, but SKIP 'HEAD' (as we may have transmitted
+ * that request already or might even already be approved to transmit that
+ * message to core) */
pos = pr->pending_head;
- if ((pr->prev != NULL) || (pr->next != NULL) ||
- (pr == handle->ready_peer_head))
- {
- GNUNET_assert (pos != NULL);
+ if (pos != NULL)
pos = pos->next; /* skip head */
- }
/* insertion sort */
prev = pos;
pr->queue_size++;
/* was the request queue previously empty? */
#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmission request added to queue\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmission request added to queue\n");
#endif
if ((pr->pending_head == th) && (pr->ntr_task == GNUNET_SCHEDULER_NO_TASK) &&
(pr->next == NULL) && (pr->prev == NULL) &&
}
-/* ****************** GNUNET_CORE_peer_change_preference ******************** */
-
-
-struct GNUNET_CORE_InformationRequestContext
-{
-
- /**
- * Our connection to the service.
- */
- struct GNUNET_CORE_Handle *h;
-
- /**
- * Link to control message, NULL if CM was sent.
- */
- struct ControlMessage *cm;
-
- /**
- * Link to peer record.
- */
- struct PeerRecord *pr;
-};
-
-
-/**
- * CM was sent, remove link so we don't double-free.
- *
- * @param cls the 'struct GNUNET_CORE_InformationRequestContext'
- * @param success were we successful?
- */
-static void
-change_preference_send_continuation (void *cls, int success)
-{
- struct GNUNET_CORE_InformationRequestContext *irc = cls;
-
- irc->cm = NULL;
-}
-
-
-/**
- * Obtain statistics and/or change preferences for the given peer.
- *
- * @param h core handle
- * @param peer identifies the peer
- * @param amount reserve N bytes for receiving, negative
- * amounts can be used to undo a (recent) reservation;
- * @param preference increase incoming traffic share preference by this amount;
- * in the absence of "amount" reservations, we use this
- * preference value to assign proportional bandwidth shares
- * to all connected peers
- * @param info function to call with the resulting configuration information
- * @param info_cls closure for info
- * @return NULL on error
- */
-struct GNUNET_CORE_InformationRequestContext *
-GNUNET_CORE_peer_change_preference (struct GNUNET_CORE_Handle *h,
- const struct GNUNET_PeerIdentity *peer,
- int32_t amount, uint64_t preference,
- GNUNET_CORE_PeerConfigurationInfoCallback
- info, void *info_cls)
-{
- struct GNUNET_CORE_InformationRequestContext *irc;
- struct PeerRecord *pr;
- struct RequestInfoMessage *rim;
- struct ControlMessage *cm;
-
- pr = GNUNET_CONTAINER_multihashmap_get (h->peers, &peer->hashPubKey);
- if (NULL == pr)
- {
- /* attempt to change preference on peer that is not connected */
- GNUNET_assert (0);
- return NULL;
- }
- if (pr->pcic != NULL)
- {
- /* second change before first one is done */
- GNUNET_break (0);
- return NULL;
- }
- irc = GNUNET_malloc (sizeof (struct GNUNET_CORE_InformationRequestContext));
- irc->h = h;
- irc->pr = pr;
- cm = GNUNET_malloc (sizeof (struct ControlMessage) +
- sizeof (struct RequestInfoMessage));
- cm->cont = &change_preference_send_continuation;
- cm->cont_cls = irc;
- irc->cm = cm;
- rim = (struct RequestInfoMessage *) &cm[1];
- rim->header.size = htons (sizeof (struct RequestInfoMessage));
- rim->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_REQUEST_INFO);
- rim->rim_id = htonl (pr->rim_id = h->rim_id_gen++);
- rim->limit_outbound = GNUNET_BANDWIDTH_VALUE_MAX; // FIXME: remove entirely soon...
- rim->reserve_inbound = htonl (amount);
- rim->preference_change = GNUNET_htonll (preference);
- rim->peer = *peer;
-#if DEBUG_CORE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Queueing CHANGE PREFERENCE request for peer `%s' with RIM %u\n",
- GNUNET_i2s (peer), (unsigned int) pr->rim_id);
-#endif
- GNUNET_CONTAINER_DLL_insert_tail (h->control_pending_head,
- h->control_pending_tail, cm);
- pr->pcic = info;
- pr->pcic_cls = info_cls;
- pr->pcic_ptr = irc; /* for free'ing irc */
- if (NULL != h->client)
- trigger_next_request (h, GNUNET_NO);
- return irc;
-}
-
-
-/**
- * Cancel request for getting information about a peer.
- * Note that an eventual change in preference, trust or bandwidth
- * assignment MAY have already been committed at the time,
- * so cancelling a request is NOT sure to undo the original
- * request. The original request may or may not still commit.
- * The only thing cancellation ensures is that the callback
- * from the original request will no longer be called.
- *
- * @param irc context returned by the original GNUNET_CORE_peer_get_info call
- */
-void
-GNUNET_CORE_peer_change_preference_cancel (struct
- GNUNET_CORE_InformationRequestContext
- *irc)
-{
- struct GNUNET_CORE_Handle *h = irc->h;
- struct PeerRecord *pr = irc->pr;
-
- GNUNET_assert (pr->pcic_ptr == irc);
- if (irc->cm != NULL)
- {
- GNUNET_CONTAINER_DLL_remove (h->control_pending_head,
- h->control_pending_tail, irc->cm);
- GNUNET_free (irc->cm);
- }
- pr->pcic = NULL;
- pr->pcic_cls = NULL;
- pr->pcic_ptr = NULL;
- GNUNET_free (irc);
-}
-
-
/* end of core_api.c */