[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27882 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27882 - gnunet/src/mesh |
Date: |
Wed, 10 Jul 2013 15:11:22 +0200 |
Author: bartpolot
Date: 2013-07-10 15:11:22 +0200 (Wed, 10 Jul 2013)
New Revision: 27882
Modified:
gnunet/src/mesh/gnunet-service-mesh.c
Log:
- change retransmit time to #define, debug
Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c 2013-07-10 13:10:25 UTC (rev
27881)
+++ gnunet/src/mesh/gnunet-service-mesh.c 2013-07-10 13:11:22 UTC (rev
27882)
@@ -51,6 +51,9 @@
#define MESH_MAX_POLL_TIME GNUNET_TIME_relative_multiply (\
GNUNET_TIME_UNIT_MINUTES,\
10)
+#define MESH_RETRANSMIT_TIME GNUNET_TIME_relative_multiply (\
+ GNUNET_TIME_UNIT_SECONDS,\
+ 5)
#if MESH_DEBUG_CONNECTION
#define DEBUG_CONN(...) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
@@ -2281,6 +2284,8 @@
struct GNUNET_MESH_Data *payload;
GNUNET_PEER_Id hop;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "!!! Retransmit \n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "!!! id %u\n", copy->id);
copy->retry_task = GNUNET_SCHEDULER_NO_TASK;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
@@ -2288,7 +2293,7 @@
payload = (struct GNUNET_MESH_Data *) ©[1];
hop = copy->is_forward ? copy->t->next_hop : copy->t->prev_hop;
send_prebuilt_message (&payload->header, hop, copy->t);
- GNUNET_STATISTICS_update (stats, "# unicast retransmitted", 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (stats, "# data retransmitted", 1, GNUNET_NO);
copy->retry_timer = GNUNET_TIME_STD_BACKOFF (copy->retry_timer);
copy->retry_task = GNUNET_SCHEDULER_add_delayed (copy->retry_timer,
&tunnel_retransmit_message,
@@ -3868,6 +3873,8 @@
else
GNUNET_break_op (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "!!! ACK'ed \n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "!!! id %u\n", ack);
copy = GNUNET_CONTAINER_multihashmap32_get (hm, ack);
if (NULL == copy)
{
@@ -4424,8 +4431,11 @@
t->port = ntohl (t_msg->port);
tunnel_set_options (t, ntohl (t_msg->options));
if (GNUNET_YES == t->reliable)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "!!! Reliable \n");
t->sent_messages_fwd =
- GNUNET_CONTAINER_multihashmap32_create (t->queue_max);
+ GNUNET_CONTAINER_multihashmap32_create (t->queue_max);
+ }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CREATED TUNNEL %s[%x]:%u (%x)\n",
GNUNET_i2s (&my_full_id), t->id.tid, t->port, t->local_tid);
@@ -4595,7 +4605,7 @@
copy->t = t;
copy->id = fc->last_pid_recv + 1;
copy->is_forward = (tid < GNUNET_MESH_LOCAL_TUNNEL_ID_SERV);
- copy->retry_timer = GNUNET_TIME_UNIT_MINUTES;
+ copy->retry_timer = MESH_RETRANSMIT_TIME;
copy->retry_task = GNUNET_SCHEDULER_add_delayed (copy->retry_timer,
&tunnel_retransmit_message,
copy);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27882 - gnunet/src/mesh,
gnunet <=