static void
tunnel_add_client (struct MeshTunnel *t, struct MeshClient *c)
{
- struct MeshTunnelClientInfo clinfo;
+ struct MeshTunnelFlowControlInfo fcinfo;
GNUNET_array_append (t->clients, t->nclients, c);
- clinfo.fwd_ack = t->fwd_pid + 1;
- clinfo.bck_ack = t->nobuffer ? 1 : INITIAL_WINDOW_SIZE - 1;
- clinfo.fwd_pid = t->fwd_pid;
- clinfo.bck_pid = (uint32_t) -1; // Expected next: 0
+ fcinfo.client = c;
+ fcinfo.fwd_ack = t->fwd_pid + 1;
+ fcinfo.bck_ack = t->nobuffer ? 1 : INITIAL_WINDOW_SIZE - 1;
+ fcinfo.fwd_pid = t->fwd_pid;
+ fcinfo.bck_pid = (uint32_t) -1; // Expected next: 0
+ // FIXME fc buffering is done by context_notify. Confirm this is OK.
+
t->nclients--;
- GNUNET_array_append (t->clients_fc, t->nclients, clinfo);
+ GNUNET_array_append (t->clients_fc, t->nclients, fcinfo);
}
*
* @param cls Closure (ID of the peer that HAS received the message).
* @param key ID of the neighbor.
- * @param value Information about the neighbor.
+ * @param value FLow control information about the neighbor.
*
* @return GNUNET_YES to keep iterating.
*/
void *value)
{
struct GNUNET_PeerIdentity *neighbor = cls;
- struct MeshTunnelChildInfo *cinfo = value;
+ struct MeshTunnelFlowControlInfo *fcinfo = value;
/* TODO compare only pointers? key == neighbor? */
if (0 == memcmp (&neighbor->hashPubKey, key, sizeof (struct GNUNET_HashCode)))
{
return GNUNET_YES;
}
- cinfo->skip++;
+ fcinfo->skip++;
return GNUNET_YES;
}
*
* @return ACK value.
*/
-static struct MeshTunnelClientInfo *
+static struct MeshTunnelFlowControlInfo *
tunnel_get_client_fc (struct MeshTunnel *t,
struct MeshClient *c)
{
return &t->clients_fc[i];
}
GNUNET_assert (0);
- return NULL; // avoid compiler / coverity complaints
+ return NULL; // won't get here. Just to avoid compiler / coverity complaints.
}
GNUNET_PEER_Id id)
{
struct GNUNET_PeerIdentity peer_id;
- struct MeshTunnelChildInfo *cinfo;
+ struct MeshTunnelFlowControlInfo *fcinfo;
struct MeshTunnelChildIteratorContext *ctx = cls;
struct MeshTunnel *t = ctx->t;
uint32_t ack;
GNUNET_PEER_resolve (id, &peer_id);
- cinfo = tunnel_get_neighbor_fc (t, &peer_id);
- ack = cinfo->fwd_ack;
+ fcinfo = tunnel_get_neighbor_fc (t, &peer_id);
+ ack = fcinfo->fwd_ack;
ctx->nchildren++;
if (GNUNET_NO == ctx->init)
{
ctx->max_child_ack = ctx->max_child_ack > ack ? ctx->max_child_ack : ack;
}
-
}
GNUNET_PEER_Id id)
{
struct MeshTunnel *t = cls;
- struct MeshTunnelChildInfo *cinfo;
+ struct MeshTunnelFlowControlInfo *fcinfo;
struct GNUNET_PeerIdentity peer;
GNUNET_PEER_resolve (id, &peer);
- cinfo = tunnel_get_neighbor_fc (t, &peer);
+ fcinfo = tunnel_get_neighbor_fc (t, &peer);
- if (cinfo->bck_ack != cinfo->bck_pid &&
- GNUNET_NO == GMC_is_pid_bigger (cinfo->bck_ack, cinfo->bck_pid))
+ if (fcinfo->bck_ack != fcinfo->bck_pid &&
+ GNUNET_NO == GMC_is_pid_bigger (fcinfo->bck_ack, fcinfo->bck_pid))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" Not sending ACK, not needed\n");
return;
}
- cinfo->bck_ack = t->bck_queue_max - t->bck_queue_n + cinfo->bck_pid;
+ fcinfo->bck_ack = t->bck_queue_max - t->bck_queue_n + fcinfo->bck_pid;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" Sending BCK ACK %u\n",
- cinfo->bck_ack);
- send_ack (t, &peer, cinfo->bck_ack);
+ fcinfo->bck_ack);
+ send_ack (t, &peer, fcinfo->bck_ack);
}
/* Find client whom to allow to send to origin (with lowest buffer space) */
for (i = 0; i < t->nclients; i++)
{
- struct MeshTunnelClientInfo *clinfo;
+ struct MeshTunnelFlowControlInfo *fcinfo;
unsigned int delta;
- clinfo = &t->clients_fc[i];
- delta = clinfo->bck_ack - clinfo->bck_pid;
+ fcinfo = &t->clients_fc[i];
+ delta = fcinfo->bck_ack - fcinfo->bck_pid;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " client %u delta: %u\n",
t->clients[i]->id, delta);
{
uint32_t ack;
- ack = clinfo->bck_pid;
+ ack = fcinfo->bck_pid;
ack += t->nobuffer ? 1 : tunnel_delta;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" sending ack to client %u: %u\n",
t->clients[i]->id, ack);
send_local_ack (t, t->clients[i], ack);
- clinfo->bck_ack = ack;
+ fcinfo->bck_ack = ack;
}
else
{
{
struct MeshTransmissionDescriptor *dd;
struct MeshPathInfo *path_info;
- struct MeshTunnelChildInfo *cinfo;
+ struct MeshTunnelFlowControlInfo *fcinfo;
struct GNUNET_PeerIdentity id;
unsigned int i;
unsigned int max;
/* Delete from child_fc in the appropiate tunnel */
max = queue->tunnel->fwd_queue_max;
GNUNET_PEER_resolve (queue->peer->id, &id);
- cinfo = tunnel_get_neighbor_fc (queue->tunnel, &id);
- if (NULL != cinfo)
+ fcinfo = tunnel_get_neighbor_fc (queue->tunnel, &id);
+ if (NULL != fcinfo)
{
- for (i = 0; i < cinfo->send_buffer_n; i++)
+ GNUNET_assert (NULL != fcinfo->peer);
+ for (i = 0; i < fcinfo->send_buffer_n; i++)
{
unsigned int i2;
- i2 = (cinfo->send_buffer_start + i) % max;
- if (cinfo->send_buffer[i2] == queue)
+ i2 = (fcinfo->send_buffer_start + i) % max;
+ if (fcinfo->send_buffer[i2] == queue)
{
/* Found corresponding entry in the send_buffer. Move all others back. */
unsigned int j;
unsigned int j2;
unsigned int j3;
- for (j = i, j2 = 0, j3 = 0; j < cinfo->send_buffer_n - 1; j++)
+ for (j = i, j2 = 0, j3 = 0; j < fcinfo->send_buffer_n - 1; j++)
{
- j2 = (cinfo->send_buffer_start + j) % max;
- j3 = (cinfo->send_buffer_start + j + 1) % max;
- cinfo->send_buffer[j2] = cinfo->send_buffer[j3];
+ j2 = (fcinfo->send_buffer_start + j) % max;
+ j3 = (fcinfo->send_buffer_start + j + 1) % max;
+ fcinfo->send_buffer[j2] = fcinfo->send_buffer[j3];
}
- cinfo->send_buffer[j3] = NULL;
- cinfo->send_buffer_n--;
+ fcinfo->send_buffer[j3] = NULL;
+ fcinfo->send_buffer_n--;
}
}
}
struct MeshPeerQueue *q;
struct MeshTunnel *t;
struct MeshTransmissionDescriptor *info;
- struct MeshTunnelChildInfo *cinfo;
+ struct MeshTunnelFlowControlInfo *fcinfo;
struct GNUNET_MESH_Unicast *ucast;
struct GNUNET_MESH_ToOrigin *to_orig;
struct GNUNET_MESH_Multicast *mcast;
ucast = (struct GNUNET_MESH_Unicast *) info->mesh_data->data;
pid = ntohl (ucast->pid);
GNUNET_PEER_resolve (info->peer->id, &id);
- cinfo = tunnel_get_neighbor_fc(t, &id);
- ack = cinfo->fwd_ack;
+ fcinfo = tunnel_get_neighbor_fc (t, &id);
+ ack = fcinfo->fwd_ack;
break;
case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
to_orig = (struct GNUNET_MESH_ToOrigin *) info->mesh_data->data;
}
pid = ntohl (mcast->pid);
GNUNET_PEER_resolve (info->peer->id, &id);
- cinfo = tunnel_get_neighbor_fc(t, &id);
- ack = cinfo->fwd_ack;
+ fcinfo = tunnel_get_neighbor_fc (t, &id);
+ ack = fcinfo->fwd_ack;
break;
default:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
struct GNUNET_MessageHeader *msg;
struct MeshPeerQueue *queue;
struct MeshTunnel *t;
- struct MeshTunnelChildInfo *cinfo;
+ struct MeshTunnelFlowControlInfo *fcinfo;
struct GNUNET_PeerIdentity dst_id;
size_t data_size;
peer->core_transmit = NULL;
- cinfo = NULL;
+ fcinfo = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* Queue send\n");
queue = queue_get_next (peer);
case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
case GNUNET_MESSAGE_TYPE_MESH_MULTICAST:
- cinfo = tunnel_get_neighbor_fc (t, &dst_id);
- if (cinfo->send_buffer[cinfo->send_buffer_start] != queue)
+ fcinfo = tunnel_get_neighbor_fc (t, &dst_id);
+ if (fcinfo->send_buffer[fcinfo->send_buffer_start] != queue)
{
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"at pos %u (%p) != %p\n",
- cinfo->send_buffer_start,
- cinfo->send_buffer[cinfo->send_buffer_start],
+ fcinfo->send_buffer_start,
+ fcinfo->send_buffer[fcinfo->send_buffer_start],
queue);
}
- if (cinfo->send_buffer_n > 0)
+ if (fcinfo->send_buffer_n > 0)
{
- cinfo->send_buffer[cinfo->send_buffer_start] = NULL;
- cinfo->send_buffer_n--;
- cinfo->send_buffer_start++;
- cinfo->send_buffer_start %= t->fwd_queue_max;
+ fcinfo->send_buffer[fcinfo->send_buffer_start] = NULL;
+ fcinfo->send_buffer_n--;
+ fcinfo->send_buffer_start++;
+ fcinfo->send_buffer_start %= t->fwd_queue_max;
}
else
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"********* %s stalled\n",
GNUNET_i2s(&my_full_id));
- if (NULL == cinfo)
- cinfo = tunnel_get_neighbor_fc (t, &dst_id);
- cinfo->fc_poll = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS,
- &tunnel_poll, cinfo);
+ if (NULL == fcinfo)
+ fcinfo = tunnel_get_neighbor_fc (t, &dst_id);
+ fcinfo->fc_poll = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS,
+ &tunnel_poll, fcinfo);
}
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* return %d\n", data_size);
struct MeshPeerInfo *dst, struct MeshTunnel *t)
{
struct MeshPeerQueue *queue;
- struct MeshTunnelChildInfo *cinfo;
+ struct MeshTunnelFlowControlInfo *fcinfo;
struct GNUNET_PeerIdentity id;
unsigned int *max;
unsigned int *n;
return;
// It's payload, keep track of buffer per peer.
- cinfo = tunnel_get_neighbor_fc(t, &id);
- i = (cinfo->send_buffer_start + cinfo->send_buffer_n) % t->fwd_queue_max;
- if (NULL != cinfo->send_buffer[i])
+ fcinfo = tunnel_get_neighbor_fc (t, &id);
+ i = (fcinfo->send_buffer_start + fcinfo->send_buffer_n) % t->fwd_queue_max;
+ if (NULL != fcinfo->send_buffer[i])
{
- GNUNET_break (cinfo->send_buffer_n == t->fwd_queue_max); // aka i == start
- queue_destroy (cinfo->send_buffer[cinfo->send_buffer_start], GNUNET_YES);
- cinfo->send_buffer_start++;
- cinfo->send_buffer_start %= t->fwd_queue_max;
+ GNUNET_break (fcinfo->send_buffer_n == t->fwd_queue_max); // aka i == start
+ queue_destroy (fcinfo->send_buffer[fcinfo->send_buffer_start], GNUNET_YES);
+ fcinfo->send_buffer_start++;
+ fcinfo->send_buffer_start %= t->fwd_queue_max;
}
else
{
- cinfo->send_buffer_n++;
+ fcinfo->send_buffer_n++;
}
- cinfo->send_buffer[i] = queue;
- if (cinfo->send_buffer_n > t->fwd_queue_max)
+ fcinfo->send_buffer[i] = queue;
+ if (fcinfo->send_buffer_n > t->fwd_queue_max)
{
GNUNET_break (0);
- cinfo->send_buffer_n = t->fwd_queue_max;
+ fcinfo->send_buffer_n = t->fwd_queue_max;
}
}
{
struct GNUNET_MESH_Unicast *msg;
struct GNUNET_PeerIdentity *neighbor;
- struct MeshTunnelChildInfo *cinfo;
+ struct MeshTunnelFlowControlInfo *fcinfo;
struct MeshTunnel *t;
GNUNET_PEER_Id dest_id;
uint32_t pid;
" not for us, retransmitting...\n");
neighbor = tree_get_first_hop (t->tree, dest_id);
- cinfo = tunnel_get_neighbor_fc (t, neighbor);
- cinfo->fwd_pid = pid;
+ fcinfo = tunnel_get_neighbor_fc (t, neighbor);
+ fcinfo->fwd_pid = pid;
GNUNET_CONTAINER_multihashmap_iterate (t->children_fc,
&tunnel_add_skip,
&neighbor);
if (GNUNET_YES == t->nobuffer &&
- GNUNET_YES == GMC_is_pid_bigger (pid, cinfo->fwd_ack))
+ GNUNET_YES == GMC_is_pid_bigger (pid, fcinfo->fwd_ack))
{
GNUNET_STATISTICS_update (stats, "# unsolicited unicast", 1, GNUNET_NO);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, " %u > %u\n", pid, cinfo->fwd_ack);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " %u > %u\n", pid, fcinfo->fwd_ack);
GNUNET_break_op (0);
return GNUNET_OK;
}
struct GNUNET_PeerIdentity id;
struct MeshPeerInfo *peer_info;
struct MeshTunnel *t;
- struct MeshTunnelChildInfo *cinfo;
+ struct MeshTunnelFlowControlInfo *fcinfo;
size_t size;
uint32_t pid;
return GNUNET_OK;
}
- cinfo = tunnel_get_neighbor_fc(t, peer);
- if (NULL == cinfo)
+ fcinfo = tunnel_get_neighbor_fc (t, peer);
+ if (NULL == fcinfo)
{
GNUNET_break (0);
return GNUNET_OK;
}
- if (cinfo->bck_pid == pid)
+ if (fcinfo->bck_pid == pid)
{
/* already seen this packet, drop */
GNUNET_STATISTICS_update (stats, "# duplicate PID drops BCK", 1, GNUNET_NO);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" pid %u not seen yet, forwarding\n", pid);
- cinfo->bck_pid = pid;
+ fcinfo->bck_pid = pid;
if (NULL != t->owner)
{
/* Is this a forward or backward ACK? */
if (tree_get_predecessor(t->tree) != GNUNET_PEER_search(peer))
{
- struct MeshTunnelChildInfo *cinfo;
+ struct MeshTunnelFlowControlInfo *fcinfo;
debug_bck_ack++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " FWD ACK\n");
- cinfo = tunnel_get_neighbor_fc (t, peer);
- cinfo->fwd_ack = ack;
+ fcinfo = tunnel_get_neighbor_fc (t, peer);
+ fcinfo->fwd_ack = ack;
tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_ACK);
tunnel_unlock_fwd_queues (t);
}
/* Is this a forward or backward ACK? */
if (tree_get_predecessor(t->tree) != GNUNET_PEER_search(peer))
{
- struct MeshTunnelChildInfo *cinfo;
+ struct MeshTunnelFlowControlInfo *fcinfo;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " from FWD\n");
- cinfo = tunnel_get_neighbor_fc (t, peer);
- cinfo->bck_ack = cinfo->fwd_pid; // mark as ready to send
+ fcinfo = tunnel_get_neighbor_fc (t, peer);
+ fcinfo->bck_ack = fcinfo->fwd_pid; // mark as ready to send
tunnel_send_bck_ack (t, GNUNET_MESSAGE_TYPE_MESH_POLL);
}
else
const struct GNUNET_MessageHeader *message)
{
struct GNUNET_MESH_ToOrigin *data_msg;
- struct MeshTunnelClientInfo *clinfo;
+ struct MeshTunnelFlowControlInfo *fcinfo;
struct MeshClient *c;
struct MeshTunnel *t;
MESH_TunnelNumber tid;
}
/* PID should be as expected */
- clinfo = tunnel_get_client_fc (t, c);
- if (ntohl (data_msg->pid) != clinfo->bck_pid + 1)
+ fcinfo = tunnel_get_client_fc (t, c);
+ if (ntohl (data_msg->pid) != fcinfo->bck_pid + 1)
{
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"To Origin PID, expected %u, got %u\n",
- clinfo->bck_pid + 1,
+ fcinfo->bck_pid + 1,
ntohl (data_msg->pid));
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- clinfo->bck_pid++;
+ fcinfo->bck_pid++;
/* Ok, everything is correct, send the message
* (pretend we got it from a mesh peer)
projects / oweals / gnunet.git / blobdiff