From: Bart Polot <bart@net.in.tum.de>
Date: Tue, 25 Jun 2013 11:27:32 +0000 (+0000)
Subject: - fix unicast/to_origin oversimplification
X-Git-Tag: initial-import-from-subversion-38251~8658
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9774078813f0cca5b98a1b3d4c558e2bef4ae512;p=oweals%2Fgnunet.git

- fix unicast/to_origin oversimplification
---

diff --git a/src/mesh/mesh2_api.c b/src/mesh/mesh2_api.c
index d9e02c40e..2245b03f4 100644
--- a/src/mesh/mesh2_api.c
+++ b/src/mesh/mesh2_api.c
@@ -1218,7 +1218,6 @@ send_callback (void *cls, size_t size, void *buf)
         psize += sizeof (dmsg);
         GNUNET_assert (size >= psize);
         dmsg.header.size = htons (psize);
-        dmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN);
         dmsg.tid = htonl (t->tid);
         dmsg.pid = htonl (t->last_pid_sent + 1);
         dmsg.ttl = 0;
@@ -1229,11 +1228,13 @@ send_callback (void *cls, size_t size, void *buf)
       if (t->tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
       {
         /* traffic to origin */
+        dmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN);
         LOG (GNUNET_ERROR_TYPE_DEBUG, "#  to origin, type %s\n",
              GNUNET_MESH_DEBUG_M2S (ntohs (mh->type)));
       }
       else
       {
+        dmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_UNICAST);
         LOG (GNUNET_ERROR_TYPE_DEBUG, "#  unicast, type %s\n",
              GNUNET_MESH_DEBUG_M2S (ntohs (mh->type)));
       }