[GNUnet-SVN] r28252 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-07-22 19:33:44 +0200 (Mon, 22 Jul 2013)
New Revision: 28252

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
   gnunet/src/mesh/mesh_api.c
Log:
- add port number to debug

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2013-07-22 17:16:20 UTC (rev 
28251)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2013-07-22 17:33:44 UTC (rev 
28252)
@@ -3936,7 +3936,8 @@
   tid = ntohl (msg->tid);
   pi = (struct GNUNET_PeerIdentity *) &msg[1];
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "    path is for tunnel %s[%X].\n", GNUNET_i2s (pi), tid);
+              "    path is for tunnel %s[%X]:%u.\n",
+              GNUNET_i2s (pi), tid, ntohl (msg->port));
   t = tunnel_get (pi, tid);
   if (NULL == t) /* might be a local tunnel */
   {
@@ -5032,8 +5033,8 @@
   }
 
   t_msg = (struct GNUNET_MESH_TunnelMessage *) message;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  towards %s\n",
-              GNUNET_i2s (&t_msg->peer));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  towards %s:%u\n",
+              GNUNET_i2s (&t_msg->peer), ntohl (t_msg->port));
   tid = ntohl (t_msg->tunnel_id);
   /* Sanity check for duplicate tunnel IDs */
   if (NULL != tunnel_get_by_local_id (c, tid))

Modified: gnunet/src/mesh/mesh_api.c
===================================================================
--- gnunet/src/mesh/mesh_api.c  2013-07-22 17:16:20 UTC (rev 28251)
+++ gnunet/src/mesh/mesh_api.c  2013-07-22 17:33:44 UTC (rev 28252)
@@ -800,9 +800,11 @@
 {
   struct GNUNET_MESH_Tunnel *t;
   MESH_TunnelNumber tid;
+  uint32_t port;
 
   tid = ntohl (msg->tunnel_id);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Creating incoming tunnel %X\n", tid);
+  port = ntohl (msg->port);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Creating incoming tunnel %X:%u\n", tid, port);
   if (tid < GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
   {
     GNUNET_break (0);
@@ -815,7 +817,7 @@
     t->peer = GNUNET_PEER_intern (&msg->peer);
     t->mesh = h;
     t->tid = tid;
-    t->port = ntohl (msg->port);
+    t->port = port;
     if (0 != (msg->opt & GNUNET_MESH_OPTION_NOBUFFER))
       t->nobuffer = GNUNET_YES;
     else
@@ -1444,7 +1446,9 @@
   struct GNUNET_MESH_Tunnel *t;
   struct GNUNET_MESH_TunnelMessage msg;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Creating new tunnel\n");
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Creating new tunnel to %s:%u\n",
+       GNUNET_i2s (peer), port);
   t = create_tunnel (h, 0);
   LOG (GNUNET_ERROR_TYPE_DEBUG, "  at %p\n", t);
   LOG (GNUNET_ERROR_TYPE_DEBUG, "  number %X\n", t->tid);