* - test test test
*/
#include "platform.h"
+#include "gnunet_constants.h"
#include "gnunet_bandwidth_lib.h"
#include "gnunet_client_lib.h"
#include "gnunet_constants.h"
#include "gnunet_transport_service.h"
#include "transport.h"
+#define LOG(kind,...) GNUNET_log_from (kind, "transport-api",__VA_ARGS__)
+
/**
* How large to start with for the hashmap of neighbours.
*/
#define STARTING_NEIGHBOURS_SIZE 16
-
/**
* Handle for a message that should be transmitted to the service.
* Used for both control messages and normal messages.
struct GNUNET_TIME_Absolute timeout;
/**
- * Task to trigger request timeout if the request is stalled due to
+ * Task to trigger request timeout if the request is stalled due to
* congestion.
*/
GNUNET_SCHEDULER_TaskIdentifier timeout_task;
*/
int is_ready;
+ /**
+ * Sending consumed more bytes on wire than payload was announced
+ * This overhead is added to the delay of next sending operation
+ */
+ size_t traffic_overhead;
};
/**
* Linked list of functions to call whenever our HELLO is updated.
*/
-struct HelloWaitList
+struct GNUNET_TRANSPORT_GetHelloHandle
{
/**
* This is a doubly linked list.
*/
- struct HelloWaitList *next;
+ struct GNUNET_TRANSPORT_GetHelloHandle *next;
/**
* This is a doubly linked list.
*/
- struct HelloWaitList *prev;
+ struct GNUNET_TRANSPORT_GetHelloHandle *prev;
+
+ /**
+ * Transport handle.
+ */
+ struct GNUNET_TRANSPORT_Handle *handle;
/**
* Callback to call once we got our HELLO.
/**
* Linked list of pending requests for our HELLO.
*/
- struct HelloWaitList *hwl_head;
+ struct GNUNET_TRANSPORT_GetHelloHandle *hwl_head;
/**
* Linked list of pending requests for our HELLO.
*/
- struct HelloWaitList *hwl_tail;
+ struct GNUNET_TRANSPORT_GetHelloHandle *hwl_tail;
/**
* My configuration.
*
* @param h transport service to schedule a transmission for
*/
-static void schedule_transmission (struct GNUNET_TRANSPORT_Handle *h);
+static void
+schedule_transmission (struct GNUNET_TRANSPORT_Handle *h);
/**
{
struct Neighbour *n;
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Creating entry for neighbour `%4s'.\n", GNUNET_i2s (pid));
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Creating entry for neighbour `%4s'.\n",
+ GNUNET_i2s (pid));
n = GNUNET_malloc (sizeof (struct Neighbour));
n->id = *pid;
n->h = h;
n->is_ready = GNUNET_YES;
+ n->traffic_overhead = 0;
GNUNET_BANDWIDTH_tracker_init (&n->out_tracker,
GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT,
MAX_BANDWIDTH_CARRY_S);
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_multihashmap_put (h->neighbours,
- &pid->hashPubKey,
- n,
+ &n->id.hashPubKey, n,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
return n;
}
* GNUNET_NO if not.
*/
static int
-neighbour_delete (void *cls, const GNUNET_HashCode * key, void *value)
+neighbour_delete (void *cls, const struct GNUNET_HashCode * key, void *value)
{
struct GNUNET_TRANSPORT_Handle *handle = cls;
struct Neighbour *n = value;
GNUNET_assert (NULL == n->th);
GNUNET_assert (NULL == n->hn);
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (handle->neighbours,
- key, n));
+ GNUNET_CONTAINER_multihashmap_remove (handle->neighbours, key,
+ n));
GNUNET_free (n);
return GNUNET_YES;
}
const struct InboundMessage *im;
const struct GNUNET_MessageHeader *imm;
const struct SendOkMessage *okm;
- struct HelloWaitList *hwl;
- struct HelloWaitList *next_hwl;
+ const struct QuotaSetMessage *qm;
+ const struct GNUNET_ATS_Information *ats;
+ struct GNUNET_TRANSPORT_GetHelloHandle *hwl;
+ struct GNUNET_TRANSPORT_GetHelloHandle *next_hwl;
struct Neighbour *n;
struct GNUNET_PeerIdentity me;
uint16_t size;
uint32_t ats_count;
+ uint32_t bytes_msg;
+ uint32_t bytes_physical;
GNUNET_assert (h->client != NULL);
if (msg == NULL)
{
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Error receiving from transport service, disconnecting temporarily.\n");
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Error receiving from transport service, disconnecting temporarily.\n");
disconnect_and_schedule_reconnect (h);
return;
}
- GNUNET_CLIENT_receive (h->client,
- &demultiplexer, h, GNUNET_TIME_UNIT_FOREVER_REL);
+ GNUNET_CLIENT_receive (h->client, &demultiplexer, h,
+ GNUNET_TIME_UNIT_FOREVER_REL);
size = ntohs (msg->size);
switch (ntohs (msg->type))
{
GNUNET_break (0);
break;
}
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Receiving (my own) `%s' message, I am `%4s'.\n",
- "HELLO", GNUNET_i2s (&me));
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Receiving (my own) `%s' message, I am `%4s'.\n", "HELLO",
+ GNUNET_i2s (&me));
GNUNET_free_non_null (h->my_hello);
h->my_hello = NULL;
if (size < sizeof (struct GNUNET_MessageHeader))
ats_count = ntohl (cim->ats_count);
if (size !=
sizeof (struct ConnectInfoMessage) +
- ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information))
+ ats_count * sizeof (struct GNUNET_ATS_Information))
{
GNUNET_break (0);
break;
}
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Receiving `%s' message for `%4s'.\n",
- "CONNECT", GNUNET_i2s (&cim->id));
-#endif
+ ats = (const struct GNUNET_ATS_Information *) &cim[1];
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message for `%4s'.\n",
+ "CONNECT", GNUNET_i2s (&cim->id));
n = neighbour_find (h, &cim->id);
if (n != NULL)
{
break;
}
n = neighbour_add (h, &cim->id);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message for `%4s' with quota %u\n",
+ "CONNECT", GNUNET_i2s (&cim->id), ntohl (cim->quota_out.value__));
+ GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker, cim->quota_out);
if (h->nc_cb != NULL)
- h->nc_cb (h->cls, &n->id, &cim->ats, ats_count);
+ h->nc_cb (h->cls, &n->id, ats, ats_count);
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT:
if (size != sizeof (struct DisconnectInfoMessage))
}
dim = (const struct DisconnectInfoMessage *) msg;
GNUNET_break (ntohl (dim->reserved) == 0);
-#if DEBUG_TRANSPORT_DISCONNECT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Receiving `%s' message for `%4s'.\n",
- "DISCONNECT", GNUNET_i2s (&dim->peer));
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message for `%4s'.\n",
+ "DISCONNECT", GNUNET_i2s (&dim->peer));
n = neighbour_find (h, &dim->peer);
if (n == NULL)
{
break;
}
okm = (const struct SendOkMessage *) msg;
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Receiving `%s' message, transmission %s.\n", "SEND_OK",
- ntohl (okm->success) == GNUNET_OK ? "succeeded" : "failed");
-#endif
+ bytes_msg = ntohl (okm->bytes_msg);
+ bytes_physical = ntohl (okm->bytes_physical);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message, transmission %s.\n",
+ "SEND_OK", ntohl (okm->success) == GNUNET_OK ? "succeeded" : "failed");
+
n = neighbour_find (h, &okm->peer);
if (n == NULL)
break;
+
+ if (bytes_physical >= bytes_msg)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Overhead for %u byte message: %u \n",
+ bytes_msg, bytes_physical - bytes_msg);
+ n->traffic_overhead += bytes_physical - bytes_msg;
+ }
GNUNET_break (GNUNET_NO == n->is_ready);
n->is_ready = GNUNET_YES;
if ((n->th != NULL) && (n->hn == NULL))
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != n->th->timeout_task);
GNUNET_SCHEDULER_cancel (n->th->timeout_task);
n->th->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- /* we've been waiting for this (congestion, not quota,
+ /* we've been waiting for this (congestion, not quota,
* caused delayed transmission) */
n->hn = GNUNET_CONTAINER_heap_insert (h->ready_heap, n, 0);
schedule_transmission (h);
}
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_RECV:
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message.\n", "RECV");
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message.\n", "RECV");
if (size <
sizeof (struct InboundMessage) + sizeof (struct GNUNET_MessageHeader))
{
break;
}
im = (const struct InboundMessage *) msg;
- GNUNET_break (0 == ntohl (im->reserved));
ats_count = ntohl (im->ats_count);
- imm = (const struct GNUNET_MessageHeader *) &((&(im->ats))[ats_count + 1]);
-
+ ats = (const struct GNUNET_ATS_Information *) &im[1];
+ imm = (const struct GNUNET_MessageHeader *) &ats[ats_count];
if (ntohs (imm->size) + sizeof (struct InboundMessage) +
- ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) != size)
+ ats_count * sizeof (struct GNUNET_ATS_Information) != size)
{
GNUNET_break (0);
break;
}
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received message of type %u from `%4s'.\n",
- ntohs (imm->type), GNUNET_i2s (&im->peer));
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Received message of type %u from `%4s'.\n",
+ ntohs (imm->type), GNUNET_i2s (&im->peer));
n = neighbour_find (h, &im->peer);
if (n == NULL)
{
break;
}
if (h->rec != NULL)
- h->rec (h->cls, &im->peer, imm, &im->ats, ats_count);
+ h->rec (h->cls, &im->peer, imm, ats, ats_count);
+ break;
+ case GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA:
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message.\n", "SET_QUOTA");
+ if (size != sizeof (struct QuotaSetMessage))
+ {
+ GNUNET_break (0);
+ break;
+ }
+ qm = (const struct QuotaSetMessage *) msg;
+ n = neighbour_find (h, &qm->peer);
+ if (n == NULL)
+ break;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message for `%4s' with quota %u\n",
+ "SET_QUOTA", GNUNET_i2s (&qm->peer), ntohl (qm->quota.value__));
+ GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker, qm->quota);
break;
default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _
- ("Received unexpected message of type %u in %s:%u\n"),
- ntohs (msg->type), __FILE__, __LINE__);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Received unexpected message of type %u in %s:%u\n"),
+ ntohs (msg->type), __FILE__, __LINE__);
GNUNET_break (0);
break;
}
{
GNUNET_CONTAINER_DLL_remove (h->control_head, h->control_tail, th);
nret = th->notify (th->notify_cls, size, &cbuf[ret]);
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Added %u bytes of control message at %u\n", nret, ret);
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Added %u bytes of control message at %u\n",
+ nret, ret);
GNUNET_free (th);
ret += nret;
size -= nret;
n->th = NULL;
n->is_ready = GNUNET_NO;
GNUNET_assert (size >= sizeof (struct OutboundMessage));
- mret = th->notify (th->notify_cls,
- size - sizeof (struct OutboundMessage),
- &cbuf[ret + sizeof (struct OutboundMessage)]);
+ mret =
+ th->notify (th->notify_cls, size - sizeof (struct OutboundMessage),
+ &cbuf[ret + sizeof (struct OutboundMessage)]);
GNUNET_assert (mret <= size - sizeof (struct OutboundMessage));
if (mret != 0)
{
}
/* if there are more pending messages, try to schedule those */
schedule_transmission (h);
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting %u bytes to transport service\n", ret);
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting %u bytes to transport service\n",
+ ret);
return ret;
}
n->th = NULL;
GNUNET_assert (n == GNUNET_CONTAINER_heap_remove_root (h->ready_heap));
n->hn = NULL;
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Signalling timeout for transmission to peer %s due to congestion\n",
- GNUNET_i2s (&n->id));
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Signalling timeout for transmission to peer %s due to congestion\n",
+ GNUNET_i2s (&n->id));
GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
GNUNET_free (th);
}
return; /* no pending messages */
size = n->th->notify_size + sizeof (struct OutboundMessage);
}
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Calling notify_transmit_ready\n");
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Calling notify_transmit_ready\n");
h->cth =
- GNUNET_CLIENT_notify_transmit_ready (h->client,
- size,
+ GNUNET_CLIENT_notify_transmit_ready (h->client, size,
GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_NO,
- &transport_notify_ready, h);
+ GNUNET_NO, &transport_notify_ready,
+ h);
GNUNET_assert (NULL != h->cth);
}
if (NULL != h->control_head)
delay = GNUNET_TIME_UNIT_ZERO;
else if (NULL != (n = GNUNET_CONTAINER_heap_peek (h->ready_heap)))
+ {
delay =
GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker,
- n->th->notify_size);
+ n->th->notify_size + n->traffic_overhead);
+ n->traffic_overhead = 0;
+ }
else
return; /* no work to be done */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Scheduling next transmission to service in %llu ms\n",
- (unsigned long long) delay.rel_value);
- h->quota_task = GNUNET_SCHEDULER_add_delayed (delay,
- &schedule_transmission_task, h);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Scheduling next transmission to service in %llu ms\n",
+ (unsigned long long) delay.rel_value);
+ h->quota_task =
+ GNUNET_SCHEDULER_add_delayed (delay, &schedule_transmission_task, h);
}
* @param notify_cls closure for notify
*/
static void
-schedule_control_transmit (struct GNUNET_TRANSPORT_Handle *h,
- size_t size,
+schedule_control_transmit (struct GNUNET_TRANSPORT_Handle *h, size_t size,
GNUNET_CONNECTION_TransmitReadyNotify notify,
void *notify_cls)
{
struct GNUNET_TRANSPORT_TransmitHandle *th;
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Control transmit of %u bytes requested\n", size);
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Control transmit of %u bytes requested\n",
+ size);
th = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_TransmitHandle));
th->notify = notify;
th->notify_cls = notify_cls;
{
struct GNUNET_TRANSPORT_Handle *h = cls;
struct StartMessage s;
+ uint32_t options;
if (buf == NULL)
{
/* Can only be shutdown, just give up */
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Shutdown while trying to transmit `%s' request.\n", "START");
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Shutdown while trying to transmit `%s' request.\n", "START");
return 0;
}
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' request.\n", "START");
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' request.\n", "START");
GNUNET_assert (size >= sizeof (struct StartMessage));
s.header.size = htons (sizeof (struct StartMessage));
s.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_START);
- s.do_check = htonl (h->check_self);
+ options = 0;
+ if (h->check_self)
+ options |= 1;
+ if (h->rec != NULL)
+ options |= 2;
+ s.options = htonl (options);
s.self = h->self;
memcpy (buf, &s, sizeof (struct StartMessage));
- GNUNET_CLIENT_receive (h->client,
- &demultiplexer, h, GNUNET_TIME_UNIT_FOREVER_REL);
+ GNUNET_CLIENT_receive (h->client, &demultiplexer, h,
+ GNUNET_TIME_UNIT_FOREVER_REL);
return sizeof (struct StartMessage);
}
/* shutdown, just give up */
return;
}
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to transport service.\n");
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to transport service.\n");
GNUNET_assert (h->client == NULL);
GNUNET_assert (h->control_head == NULL);
GNUNET_assert (h->control_tail == NULL);
struct GNUNET_TRANSPORT_TransmitHandle *th;
GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
- /* Forget about all neighbours that we used to be connected to */
- GNUNET_CONTAINER_multihashmap_iterate (h->neighbours, &neighbour_delete, h);
if (NULL != h->cth)
{
GNUNET_CLIENT_notify_transmit_ready_cancel (h->cth);
}
if (NULL != h->client)
{
- GNUNET_CLIENT_disconnect (h->client, GNUNET_YES);
+ GNUNET_CLIENT_disconnect (h->client);
h->client = NULL;
}
+ /* Forget about all neighbours that we used to be connected to */
+ GNUNET_CONTAINER_multihashmap_iterate (h->neighbours, &neighbour_delete, h);
if (h->quota_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (h->quota_task);
th->notify (th->notify_cls, 0, NULL);
GNUNET_free (th);
}
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Scheduling task to reconnect to transport service in %llu ms.\n",
- h->reconnect_delay.rel_value);
-#endif
- h->reconnect_task
- = GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Scheduling task to reconnect to transport service in %llu ms.\n",
+ h->reconnect_delay.rel_value);
+ h->reconnect_task =
+ GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h);
if (h->reconnect_delay.rel_value == 0)
{
h->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
else
{
h->reconnect_delay = GNUNET_TIME_relative_multiply (h->reconnect_delay, 2);
- h->reconnect_delay = GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS,
- h->reconnect_delay);
+ h->reconnect_delay =
+ GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS, h->reconnect_delay);
}
}
-/**
- * Closure for 'send_set_quota'.
- */
-struct SetQuotaContext
-{
-
- /**
- * Identity of the peer impacted by the quota change.
- */
- struct GNUNET_PeerIdentity target;
-
- /**
- * Quota to transmit.
- */
- struct GNUNET_BANDWIDTH_Value32NBO quota_in;
-};
-
-
-/**
- * Send SET_QUOTA message to the service.
- *
- * @param cls the 'struct SetQuotaContext'
- * @param size number of bytes available in buf
- * @param buf where to copy the message
- * @return number of bytes copied to buf
- */
-static size_t
-send_set_quota (void *cls, size_t size, void *buf)
-{
- struct SetQuotaContext *sqc = cls;
- struct QuotaSetMessage msg;
-
- if (buf == NULL)
- {
- GNUNET_free (sqc);
- return 0;
- }
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting `%s' request with respect to `%4s'.\n",
- "SET_QUOTA", GNUNET_i2s (&sqc->target));
-#endif
- GNUNET_assert (size >= sizeof (struct QuotaSetMessage));
- msg.header.size = htons (sizeof (struct QuotaSetMessage));
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
- msg.quota = sqc->quota_in;
- msg.peer = sqc->target;
- memcpy (buf, &msg, sizeof (msg));
- GNUNET_free (sqc);
- return sizeof (struct QuotaSetMessage);
-}
-
-
-/**
- * Set the share of incoming bandwidth for the given
- * peer to the specified amount.
- *
- * @param handle connection to transport service
- * @param target who's bandwidth quota is being changed
- * @param quota_in incoming bandwidth quota in bytes per ms
- * @param quota_out outgoing bandwidth quota in bytes per ms
- */
-void
-GNUNET_TRANSPORT_set_quota (struct GNUNET_TRANSPORT_Handle *handle,
- const struct GNUNET_PeerIdentity *target,
- struct GNUNET_BANDWIDTH_Value32NBO quota_in,
- struct GNUNET_BANDWIDTH_Value32NBO quota_out)
-{
- struct Neighbour *n;
- struct SetQuotaContext *sqc;
-
- n = neighbour_find (handle, target);
- if (NULL == n)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Quota changed to %u for peer `%s', but I have no such neighbour!\n",
- (unsigned int) ntohl (quota_out.value__), GNUNET_i2s (target));
- return;
- }
- GNUNET_assert (NULL != handle->client);
-#if DEBUG_TRANSPORT
- if (ntohl (quota_out.value__) != n->out_tracker.available_bytes_per_s__)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Quota changed from %u to %u for peer `%s'\n",
- (unsigned int) n->out_tracker.available_bytes_per_s__,
- (unsigned int) ntohl (quota_out.value__), GNUNET_i2s (target));
- else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Quota remains at %u for peer `%s'\n",
- (unsigned int) n->out_tracker.available_bytes_per_s__,
- GNUNET_i2s (target));
-#endif
- GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker, quota_out);
- sqc = GNUNET_malloc (sizeof (struct SetQuotaContext));
- sqc->target = *target;
- sqc->quota_in = quota_in;
- schedule_control_transmit (handle,
- sizeof (struct QuotaSetMessage),
- &send_set_quota, sqc);
-}
-
-
/**
* Send REQUEST_CONNECT message to the service.
*
GNUNET_free (pid);
return 0;
}
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting `%s' request with respect to `%4s'.\n",
- "REQUEST_CONNECT", GNUNET_i2s (pid));
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmitting `%s' request with respect to `%4s'.\n", "REQUEST_CONNECT",
+ GNUNET_i2s (pid));
GNUNET_assert (size >= sizeof (struct TransportRequestConnectMessage));
msg.header.size = htons (sizeof (struct TransportRequestConnectMessage));
msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_CONNECT);
/**
- * Ask the transport service to establish a connection to
+ * Ask the transport service to establish a connection to
* the given peer.
*
* @param handle connection to transport service
const struct GNUNET_PeerIdentity *target)
{
struct GNUNET_PeerIdentity *pid;
-
if (NULL == handle->client)
- return;
+ {
+ /* FIXME: handle->client can be NULL when transport api is reconnecting */
+ GNUNET_break (0);
+ return;
+ }
+
pid = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity));
*pid = *target;
schedule_control_transmit (handle,
}
+struct SendHelloContext
+{
+ GNUNET_SCHEDULER_Task cont;
+
+ void *cls;
+
+ struct GNUNET_MessageHeader *msg;
+};
+
/**
* Send HELLO message to the service.
*
static size_t
send_hello (void *cls, size_t size, void *buf)
{
- struct GNUNET_MessageHeader *msg = cls;
+ struct SendHelloContext *shc = cls;
+ struct GNUNET_MessageHeader *msg = shc->msg;
uint16_t ssize;
+ struct GNUNET_SCHEDULER_TaskContext tc;
+ tc.read_ready = NULL;
+ tc.write_ready = NULL;
+ tc.reason = GNUNET_SCHEDULER_REASON_TIMEOUT;
if (buf == NULL)
{
-#if DEBUG_TRANSPORT_TIMEOUT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Timeout while trying to transmit `%s' request.\n", "HELLO");
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout while trying to transmit `%s' request.\n", "HELLO");
+ if (NULL != shc->cont)
+ shc->cont (shc->cls, &tc);
GNUNET_free (msg);
+ GNUNET_free (shc);
return 0;
}
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' request.\n", "HELLO");
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' request.\n", "HELLO");
ssize = ntohs (msg->size);
GNUNET_assert (size >= ssize);
memcpy (buf, msg, ssize);
GNUNET_free (msg);
+ tc.reason = GNUNET_SCHEDULER_REASON_READ_READY;
+ if (NULL != shc->cont)
+ shc->cont (shc->cls, &tc);
+ GNUNET_free (shc);
return ssize;
}
*
* @param handle connection to transport service
* @param hello the hello message
- * @param cont continuation to call when HELLO has been sent
+ * @param cont continuation to call when HELLO has been sent,
+ * tc reason GNUNET_SCHEDULER_REASON_TIMEOUT for fail
+ * tc reasong GNUNET_SCHEDULER_REASON_READY for success
* @param cls closure for continuation
*
*/
uint16_t size;
struct GNUNET_PeerIdentity peer;
struct GNUNET_MessageHeader *msg;
+ struct SendHelloContext * shc;
+ struct GNUNET_SCHEDULER_TaskContext tc;
+
+ tc.read_ready = NULL;
+ tc.write_ready = NULL;
+ tc.reason = GNUNET_SCHEDULER_REASON_TIMEOUT;
if (NULL == handle->client)
+ {
+ if (NULL != cont)
+ cont (cls, &tc);
return;
+ }
GNUNET_break (ntohs (hello->type) == GNUNET_MESSAGE_TYPE_HELLO);
size = ntohs (hello->size);
GNUNET_break (size >= sizeof (struct GNUNET_MessageHeader));
GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) hello, &peer))
{
GNUNET_break (0);
+ if (NULL != cont)
+ if (NULL != cont)
+ cont (cls, &tc);
return;
}
msg = GNUNET_malloc (size);
memcpy (msg, hello, size);
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Offering `%s' message of `%4s' to transport for validation.\n",
- "HELLO", GNUNET_i2s (&peer));
-#endif
- schedule_control_transmit (handle, size, &send_hello, msg);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Offering `%s' message of `%4s' to transport for validation.\n", "HELLO",
+ GNUNET_i2s (&peer));
+ shc = GNUNET_malloc (sizeof (struct SendHelloContext));
+ shc->msg = msg;
+ shc->cont = cont;
+ shc->cls = cls;
+ schedule_control_transmit (handle, size, &send_hello, shc);
}
* (handshake with transport service pending/failed).
* cost estimate will be 0.
* @param rec_cls closure for rec
+ * @return handle to cancel the operation
*/
-void
+struct GNUNET_TRANSPORT_GetHelloHandle *
GNUNET_TRANSPORT_get_hello (struct GNUNET_TRANSPORT_Handle *handle,
GNUNET_TRANSPORT_HelloUpdateCallback rec,
void *rec_cls)
{
- struct HelloWaitList *hwl;
+ struct GNUNET_TRANSPORT_GetHelloHandle *hwl;
- hwl = GNUNET_malloc (sizeof (struct HelloWaitList));
+ hwl = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_GetHelloHandle));
hwl->rec = rec;
hwl->rec_cls = rec_cls;
+ hwl->handle = handle;
GNUNET_CONTAINER_DLL_insert (handle->hwl_head, handle->hwl_tail, hwl);
- if (handle->my_hello == NULL)
- return;
- rec (rec_cls, (const struct GNUNET_MessageHeader *) handle->my_hello);
+ if (handle->my_hello != NULL)
+ rec (rec_cls, (const struct GNUNET_MessageHeader *) handle->my_hello);
+ return hwl;
}
/**
* Stop receiving updates about changes to our HELLO message.
*
- * @param handle connection to transport service
- * @param rec function previously registered to be called with the HELLOs
- * @param rec_cls closure for rec
+ * @param ghh handle to cancel
*/
void
-GNUNET_TRANSPORT_get_hello_cancel (struct GNUNET_TRANSPORT_Handle *handle,
- GNUNET_TRANSPORT_HelloUpdateCallback rec,
- void *rec_cls)
+GNUNET_TRANSPORT_get_hello_cancel (struct GNUNET_TRANSPORT_GetHelloHandle *ghh)
{
- struct HelloWaitList *pos;
+ struct GNUNET_TRANSPORT_Handle *handle = ghh->handle;
- pos = handle->hwl_head;
- while (pos != NULL)
- {
- if ((pos->rec == rec) && (pos->rec_cls == rec_cls))
- break;
- pos = pos->next;
- }
- GNUNET_break (pos != NULL);
- if (pos == NULL)
- return;
- GNUNET_CONTAINER_DLL_remove (handle->hwl_head, handle->hwl_tail, pos);
- GNUNET_free (pos);
+ GNUNET_CONTAINER_DLL_remove (handle->hwl_head, handle->hwl_tail, ghh);
+ GNUNET_free (ghh);
}
*/
struct GNUNET_TRANSPORT_Handle *
GNUNET_TRANSPORT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
- const struct GNUNET_PeerIdentity *self,
- void *cls,
+ const struct GNUNET_PeerIdentity *self, void *cls,
GNUNET_TRANSPORT_ReceiveCallback rec,
GNUNET_TRANSPORT_NotifyConnect nc,
GNUNET_TRANSPORT_NotifyDisconnect nd)
ret->nd_cb = nd;
ret->reconnect_delay = GNUNET_TIME_UNIT_ZERO;
ret->neighbours =
- GNUNET_CONTAINER_multihashmap_create (STARTING_NEIGHBOURS_SIZE);
+ GNUNET_CONTAINER_multihashmap_create (STARTING_NEIGHBOURS_SIZE, GNUNET_YES);
ret->ready_heap =
GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
- ret->reconnect_task = GNUNET_SCHEDULER_add_now (&reconnect, ret);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to transport service.\n");
+ ret->client = GNUNET_CLIENT_connect ("transport", cfg);
+ if (ret->client == NULL)
+ {
+ GNUNET_free (ret);
+ return NULL;
+ }
+ schedule_control_transmit (ret, sizeof (struct StartMessage), &send_start, ret);
return ret;
}
void
GNUNET_TRANSPORT_disconnect (struct GNUNET_TRANSPORT_Handle *handle)
{
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transport disconnect called!\n");
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Transport disconnect called!\n");
/* this disconnects all neighbours... */
if (handle->reconnect_task == GNUNET_SCHEDULER_NO_TASK)
disconnect_and_schedule_reconnect (handle);
th->priority = priority;
n->th = th;
/* calculate when our transmission should be ready */
- delay = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker, size);
+ delay = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker, size + n->traffic_overhead);
+ n->traffic_overhead = 0;
if (delay.rel_value > timeout.rel_value)
delay.rel_value = 0; /* notify immediately (with failure) */
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Bandwidth tracker allows next transmission to peer %s in %llu ms\n",
- GNUNET_i2s (target), (unsigned long long) delay.rel_value);
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Bandwidth tracker allows next transmission to peer %s in %llu ms\n",
+ GNUNET_i2s (target), (unsigned long long) delay.rel_value);
n->hn = GNUNET_CONTAINER_heap_insert (handle->ready_heap, n, delay.rel_value);
schedule_transmission (handle);
return th;
projects / oweals / gnunet.git / blobdiff