From: Bart Polot <bart@net.in.tum.de>
Date: Tue, 26 Nov 2013 16:06:43 +0000 (+0000)
Subject: - fix port mangling
X-Git-Tag: initial-import-from-subversion-38251~5946
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2d15194d3de840df12017626236daed0e69a7eeb;p=oweals%2Fgnunet.git

- fix port mangling
---

diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c
index 4b510edc2..6801525bb 100644
--- a/src/mesh/gnunet-service-mesh_channel.c
+++ b/src/mesh/gnunet-service-mesh_channel.c
@@ -1747,7 +1747,6 @@ GMCH_handle_create (struct MeshTunnel3 *t,
   MESH_ChannelNumber chid;
   struct MeshChannel *ch;
   struct MeshClient *c;
-  uint32_t port;
 
   chid = ntohl (msg->chid);
 
@@ -1761,9 +1760,9 @@ GMCH_handle_create (struct MeshTunnel3 *t,
   channel_set_options (ch, ntohl (msg->opt));
 
   /* Find a destination client */
-  port = ntohl (msg->port);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "   port %u\n", port);
-  c = GML_client_get_by_port (port);
+  ch->port = ntohl (msg->port);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "   port %u\n", ch->port);
+  c = GML_client_get_by_port (ch->port);
   if (NULL == c)
   {
     /* TODO send reject */
@@ -1948,8 +1947,8 @@ GMCH_2s (const struct MeshChannel *ch)
   if (NULL == ch)
     return "(NULL Channel)";
 
-  sprintf (buf, "%s:%X (%X / %X)",
-           GMT_2s (ch->t), ch->gid, ch->lid_root, ch->lid_dest);
+  sprintf (buf, "%s:%u gid:%X (%X / %X)",
+           GMT_2s (ch->t), ch->port, ch->gid, ch->lid_root, ch->lid_dest);
 
   return buf;
 }