- simplify acks

2 files changed, 7 insertions, 9 deletions

diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c
index 9019fb42c..d0c39edfb 100644
--- a/src/mesh/gnunet-service-mesh_channel.c
+++ b/src/mesh/gnunet-service-mesh_channel.c
@@ -631,7 +631,7 @@ channel_confirm (struct MeshChannel *ch, int fwd)
       /* TODO return? */
     }
   }
-  send_ack (NULL, ch, fwd);
+  GMC_send_ack (NULL, ch, fwd);
 }
 
 
@@ -828,7 +828,6 @@ channel_set_options (struct MeshChannel *ch, uint32_t options)
 }
 
 
-
 /**
  * Confirm we got a channel create.
  *
@@ -843,9 +842,8 @@ channel_send_ack (struct MeshChannel *ch, int fwd)
   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 @@ GMCH_handle_local_ack (struct MeshChannel *ch, int fwd)
 
   rel->client_ready = GNUNET_YES;
   send_client_buffered_data (ch, c, fwd);
-  send_ack (NULL, ch, fwd);
+  GMC_send_ack (NULL, ch, fwd);
 }
 
 
diff --git a/src/mesh/gnunet-service-mesh_connection.c b/src/mesh/gnunet-service-mesh_connection.c
index 07e75ab87..453a94428 100644
--- a/src/mesh/gnunet-service-mesh_connection.c
+++ b/src/mesh/gnunet-service-mesh_connection.c
@@ -1382,7 +1382,7 @@ handle_mesh_encrypted (const struct GNUNET_PeerIdentity *peer,
     }
     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 @@ handle_mesh_encrypted (const struct GNUNET_PeerIdentity *peer,
   {
     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 @@ GMC_handle_poll (void *cls, const struct GNUNET_PeerIdentity *peer,
               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;
 }