6 files changed, 6 insertions, 7 deletions

diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c
index d33425489..fc949786e 100644
--- a/src/mesh/gnunet-service-mesh_channel.c
+++ b/src/mesh/gnunet-service-mesh_channel.c
@@ -1518,7 +1518,7 @@ GMCH_handle_data (struct MeshChannel *ch,
 /**
  * Handler for mesh network traffic end-to-end ACKs.
  *
- * @param t Tunnel on which we got this message.
+ * @param ch Channel on which we got this message.
  * @param msg Data message.
  * @param fwd Is this a fwd ACK? (dest->orig)
  */
diff --git a/src/mesh/gnunet-service-mesh_channel.h b/src/mesh/gnunet-service-mesh_channel.h
index 3d41af4a8..aaead6c30 100644
--- a/src/mesh/gnunet-service-mesh_channel.h
+++ b/src/mesh/gnunet-service-mesh_channel.h
@@ -250,7 +250,7 @@ GMCH_handle_data (struct MeshChannel *ch,
 /**
  * Handler for mesh network traffic end-to-end ACKs.
  *
- * @param t Tunnel on which we got this message.
+ * @param ch Channel on which we got this message.
  * @param msg Data message.
  * @param fwd Is this a fwd ACK? (dest->orig)
  */
diff --git a/src/mesh/gnunet-service-mesh_connection.c b/src/mesh/gnunet-service-mesh_connection.c
index 3abaeda0b..a36c57772 100644
--- a/src/mesh/gnunet-service-mesh_connection.c
+++ b/src/mesh/gnunet-service-mesh_connection.c
@@ -2009,6 +2009,7 @@ GMC_notify_broken (struct MeshConnection *c,
 
   fwd = peer == get_prev_hop (c);
 
+  send_broken (c, &my_full_id, GMP_get_id (peer), fwd);
   connection_cancel_queues (c, !fwd);
   if (GMC_is_terminal (c, fwd))
   {
@@ -2017,8 +2018,6 @@ GMC_notify_broken (struct MeshConnection *c,
     return;
   }
 
-  send_broken (c, &my_full_id, GMP_get_id (peer), fwd);
-
   /* Connection will have at least one pending message
    * (the one we just scheduled), so no point in checking whether to
    * destroy immediately. */
diff --git a/src/mesh/gnunet-service-mesh_peer.c b/src/mesh/gnunet-service-mesh_peer.c
index fab01ebd3..6f46796a2 100644
--- a/src/mesh/gnunet-service-mesh_peer.c
+++ b/src/mesh/gnunet-service-mesh_peer.c
@@ -1522,7 +1522,7 @@ GMP_add_path (struct MeshPeer *peer_info, struct MeshPeerPath *path,
  * The path is given in peer_info -> destination, therefore we turn the path
  * upside down first.
  *
- * @param pee Peer to add the path to, being the origin of the path.
+ * @param peer Peer to add the path to, being the origin of the path.
  * @param path New path to add after being inversed.
  *             Path will be either used or freed.
  * @param trusted Do we trust that this path is real?
diff --git a/src/mesh/gnunet-service-mesh_peer.h b/src/mesh/gnunet-service-mesh_peer.h
index 0d164cef9..75989c4ce 100644
--- a/src/mesh/gnunet-service-mesh_peer.h
+++ b/src/mesh/gnunet-service-mesh_peer.h
@@ -213,7 +213,7 @@ GMP_add_path (struct MeshPeer *peer, struct MeshPeerPath *p, int trusted);
  * @param trusted Do we trust that this path is real?
  */
 void
-GMP_add_path_to_origin (struct MeshPeer *peer_info,
+GMP_add_path_to_origin (struct MeshPeer *peer,
                         struct MeshPeerPath *path,
                         int trusted);
 
diff --git a/src/mesh/gnunet-service-mesh_tunnel.c b/src/mesh/gnunet-service-mesh_tunnel.c
index 231eeabeb..d0f3df14b 100644
--- a/src/mesh/gnunet-service-mesh_tunnel.c
+++ b/src/mesh/gnunet-service-mesh_tunnel.c
@@ -1102,7 +1102,7 @@ GMT_get_next_chid (struct MeshTunnel3 *t)
 
 
 /**
- * Send ACK on one or more channels due to buffer in connections..
+ * Send ACK on one or more channels due to buffer in connections.
  *
  * @param t Channel which has some free buffer space.
  * @param fwd Is this for FWD traffic? (ACK goes to root)