{
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;
* 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 (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))
break;
}
ats = (const struct GNUNET_ATS_Information *) &cim[1];
-#if DEBUG_TRANSPORT_API
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, ats, ats_count);
break;
}
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
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;
}
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))
{
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)
{
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);
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_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,
n->th->notify_size);
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);
}
{
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;
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);
/* 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)
GNUNET_free (pid);
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_assert (size >= sizeof (struct TransportRequestConnectMessage));
msg.header.size = htons (sizeof (struct TransportRequestConnectMessage));
msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_CONNECT);
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
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Timeout while trying to transmit `%s' request.\n", "HELLO");
-#endif
+ if (NULL != shc->cont)
+ shc->cont (shc->cls, &tc);
GNUNET_free (msg);
+ GNUNET_free (shc);
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 != 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_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);
+ shc = GNUNET_malloc (sizeof (struct SendHelloContext));
+ shc->msg = msg;
+ shc->cont = cont;
+ shc->cls = cls;
+ schedule_control_transmit (handle, size, &send_hello, shc);
}
GNUNET_CONTAINER_multihashmap_create (STARTING_NEIGHBOURS_SIZE);
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);
delay = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker, size);
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