diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-11-26 16:06:43 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-11-26 16:06:43 +0000 |
commit | 2d15194d3de840df12017626236daed0e69a7eeb (patch) | |
tree | 587fa1dfeb0f078b1ba83f642d915391ec5a0fe9 /src | |
parent | becdd68b8a27a47545f707c49b21633b51fef569 (diff) | |
download | gnunet-2d15194d3de840df12017626236daed0e69a7eeb.tar.gz gnunet-2d15194d3de840df12017626236daed0e69a7eeb.zip |
- fix port mangling
Diffstat (limited to 'src')
-rw-r--r-- | src/mesh/gnunet-service-mesh_channel.c | 11 |
1 files changed, 5 insertions, 6 deletions
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, | |||
1747 | MESH_ChannelNumber chid; | 1747 | MESH_ChannelNumber chid; |
1748 | struct MeshChannel *ch; | 1748 | struct MeshChannel *ch; |
1749 | struct MeshClient *c; | 1749 | struct MeshClient *c; |
1750 | uint32_t port; | ||
1751 | 1750 | ||
1752 | chid = ntohl (msg->chid); | 1751 | chid = ntohl (msg->chid); |
1753 | 1752 | ||
@@ -1761,9 +1760,9 @@ GMCH_handle_create (struct MeshTunnel3 *t, | |||
1761 | channel_set_options (ch, ntohl (msg->opt)); | 1760 | channel_set_options (ch, ntohl (msg->opt)); |
1762 | 1761 | ||
1763 | /* Find a destination client */ | 1762 | /* Find a destination client */ |
1764 | port = ntohl (msg->port); | 1763 | ch->port = ntohl (msg->port); |
1765 | LOG (GNUNET_ERROR_TYPE_DEBUG, " port %u\n", port); | 1764 | LOG (GNUNET_ERROR_TYPE_DEBUG, " port %u\n", ch->port); |
1766 | c = GML_client_get_by_port (port); | 1765 | c = GML_client_get_by_port (ch->port); |
1767 | if (NULL == c) | 1766 | if (NULL == c) |
1768 | { | 1767 | { |
1769 | /* TODO send reject */ | 1768 | /* TODO send reject */ |
@@ -1948,8 +1947,8 @@ GMCH_2s (const struct MeshChannel *ch) | |||
1948 | if (NULL == ch) | 1947 | if (NULL == ch) |
1949 | return "(NULL Channel)"; | 1948 | return "(NULL Channel)"; |
1950 | 1949 | ||
1951 | sprintf (buf, "%s:%X (%X / %X)", | 1950 | sprintf (buf, "%s:%u gid:%X (%X / %X)", |
1952 | GMT_2s (ch->t), ch->gid, ch->lid_root, ch->lid_dest); | 1951 | GMT_2s (ch->t), ch->port, ch->gid, ch->lid_root, ch->lid_dest); |
1953 | 1952 | ||
1954 | return buf; | 1953 | return buf; |
1955 | } | 1954 | } |