[GNUnet-SVN] r20968 - gnunet/src/util

[gnunet]

Author: wachs
Date: 2012-04-12 17:27:52 +0200 (Thu, 12 Apr 2012)
New Revision: 20968

Modified:
   gnunet/src/util/strings.c
Log:
- wrong NBO conversion: port is always zero!


Modified: gnunet/src/util/strings.c
===================================================================
--- gnunet/src/util/strings.c   2012-04-12 14:35:32 UTC (rev 20967)
+++ gnunet/src/util/strings.c   2012-04-12 15:27:52 UTC (rev 20968)
@@ -1017,7 +1017,7 @@
   ret = inet_pton (AF_INET6, zt_addr, &r_buf->sin6_addr);
   if (ret <= 0)
     return GNUNET_SYSERR;
-  r_buf->sin6_port = htonl (port);
+  r_buf->sin6_port = htons (port);
   r_buf->sin6_family = AF_INET6;
   return GNUNET_OK;
 }
@@ -1037,7 +1037,7 @@
                                struct sockaddr_in *r_buf)
 {
   unsigned int temps[5];
-  unsigned int port;
+  int port;
   int cnt;
 
   if (addrlen < 9)
@@ -1053,8 +1053,10 @@
   if (port > 65535)
     return GNUNET_SYSERR;
 
+
+
   r_buf->sin_family = AF_INET;
-  r_buf->sin_port = htonl (port);
+  r_buf->sin_port = htons (port);
   r_buf->sin_addr.s_addr = htonl ((temps[0] << 24) + (temps[1] << 16) +
       (temps[2] << 8) + temps[3]);
   return GNUNET_OK;