* - test test test
*/
#include "platform.h"
+#include "gnunet_constants.h"
#include "gnunet_bandwidth_lib.h"
#include "gnunet_client_lib.h"
#include "gnunet_constants.h"
*/
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;
};
*/
GNUNET_TRANSPORT_HelloUpdateCallback rec;
+ /**
+ * Task for calling the HelloUpdateCallback when we already have a HELLO
+ */
+ GNUNET_SCHEDULER_TaskIdentifier notify_task;
+
/**
* Closure for rec.
*/
};
+/**
+ * Linked list for all try-connect requests
+ */
+struct GNUNET_TRANSPORT_TryConnectHandle
+{
+ struct GNUNET_TRANSPORT_TryConnectHandle *prev;
+ struct GNUNET_TRANSPORT_TryConnectHandle *next;
+
+ struct GNUNET_PeerIdentity pid;
+
+ struct GNUNET_TRANSPORT_Handle *th;
+ struct GNUNET_TRANSPORT_TransmitHandle *tth;
+ GNUNET_TRANSPORT_TryConnectCallback cb;
+ void *cb_cls;
+};
+
+
+/**
+ * Linked list for all try-connect requests
+ */
+struct GNUNET_TRANSPORT_OfferHelloHandle
+{
+ struct GNUNET_TRANSPORT_OfferHelloHandle *prev;
+ struct GNUNET_TRANSPORT_OfferHelloHandle *next;
+
+ struct GNUNET_TRANSPORT_Handle *th;
+
+ struct GNUNET_TRANSPORT_TransmitHandle *tth;
+ GNUNET_SCHEDULER_Task cont;
+
+ void *cls;
+
+ struct GNUNET_MessageHeader *msg;
+};
+
/**
* Handle for the transport service (includes all of the
*/
struct GNUNET_TRANSPORT_GetHelloHandle *hwl_tail;
+ /**
+ * Linked list of pending try connect requests head
+ */
+ struct GNUNET_TRANSPORT_TryConnectHandle *tc_head;
+
+ /**
+ * Linked list of pending try connect requests tail
+ */
+ struct GNUNET_TRANSPORT_TryConnectHandle *tc_tail;
+
+ /**
+ * Linked list of pending offer HELLO requests head
+ */
+ struct GNUNET_TRANSPORT_OfferHelloHandle *oh_head;
+
+ /**
+ * Linked list of pending offer HELLO requests tail
+ */
+ struct GNUNET_TRANSPORT_OfferHelloHandle *oh_tail;
+
/**
* My configuration.
*/
* (if GNUNET_NO, then 'self' is all zeros!).
*/
int check_self;
+
+ /**
+ * Reconnect in progress
+ */
+ int reconnecting;
};
+
/**
* Schedule the task to send one message, either from the control
* list or the peer message queues to the service.
{
struct Neighbour *n;
-#if DEBUG_TRANSPORT_API
LOG (GNUNET_ERROR_TYPE_DEBUG, "Creating entry for neighbour `%4s'.\n",
GNUNET_i2s (pid));
-#endif
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;
const struct GNUNET_MessageHeader *imm;
const struct SendOkMessage *okm;
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_API
- LOG (GNUNET_ERROR_TYPE_INFO,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Error receiving from transport service, disconnecting temporarily.\n");
-#endif
disconnect_and_schedule_reconnect (h);
return;
}
GNUNET_break (0);
break;
}
-#if DEBUG_TRANSPORT_API
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Receiving (my own) `%s' message, I am `%4s'.\n", "HELLO",
GNUNET_i2s (&me));
-#endif
GNUNET_free_non_null (h->my_hello);
h->my_hello = NULL;
if (size < sizeof (struct GNUNET_MessageHeader))
GNUNET_break (0);
break;
}
-#if DEBUG_TRANSPORT_API
+ ats = (const struct GNUNET_ATS_Information *) &cim[1];
LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message for `%4s'.\n",
"CONNECT", GNUNET_i2s (&cim->id));
-#endif
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_API_DISCONNECT
LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message for `%4s'.\n",
"DISCONNECT", GNUNET_i2s (&dim->peer));
-#endif
n = neighbour_find (h, &dim->peer);
if (n == NULL)
{
break;
}
okm = (const struct SendOkMessage *) msg;
-#if DEBUG_TRANSPORT_API
+ 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");
-#endif
+
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))
}
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_RECV:
-#if DEBUG_TRANSPORT_API
LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message.\n", "RECV");
-#endif
if (size <
sizeof (struct InboundMessage) + sizeof (struct GNUNET_MessageHeader))
{
}
im = (const struct InboundMessage *) msg;
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_ATS_Information) != size)
{
GNUNET_break (0);
break;
}
-#if DEBUG_TRANSPORT_API
LOG (GNUNET_ERROR_TYPE_DEBUG, "Received message of type %u from `%4s'.\n",
ntohs (imm->type), GNUNET_i2s (&im->peer));
-#endif
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:
-#if DEBUG_TRANSPORT_API
LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message.\n", "SET_QUOTA");
-#endif
if (size != sizeof (struct QuotaSetMessage))
{
GNUNET_break (0);
qm = (const struct QuotaSetMessage *) msg;
n = neighbour_find (h, &qm->peer);
if (n == NULL)
- {
- GNUNET_break (0);
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_CONTAINER_DLL_remove (h->control_head, h->control_tail, th);
nret = th->notify (th->notify_cls, size, &cbuf[ret]);
-#if DEBUG_TRANSPORT_API
LOG (GNUNET_ERROR_TYPE_DEBUG, "Added %u bytes of control message at %u\n",
nret, ret);
-#endif
GNUNET_free (th);
ret += nret;
size -= nret;
}
/* if there are more pending messages, try to schedule those */
schedule_transmission (h);
-#if DEBUG_TRANSPORT_API
LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting %u bytes to transport service\n",
ret);
-#endif
return ret;
}
n->th = NULL;
GNUNET_assert (n == GNUNET_CONTAINER_heap_remove_root (h->ready_heap));
n->hn = NULL;
-#if DEBUG_TRANSPORT_API
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Signalling timeout for transmission to peer %s due to congestion\n",
GNUNET_i2s (&n->id));
-#endif
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_API
LOG (GNUNET_ERROR_TYPE_DEBUG, "Calling notify_transmit_ready\n");
-#endif
h->cth =
GNUNET_CLIENT_notify_transmit_ready (h->client, size,
GNUNET_TIME_UNIT_FOREVER_REL,
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 */
-#if DEBUG_TRANSPORT_API
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Scheduling next transmission to service in %llu ms\n",
(unsigned long long) delay.rel_value);
-#endif
h->quota_task =
GNUNET_SCHEDULER_add_delayed (delay, &schedule_transmission_task, h);
}
* @param size number of bytes to be transmitted
* @param notify function to call to get the content
* @param notify_cls closure for notify
+ * @return a GNUNET_TRANSPORT_TransmitHandle
*/
-static void
+static struct GNUNET_TRANSPORT_TransmitHandle *
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_API
LOG (GNUNET_ERROR_TYPE_DEBUG, "Control transmit of %u bytes requested\n",
size);
-#endif
th = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_TransmitHandle));
th->notify = notify;
th->notify_cls = notify_cls;
th->notify_size = size;
GNUNET_CONTAINER_DLL_insert_tail (h->control_head, h->control_tail, th);
schedule_transmission (h);
+ return th;
}
{
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_API
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Shutdown while trying to transmit `%s' request.\n", "START");
-#endif
return 0;
}
-#if DEBUG_TRANSPORT_API
LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' request.\n", "START");
-#endif
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,
/* shutdown, just give up */
return;
}
-#if DEBUG_TRANSPORT_API
LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to transport service.\n");
-#endif
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_API
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);
- 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_STD_BACKOFF (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.
+ * Cancel control request for transmission to the transport 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
+ * @param th handle to the transport service
+ * @param tth transmit handle to cancel
*/
-static size_t
-send_set_quota (void *cls, size_t size, void *buf)
+static void
+cancel_control_transmit (struct GNUNET_TRANSPORT_Handle *th, struct GNUNET_TRANSPORT_TransmitHandle *tth)
{
- struct SetQuotaContext *sqc = cls;
- struct QuotaSetMessage msg;
-
- if (buf == NULL)
- {
- GNUNET_free (sqc);
- return 0;
- }
-#if DEBUG_TRANSPORT_API
- 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);
-}
-
+ GNUNET_assert (NULL != th);
+ GNUNET_assert (NULL != tth);
-/**
- * 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;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Canceling transmit of contral transmission requested\n");
- n = neighbour_find (handle, target);
- if (NULL == n)
- {
- 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_API
- if (ntohl (quota_out.value__) != n->out_tracker.available_bytes_per_s__)
- 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
- 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);
+ GNUNET_CONTAINER_DLL_remove (th->control_head, th->control_tail, tth);
+ GNUNET_free (tth);
}
+
/**
* Send REQUEST_CONNECT message to the service.
*
static size_t
send_try_connect (void *cls, size_t size, void *buf)
{
- struct GNUNET_PeerIdentity *pid = cls;
+ struct GNUNET_TRANSPORT_TryConnectHandle *tch = cls;
struct TransportRequestConnectMessage msg;
if (buf == NULL)
{
- GNUNET_free (pid);
+ if (NULL != tch->cb)
+ tch->cb (tch->cb_cls, GNUNET_SYSERR);
+ GNUNET_CONTAINER_DLL_remove (tch->th->tc_head, tch->th->tc_tail, tch);
+ GNUNET_free (tch);
return 0;
}
-#if DEBUG_TRANSPORT_API
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Transmitting `%s' request with respect to `%4s'.\n", "REQUEST_CONNECT",
- GNUNET_i2s (pid));
-#endif
+ GNUNET_i2s (&tch->pid));
GNUNET_assert (size >= sizeof (struct TransportRequestConnectMessage));
msg.header.size = htons (sizeof (struct TransportRequestConnectMessage));
msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_CONNECT);
msg.reserved = htonl (0);
- msg.peer = *pid;
+ msg.peer = tch->pid;
memcpy (buf, &msg, sizeof (msg));
- GNUNET_free (pid);
+ if (NULL != tch->cb)
+ tch->cb (tch->cb_cls, GNUNET_OK);
+ GNUNET_CONTAINER_DLL_remove (tch->th->tc_head, tch->th->tc_tail, tch);
+ GNUNET_free (tch);
return sizeof (struct TransportRequestConnectMessage);
}
-
/**
* Ask the transport service to establish a connection to
* the given peer.
*
* @param handle connection to transport service
* @param target who we should try to connect to
+ * @param cb callback to be called when request was transmitted to transport
+ * service
+ * @param cb_cls closure for the callback
+ * @return a GNUNET_TRANSPORT_TryConnectHandle handle or
+ * NULL on failure (cb will not be called)
*/
-void
+struct GNUNET_TRANSPORT_TryConnectHandle *
GNUNET_TRANSPORT_try_connect (struct GNUNET_TRANSPORT_Handle *handle,
- const struct GNUNET_PeerIdentity *target)
+ const struct GNUNET_PeerIdentity *target,
+ GNUNET_TRANSPORT_TryConnectCallback cb,
+ void *cb_cls)
{
- struct GNUNET_PeerIdentity *pid;
+ struct GNUNET_TRANSPORT_TryConnectHandle *tch = NULL;
if (NULL == handle->client)
- return;
- pid = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity));
- *pid = *target;
- schedule_control_transmit (handle,
+ return NULL;
+
+ tch = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_TryConnectHandle));
+ tch->th = handle;
+ tch->pid = *(target);
+ tch->cb = cb;
+ tch->cb_cls = cb_cls;
+ tch->tth = schedule_control_transmit (handle,
sizeof (struct TransportRequestConnectMessage),
- &send_try_connect, pid);
+ &send_try_connect, tch);
+ GNUNET_CONTAINER_DLL_insert(handle->tc_head, handle->tc_tail, tch);
+ return tch;
}
+/**
+ * Cancel the request to transport to try a connect
+ * Callback will not be called
+ *
+ * @param tch GNUNET_TRANSPORT_TryConnectHandle handle to cancel
+ */
+void
+GNUNET_TRANSPORT_try_connect_cancel (struct GNUNET_TRANSPORT_TryConnectHandle *tch)
+{
+ struct GNUNET_TRANSPORT_Handle *th;
+ GNUNET_assert (NULL != tch);
+
+ th = tch->th;
+ cancel_control_transmit (th, tch->tth);
+ GNUNET_CONTAINER_DLL_remove (th->tc_head, th->tc_tail, tch);
+ GNUNET_free (tch);
+}
+
/**
* Send HELLO message to the service.
*
static size_t
send_hello (void *cls, size_t size, void *buf)
{
- struct GNUNET_MessageHeader *msg = cls;
+ struct GNUNET_TRANSPORT_OfferHelloHandle *ohh = cls;
+ struct GNUNET_MessageHeader *msg = ohh->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
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Timeout while trying to transmit `%s' request.\n", "HELLO");
-#endif
+ if (NULL != ohh->cont)
+ ohh->cont (ohh->cls, &tc);
GNUNET_free (msg);
+ GNUNET_CONTAINER_DLL_remove (ohh->th->oh_head, ohh->th->oh_tail, ohh);
+ GNUNET_free (ohh);
return 0;
}
-#if DEBUG_TRANSPORT_API
LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' request.\n", "HELLO");
-#endif
ssize = ntohs (msg->size);
GNUNET_assert (size >= ssize);
memcpy (buf, msg, ssize);
GNUNET_free (msg);
+ tc.reason = GNUNET_SCHEDULER_REASON_READ_READY;
+ if (NULL != ohh->cont)
+ ohh->cont (ohh->cls, &tc);
+ GNUNET_CONTAINER_DLL_remove (ohh->th->oh_head, ohh->th->oh_tail, ohh);
+ GNUNET_free (ohh);
+ return ssize;
+}
+
+
+/**
+ * Send traffic metric message to the service.
+ *
+ * @param cls the message to send
+ * @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_metric (void *cls, size_t size, void *buf)
+{
+ struct TrafficMetricMessage *msg = cls;
+ uint16_t ssize;
+ if (buf == NULL)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout while trying to transmit `%s' request.\n", "TRAFFIC_METRIC");
+ GNUNET_free (msg);
+ return 0;
+ }
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' request.\n", "TRAFFIC_METRIC");
+ ssize = ntohs (msg->header.size);
+ GNUNET_assert (size >= ssize);
+ memcpy (buf, msg, ssize);
+ GNUNET_free (msg);
return ssize;
}
+/**
+ * Set transport metrics for a peer and a direction
+ *
+ * @param handle transport handle
+ * @param peer the peer to set the metric for
+ * @param direction can be: TM_SEND, TM_RECV, TM_BOTH
+ * @param ats the metric as ATS information
+ * @param ats_count the number of metrics
+ *
+ * Supported ATS values:
+ * GNUNET_ATS_QUALITY_NET_DELAY (value in ms)
+ * GNUNET_ATS_QUALITY_NET_DISTANCE (value in #hops)
+ *
+ * Example
+ * To enforce a delay of 10 ms for peer p1 in sending direction use:
+ *
+ * struct GNUNET_ATS_Information ats;
+ * ats.type = ntohl (GNUNET_ATS_QUALITY_NET_DELAY);
+ * ats.value = ntohl (10);
+ * GNUNET_TRANSPORT_set_traffic_metric (th, p1, TM_SEND, &ats, 1);
+ *
+ * Note:
+ * Delay restrictions in receiving direction will be enforced with
+ * 1 message delay.
+ */
+void
+GNUNET_TRANSPORT_set_traffic_metric (struct GNUNET_TRANSPORT_Handle *handle,
+ const struct GNUNET_PeerIdentity *peer,
+ int direction,
+ const struct GNUNET_ATS_Information *ats,
+ size_t ats_count)
+{
+ struct TrafficMetricMessage *msg;
+
+ GNUNET_assert (NULL != handle);
+ GNUNET_assert (NULL != peer);
+ GNUNET_assert (direction >= TM_SEND);
+ GNUNET_assert (direction <= TM_BOTH);
+
+ if (0 == ats_count)
+ return;
+
+ size_t len = sizeof (struct TrafficMetricMessage) +
+ ats_count * sizeof (struct GNUNET_ATS_Information);
+
+ msg = GNUNET_malloc (len);
+ msg->header.size = htons (len);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TRAFFIC_METRIC);
+ msg->direction = htons (direction);
+ msg->ats_count = htons (ats_count);
+ msg->peer = (*peer);
+ memcpy (&msg[1], ats, ats_count * sizeof (struct GNUNET_ATS_Information));
+ schedule_control_transmit (handle, len, &send_metric, msg);
+}
+
+
+
/**
* Offer the transport service the HELLO of another peer. Note that
* the transport service may just ignore this message if the HELLO is
*
* @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_READ_READY for success
* @param cls closure for continuation
+ * @return a GNUNET_TRANSPORT_OfferHelloHandle handle or NULL on failure,
+ * in case of failure cont will not be called
*
*/
-void
+struct GNUNET_TRANSPORT_OfferHelloHandle *
GNUNET_TRANSPORT_offer_hello (struct GNUNET_TRANSPORT_Handle *handle,
const struct GNUNET_MessageHeader *hello,
GNUNET_SCHEDULER_Task cont, void *cls)
{
- uint16_t size;
- struct GNUNET_PeerIdentity peer;
+ struct GNUNET_TRANSPORT_OfferHelloHandle *ohh;
struct GNUNET_MessageHeader *msg;
+ struct GNUNET_PeerIdentity peer;
+ uint16_t size;
+
+ GNUNET_assert (NULL != handle);
+ GNUNET_assert (NULL != hello);
if (NULL == handle->client)
- return;
+ return NULL;
+
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);
- return;
+ return NULL;
}
+
msg = GNUNET_malloc (size);
memcpy (msg, hello, size);
-#if DEBUG_TRANSPORT_API
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);
+
+ ohh = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_OfferHelloHandle));
+ ohh->th = handle;
+ ohh->cont = cont;
+ ohh->cls = cls;
+ ohh->msg = msg;
+ ohh->tth = schedule_control_transmit (handle, size, &send_hello, ohh);
+ GNUNET_CONTAINER_DLL_insert (handle->oh_head, handle->oh_tail, ohh);
+ return ohh;
}
/**
- * Obtain the HELLO message for this peer.
+ * Cancel the request to transport to offer the HELLO message
+ *
+ * @param ohh the GNUNET_TRANSPORT_OfferHelloHandle to cancel
+ */
+void
+GNUNET_TRANSPORT_offer_hello_cancel (struct GNUNET_TRANSPORT_OfferHelloHandle *ohh)
+{
+ struct GNUNET_TRANSPORT_Handle *th = ohh->th;
+ GNUNET_assert (NULL != ohh);
+
+ cancel_control_transmit (ohh->th, ohh->tth);
+ GNUNET_CONTAINER_DLL_remove (th->oh_head, th->oh_tail, ohh);
+ GNUNET_free (ohh->msg);
+ GNUNET_free (ohh);
+}
+
+int
+GNUNET_TRANSPORT_check_neighbour_connected (struct GNUNET_TRANSPORT_Handle *handle,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ GNUNET_assert (NULL != handle);
+ GNUNET_assert (NULL != peer);
+
+ if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains(handle->neighbours, &peer->hashPubKey))
+ return GNUNET_YES;
+ else
+ return GNUNET_NO;
+}
+
+
+/**
+ * Task to call the HelloUpdateCallback of the GetHelloHandle
+ *
+ * @param cls the GetHelloHandle
+ * @param tc the scheduler task context
+ */
+static void
+call_hello_update_cb_async (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_TRANSPORT_GetHelloHandle *ghh = cls;
+
+ GNUNET_assert (NULL != ghh->handle->my_hello);
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != ghh->notify_task);
+ ghh->notify_task = GNUNET_SCHEDULER_NO_TASK;
+ ghh->rec (ghh->rec_cls,
+ (const struct GNUNET_MessageHeader *) ghh->handle->my_hello);
+}
+
+
+/**
+ * Obtain the HELLO message for this peer. The callback given in this function
+ * is never called synchronously.
*
* @param handle connection to transport service
* @param rec function to call with the HELLO, sender will be our peer
hwl->handle = handle;
GNUNET_CONTAINER_DLL_insert (handle->hwl_head, handle->hwl_tail, hwl);
if (handle->my_hello != NULL)
- rec (rec_cls, (const struct GNUNET_MessageHeader *) handle->my_hello);
+ hwl->notify_task = GNUNET_SCHEDULER_add_now (&call_hello_update_cb_async,
+ hwl);
return hwl;
}
{
struct GNUNET_TRANSPORT_Handle *handle = ghh->handle;
+ if (GNUNET_SCHEDULER_NO_TASK != ghh->notify_task)
+ GNUNET_SCHEDULER_cancel (ghh->notify_task);
GNUNET_CONTAINER_DLL_remove (handle->hwl_head, handle->hwl_tail, ghh);
GNUNET_free (ghh);
}
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_API
LOG (GNUNET_ERROR_TYPE_DEBUG, "Transport disconnect called!\n");
-#endif
/* this disconnects all neighbours... */
if (handle->reconnect_task == GNUNET_SCHEDULER_NO_TASK)
disconnect_and_schedule_reconnect (handle);
}
GNUNET_free_non_null (handle->my_hello);
handle->my_hello = NULL;
+ GNUNET_assert (handle->tc_head == NULL);
+ GNUNET_assert (handle->tc_tail == NULL);
GNUNET_assert (handle->hwl_head == NULL);
GNUNET_assert (handle->hwl_tail == NULL);
GNUNET_CONTAINER_heap_destroy (handle->ready_heap);
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_API
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
n->hn = GNUNET_CONTAINER_heap_insert (handle->ready_heap, n, delay.rel_value);
schedule_transmission (handle);
return th;
projects / oweals / gnunet.git / blobdiff