gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r16834 - gnunet/src/transport


From: gnunet
Subject: [GNUnet-SVN] r16834 - gnunet/src/transport
Date: Wed, 14 Sep 2011 14:20:29 +0200

Author: grothoff
Date: 2011-09-14 14:20:29 +0200 (Wed, 14 Sep 2011)
New Revision: 16834

Modified:
   gnunet/src/transport/gnunet-service-transport_clients.c
   gnunet/src/transport/plugin_transport_http.c
   gnunet/src/transport/plugin_transport_udp.c
Log:
fix: ipv6 IPs should be in []. strlen bad parens

Modified: gnunet/src/transport/gnunet-service-transport_clients.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_clients.c     2011-09-14 
11:59:46 UTC (rev 16833)
+++ gnunet/src/transport/gnunet-service-transport_clients.c     2011-09-14 
12:20:29 UTC (rev 16834)
@@ -636,7 +636,7 @@
     GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
     return;
   }
-  GNUNET_SERVER_transmit_context_append_data (tc, buf, strlen (buf + 1),
+  GNUNET_SERVER_transmit_context_append_data (tc, buf, strlen (buf) + 1,
                                               
GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY);
 }
 

Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2011-09-14 11:59:46 UTC 
(rev 16833)
+++ gnunet/src/transport/plugin_transport_http.c        2011-09-14 12:20:29 UTC 
(rev 16834)
@@ -2905,7 +2905,9 @@
     return NULL;
   }
 
-  res = GNUNET_snprintf (rbuf, sizeof (rbuf), "%s:%u", address, port);
+  res = GNUNET_snprintf (rbuf, sizeof (rbuf), 
+                        (addrlen == sizeof (struct IPv6HttpAddress)) ? 
"[%s]:%u" : "%s:%u",
+                        address, port);
 
   GNUNET_free (address);
   GNUNET_assert (res != 0);

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2011-09-14 11:59:46 UTC (rev 
16833)
+++ gnunet/src/transport/plugin_transport_udp.c 2011-09-14 12:20:29 UTC (rev 
16834)
@@ -1065,7 +1065,8 @@
     return NULL;
   }
   inet_ntop (af, sb, buf, INET6_ADDRSTRLEN);
-  GNUNET_snprintf (rbuf, sizeof (rbuf), "%s:%u", buf, port);
+  GNUNET_snprintf (rbuf, sizeof (rbuf), (af == AF_INET6) ? "[%s]:%u" : "%s:%u",
+                  buf, port);
   return rbuf;
 }
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]