aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2014-03-06 01:36:08 +0000
committerBart Polot <bart@net.in.tum.de>2014-03-06 01:36:08 +0000
commit02f3519fb54ec05aa81c71746b0e24f6cef560a6 (patch)
tree0120229dd773695e5cb6ea41894266140b8b291b
parent73495317a20fd2b305aa850f17d1a9d998db57f7 (diff)
downloadgnunet-02f3519fb54ec05aa81c71746b0e24f6cef560a6.tar.gz
gnunet-02f3519fb54ec05aa81c71746b0e24f6cef560a6.zip
-log
-rw-r--r--src/mesh/gnunet-service-mesh_channel.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c
index a77b06c42..a720f4a41 100644
--- a/src/mesh/gnunet-service-mesh_channel.c
+++ b/src/mesh/gnunet-service-mesh_channel.c
@@ -1490,9 +1490,7 @@ GMCH_send_data_ack (struct MeshChannel *ch, int fwd)
1490 } 1490 }
1491 rel = fwd ? ch->dest_rel : ch->root_rel; 1491 rel = fwd ? ch->dest_rel : ch->root_rel;
1492 ack = rel->mid_recv - 1; 1492 ack = rel->mid_recv - 1;
1493 LOG (GNUNET_ERROR_TYPE_DEBUG, 1493 LOG (GNUNET_ERROR_TYPE_INFO, "=> DATA_ACK for %u\n", ack);
1494 " !! Send DATA_ACK for %u\n",
1495 ack);
1496 1494
1497 msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_DATA_ACK); 1495 msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_DATA_ACK);
1498 msg.header.size = htons (sizeof (msg)); 1496 msg.header.size = htons (sizeof (msg));
@@ -1940,9 +1938,9 @@ GMCH_handle_data (struct MeshChannel *ch,
1940 else 1938 else
1941 { 1939 {
1942 GNUNET_break_op (GM_is_pid_bigger (rel->mid_recv, mid)); 1940 GNUNET_break_op (GM_is_pid_bigger (rel->mid_recv, mid));
1943 LOG (GNUNET_ERROR_TYPE_DEBUG, 1941 LOG (GNUNET_ERROR_TYPE_WARNING,
1944 " !!! MID %u not expected (%u - %u), dropping!\n", 1942 "MID %u not expected (%u - %u), dropping!\n",
1945 mid, rel->mid_recv, rel->mid_recv + 63); 1943 mid, rel->mid_recv, rel->mid_recv + 63);
1946 } 1944 }
1947 1945
1948 GMCH_send_data_ack (ch, fwd); 1946 GMCH_send_data_ack (ch, fwd);
@@ -1984,8 +1982,7 @@ GMCH_handle_data_ack (struct MeshChannel *ch,
1984 } 1982 }
1985 1983
1986 ack = ntohl (msg->mid); 1984 ack = ntohl (msg->mid);
1987 LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! %s ACK %u\n", 1985 LOG (GNUNET_ERROR_TYPE_INFO, "<= %s ACK %u\n", GM_f2s (fwd), ack);
1988 (GNUNET_YES == fwd) ? "FWD" : "BCK", ack);
1989 1986
1990 if (GNUNET_YES == fwd) 1987 if (GNUNET_YES == fwd)
1991 { 1988 {
@@ -2006,12 +2003,12 @@ GMCH_handle_data_ack (struct MeshChannel *ch,
2006 { 2003 {
2007 if (GM_is_pid_bigger (copy->mid, ack)) 2004 if (GM_is_pid_bigger (copy->mid, ack))
2008 { 2005 {
2009 LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! head %u, out!\n", copy->mid); 2006 LOG (GNUNET_ERROR_TYPE_DEBUG, " head %u, out!\n", copy->mid);
2010 channel_rel_free_sent (rel, msg); 2007 channel_rel_free_sent (rel, msg);
2011 break; 2008 break;
2012 } 2009 }
2013 work = GNUNET_YES; 2010 work = GNUNET_YES;
2014 LOG (GNUNET_ERROR_TYPE_DEBUG, " !! id %u\n", copy->mid); 2011 LOG (GNUNET_ERROR_TYPE_DEBUG, " id %u\n", copy->mid);
2015 next = copy->next; 2012 next = copy->next;
2016 if (GNUNET_YES == rel_message_free (copy, GNUNET_YES)) 2013 if (GNUNET_YES == rel_message_free (copy, GNUNET_YES))
2017 return; 2014 return;
@@ -2244,9 +2241,8 @@ GMCH_send_prebuilt_message (const struct GNUNET_MessageHeader *message,
2244 uint16_t type; 2241 uint16_t type;
2245 2242
2246 type = ntohs (message->type); 2243 type = ntohs (message->type);
2247 LOG (GNUNET_ERROR_TYPE_DEBUG, "GMCH Send %s %s on channel %s\n", 2244 LOG (GNUNET_ERROR_TYPE_INFO, "=> %s %s on channel %s\n",
2248 GM_f2s (fwd), GM_m2s (type), 2245 GM_m2s (type), GM_f2s (fwd), GMCH_2s (ch));
2249 GMCH_2s (ch));
2250 2246
2251 if (GMT_is_loopback (ch->t)) 2247 if (GMT_is_loopback (ch->t))
2252 { 2248 {