#define LOG(level, ...) GNUNET_log_from(level,"mesh-tun",__VA_ARGS__)
+#define START_FUNCTION LOG(GNUNET_ERROR_TYPE_DEBUG, "%s start\n", __FUNCTION__)
+#define END_FUNCTION LOG(GNUNET_ERROR_TYPE_DEBUG, "%s end\n", __FUNCTION__)
+
/******************************************************************************/
/******************************** STRUCTS **********************************/
const struct GNUNET_MESH_ChannelCreate *msg,
int fwd)
{
+ ;
+
struct MeshTChannel *tch;
struct MeshChannel *ch;
size_t size;
}
else
{
- ch = GMCH_handle_create (msg, fwd);
+ ch = GMCH_handle_create (t, msg, fwd);
}
tch = GNUNET_new (struct MeshTChannel);
tch->ch = ch;
GNUNET_CONTAINER_DLL_insert (t->channel_head, t->channel_tail, tch);
+
+ ;
}
void
LOG (GNUNET_ERROR_TYPE_DEBUG,
"GMT_send_queued_data on tunnel %s\n",
- GMP_2s (t->peer));
+ GMT_2s (t));
room = GMT_get_buffer (t, fwd);
LOG (GNUNET_ERROR_TYPE_DEBUG, " buffer space: %u\n", room);
for (tq = t->tq_head; NULL != tq && room > 0; tq = next)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " data on channel %s\n", GMCH_2s (tq->ch));
next = tq->next;
room--;
GNUNET_CONTAINER_DLL_remove (t->tq_head, t->tq_tail, tq);
GNUNET_free (tq);
}
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "GMT_send_queued_data end\n",
+ GMP_2s (t->peer));
}
GMT_init (const struct GNUNET_CONFIGURATION_Handle *c,
const struct GNUNET_CRYPTO_EddsaPrivateKey *key)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "init\n");
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (c, "MESH", "DEFAULT_TTL",
&default_ttl))
void
GMT_shutdown (void)
{
- GNUNET_PEER_change_rc (myid, -1);
}
* @param ch Channel which has some free buffer space.
* @param fwd Is this in for FWD traffic? (ACK goes dest->root)
*/
-static void
-GMT_send_acks (struct MeshTunnel3 *t,
- unsigned int buffer,
- int fwd)
+void
+GMT_send_acks (struct MeshTunnel3 *t, unsigned int buffer, int fwd)
{
struct MeshTConnection *iter;
uint32_t allowed;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Tunnel send acks on %s:%X\n",
- fwd ? "FWD" : "BCK", peer2s (ch->t->peer), ch->gid);
+ fwd ? "FWD" : "BCK", GMT_2s (t));
+
+ if (NULL == t)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ if (NULL == t->channel_head ||
+ GNUNET_NO == GMCH_is_origin (t->channel_head->ch, fwd))
+ {
+ GNUNET_break (0);
+ return;
+ }
/* Count connections, how many messages are already allowed */
cs = GMT_count_connections (t);
}
/* Authorize connections to send more data */
- to_allow = buffer - allowed;
+ to_allow = buffer; /* - allowed; */
for (iter = t->connection_head; NULL != iter && to_allow > 0; iter = iter->next)
{
{
continue;
}
- GMC_send_ack (iter->c, NULL, fwd);
- connection_send_ack (iter, allow_per_connection, fwd);
+ GMC_allow (iter->c, buffer, fwd);
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Channel send connection %s ack on %s:%X\n",
- fwd ? "FWD" : "BCK", peer2s (ch->t->peer), ch->gid);
GNUNET_break (to_allow == 0);
}
uint64_t iv;
uint16_t type;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Send on Tunnel %s\n", GMP_2s (t->peer));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "GMT Send on Tunnel %s\n", GMP_2s (t->peer));
iv = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_NONCE, UINT64_MAX);
msg = (struct GNUNET_MESH_Encrypted *) cbuf;
type = ntohs (message->type);
switch (type)
{
- case GNUNET_MESSAGE_TYPE_MESH_FWD:
- case GNUNET_MESSAGE_TYPE_MESH_BCK:
+ case GNUNET_MESSAGE_TYPE_MESH_DATA:
case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE:
case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY:
+ case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_ACK:
msg->cid = *GMC_get_id (c);
msg->ttl = htonl (default_ttl);
break;