From: Bart Polot <bart@net.in.tum.de>
Date: Mon, 22 Jul 2013 16:03:07 +0000 (+0000)
Subject: - try to work if both RELIABLE and NOBUFFER options are selected
X-Git-Tag: initial-import-from-subversion-38251~8135
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=82c9fdd6e78219478d4198c18427ef43bb5cc59a;p=oweals%2Fgnunet.git

- try to work if both RELIABLE and NOBUFFER options are selected
---

diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index a0726bf2f..4881515c9 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -2444,7 +2444,7 @@ tunnel_send_ack (struct MeshTunnel *t, uint16_t type, int fwd)
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "ACK due to %s\n",
                   GNUNET_MESH_DEBUG_M2S (type));
-      if (GNUNET_YES == t->nobuffer)
+      if (GNUNET_YES == t->nobuffer && (GNUNET_NO == t->reliable || NULL == c))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Not sending ACK, nobuffer\n");
         return;