[GNUnet-SVN] r30149 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-10-11 16:31:45 +0200 (Fri, 11 Oct 2013)
New Revision: 30149

Modified:
   gnunet/src/mesh/gnunet-service-mesh_channel.c
   gnunet/src/mesh/gnunet-service-mesh_connection.c
Log:
- simplify acks


Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-10-11 14:13:27 UTC 
(rev 30148)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-10-11 14:31:45 UTC 
(rev 30149)
@@ -631,7 +631,7 @@
       /* TODO return? */
     }
   }
-  send_ack (NULL, ch, fwd);
+  GMC_send_ack (NULL, ch, fwd);
 }
 
 
@@ -828,7 +828,6 @@
 }
 
 
-
 /**
  * Confirm we got a channel create.
  *
@@ -843,9 +842,8 @@
   msg.header.size = htons (sizeof (msg));
   msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_CHANNEL_ACK);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
-              "  sending channel %s ack for channel %s:%X\n",
-              fwd ? "FWD" : "BCK", GMT_2s (ch->t),
-              ch->gid);
+              "  sending channel %s ack for channel %s\n",
+              fwd ? "FWD" : "BCK", GMCH_2s (ch));
 
   msg.chid = htonl (ch->gid);
   GMCH_send_prebuilt_message (&msg.header, ch, !fwd);
@@ -1168,7 +1166,7 @@
 
   rel->client_ready = GNUNET_YES;
   send_client_buffered_data (ch, c, fwd);
-  send_ack (NULL, ch, fwd);
+  GMC_send_ack (NULL, ch, fwd);
 }
 
 

Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-10-11 14:13:27 UTC 
(rev 30148)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-10-11 14:31:45 UTC 
(rev 30149)
@@ -1382,7 +1382,7 @@
     }
     fc->last_pid_recv = pid;
     GMT_handle_encrypted (c->t, msg, fwd);
-    send_ack (c, NULL, fwd);
+    GMC_send_ack (c, NULL, fwd);
     return GNUNET_OK;
   }
 
@@ -1394,7 +1394,7 @@
   {
     GNUNET_STATISTICS_update (stats, "# TTL drops", 1, GNUNET_NO);
     LOG (GNUNET_ERROR_TYPE_WARNING, " TTL is 0, DROPPING!\n");
-    send_ack (c, NULL, fwd);
+    GMC_send_ack (c, NULL, fwd);
     return GNUNET_OK;
   }
   GNUNET_STATISTICS_update (stats, "# messages forwarded", 1, GNUNET_NO);
@@ -1585,7 +1585,7 @@
               pid, fc->last_pid_recv);
   fc->last_pid_recv = pid;
   fwd = fc == &c->fwd_fc;
-  send_ack (c, NULL, fwd);
+  GMC_send_ack (c, NULL, fwd);
 
   return GNUNET_OK;
 }