From b7d5f4d4402789b9cc82990220cc7738ed03755f Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Thu, 17 Oct 2013 14:41:13 +0000 Subject: [PATCH] - unify payload, fixes --- src/mesh/gnunet-service-mesh_connection.c | 45 ++++++++++++----------- src/mesh/gnunet-service-mesh_tunnel.c | 2 +- src/mesh/mesh_common.c | 8 ++-- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/src/mesh/gnunet-service-mesh_connection.c b/src/mesh/gnunet-service-mesh_connection.c index 3197255ef..8a83adc51 100644 --- a/src/mesh/gnunet-service-mesh_connection.c +++ b/src/mesh/gnunet-service-mesh_connection.c @@ -354,7 +354,7 @@ connection_change_state (struct MeshConnection* c, /** * Callback called when a queued message is sent. * - * Calculates the average time + * Calculates the average time and connection packet tracking. * * @param cls Closure. * @param c Connection this message was on. @@ -373,8 +373,29 @@ message_sent (void *cls, struct MeshFlowControl *fc; double usecsperbyte; + fc = fwd ? &c->fwd_fc : &c->bck_fc; + LOG (GNUNET_ERROR_TYPE_DEBUG, "! Q_N- %p %u\n", fc, fc->queue_n); + fc->queue_n--; + c->pending_messages--; + if (GNUNET_YES == c->destroy && 0 == c->pending_messages) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, "! destroying connection!\n"); + GMC_destroy (c); + } + /* Send ACK if needed, after accounting for sent ID in fc->queue_n */ + switch (type) + { + case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED: + fc->last_pid_sent++; + LOG (GNUNET_ERROR_TYPE_DEBUG, "! accounting pid %u\n", fc->last_pid_sent); +// send_ack (c, ch, fwd); + break; + default: + break; + } + if (NULL == c->perf) - return; /* Only endpoints are interested in this. */ + return; /* Only endpoints are interested in timing. */ LOG (GNUNET_ERROR_TYPE_DEBUG, "! message sent!\n"); p = c->perf; @@ -397,26 +418,6 @@ message_sent (void *cls, } p->idx = (p->idx + 1) % AVG_MSGS; - fc = fwd ? &c->fwd_fc : &c->bck_fc; - LOG (GNUNET_ERROR_TYPE_DEBUG, "! Q_N- %p %u\n", fc, fc->queue_n); - fc->queue_n--; - c->pending_messages--; - if (GNUNET_YES == c->destroy && 0 == c->pending_messages) - { - LOG (GNUNET_ERROR_TYPE_DEBUG, "! destroying connection!\n"); - GMC_destroy (c); - } - /* Send ACK if needed, after accounting for sent ID in fc->queue_n */ - switch (type) - { - case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED: - fc->last_pid_sent++; - LOG (GNUNET_ERROR_TYPE_DEBUG, "! accounting pid %u\n", fc->last_pid_sent); -// send_ack (c, ch, fwd); - break; - default: - break; - } // if (NULL != c->t) // { // c->t->pending_messages--; diff --git a/src/mesh/gnunet-service-mesh_tunnel.c b/src/mesh/gnunet-service-mesh_tunnel.c index e2cf7db17..6a6a43943 100644 --- a/src/mesh/gnunet-service-mesh_tunnel.c +++ b/src/mesh/gnunet-service-mesh_tunnel.c @@ -1199,7 +1199,7 @@ GMT_send_prebuilt_message (const struct GNUNET_MessageHeader *message, type = ntohs (message->type); switch (type) { - case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED: + 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: diff --git a/src/mesh/mesh_common.c b/src/mesh/mesh_common.c index 90f2e5299..0298a4e3a 100644 --- a/src/mesh/mesh_common.c +++ b/src/mesh/mesh_common.c @@ -83,20 +83,20 @@ GNUNET_MESH_DEBUG_M2S (uint16_t m) /** * Transport data in the mesh (origin->end) unicast */ - case 260: return "GNUNET_MESSAGE_TYPE_MESH_UNICAST"; + case 260: return "GNUNET_MESSAGE_TYPE_MESH_DATA"; /** - * Transport data back in the mesh (end->origin) + * Transport data back in the mesh (end->origin) FIXME */ case 262: return "GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN"; /** - * Send origin an ACK that UNICAST arrived + * Send origin an ACK that UNICAST arrived FIXME */ case 263: return "GNUNET_MESSAGE_TYPE_MESH_UNICAST_ACK"; /** - * Send origin an ACK that TO_ORIGIN arrived + * Send origin an ACK that TO_ORIGIN arrived FIXME */ case 264: return "GNUNET_MESSAGE_TYPE_MESH_TO_ORIG_ACK"; -- 2.25.1