[GNUnet-SVN] r4903 - in GNUnet: . m4 src/applications/topology_default src/server src/transports src/util/loggers

[gnunet]

Author: grothoff
Date: 2007-06-02 21:28:11 -0600 (Sat, 02 Jun 2007)
New Revision: 4903

Modified:
   GNUnet/configure.ac
   GNUnet/m4/Makefile.in
   GNUnet/src/applications/topology_default/topology.c
   GNUnet/src/server/connection.c
   GNUnet/src/transports/http.c
   GNUnet/src/transports/tcp.c
   GNUnet/src/transports/tcp6.c
   GNUnet/src/transports/udp.c
   GNUnet/src/transports/udp6.c
   GNUnet/src/util/loggers/file.c
Log:
avoid gethostbyaddr if possible

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2007-06-02 22:22:18 UTC (rev 4902)
+++ GNUnet/configure.ac 2007-06-03 03:28:11 UTC (rev 4903)
@@ -502,7 +502,7 @@
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_UID_T
-AC_CHECK_FUNCS([floor gethostname memmove rmdir strncasecmp strrchr strtol 
atoll dup2 fdatasync ftruncate gethostbyname gettimeofday memset mkdir mkfifo 
select socket strcasecmp strchr strdup strerror strstr clock_gettime getrusage 
rand uname setlocale getcwd mktime gmtime_r gmtime strlcpy strlcat ftruncate 
stat64 sbrk mmap mremap setrlimit gethostbyaddr initgroups getifaddrs 
freeifaddrs])
+AC_CHECK_FUNCS([floor gethostname memmove rmdir strncasecmp strrchr strtol 
atoll dup2 fdatasync ftruncate gethostbyname gettimeofday memset mkdir mkfifo 
select socket strcasecmp strchr strdup strerror strstr clock_gettime getrusage 
rand uname setlocale getcwd mktime gmtime_r gmtime strlcpy strlcat ftruncate 
stat64 sbrk mmap mremap setrlimit gethostbyaddr initgroups getifaddrs 
freeifaddrs getnameinfo])
 
 # restore LIBS
 LIBS=$SAVE_LIBS

Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in       2007-06-02 22:22:18 UTC (rev 4902)
+++ GNUnet/m4/Makefile.in       2007-06-03 03:28:11 UTC (rev 4903)
@@ -42,10 +42,10 @@
        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcurl.m4 \
        $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/nls.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
-       $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
-       $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkdirp.m4 \
+       $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+       $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: GNUnet/src/applications/topology_default/topology.c
===================================================================
--- GNUnet/src/applications/topology_default/topology.c 2007-06-02 22:22:18 UTC 
(rev 4902)
+++ GNUnet/src/applications/topology_default/topology.c 2007-06-03 03:28:11 UTC 
(rev 4903)
@@ -39,7 +39,7 @@
 #include "gnunet_transport_service.h"
 #include "gnunet_pingpong_service.h"
 
-#define DEBUG_TOPOLOGY YES
+#define DEBUG_TOPOLOGY NO
 
 /**
  * After 2 minutes on an inactive connection, probe the other

Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c      2007-06-02 22:22:18 UTC (rev 4902)
+++ GNUnet/src/server/connection.c      2007-06-03 03:28:11 UTC (rev 4903)
@@ -3107,7 +3107,7 @@
 
       GE_LOG(ectx,
             GE_DEBUG | GE_REQUEST | GE_USER,
-            "connection goal is %s%d peers (%llu BPS bandwidth downstream)\n",
+            "connection goal is %s%d peers (%llu BPM bandwidth downstream)\n",
             (olen == 0) ? "" : "now ",
             CONNECTION_MAX_HOSTS_,
             max_bpm);

Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c        2007-06-02 22:22:18 UTC (rev 4902)
+++ GNUnet/src/transports/http.c        2007-06-03 03:28:11 UTC (rev 4903)
@@ -1151,9 +1151,30 @@
   const HostAddress * haddr = (const HostAddress*) &hello[1];
   size_t n;
   const char * hn = "";
-  struct hostent * ent;
+#if HAVE_GETNAMEINFO
+  char hostname[256];
+  struct sockaddr_in serverAddr;
 
+  if (do_resolve) {
+    memset((char *) &serverAddr,
+          0,
+          sizeof(serverAddr));
+    serverAddr.sin_family   = AF_INET;
+    memcpy(&serverAddr.sin_addr,
+          haddr,
+          sizeof(IPaddr));  
+    serverAddr.sin_port = haddr->port;
+    if (0 == getnameinfo((const struct sockaddr*) &serverAddr,
+                        sizeof(struct sockaddr_in),
+                        hostname,
+                        255,
+                        NULL, 0,
+                        NI_NAMEREQD))
+      hn = hostname;   
+  }
+#else
 #if HAVE_GETHOSTBYADDR
+  struct hostent * ent;
   if (do_resolve) {
     ent = gethostbyaddr(haddr,
                        sizeof(IPaddr),
@@ -1162,6 +1183,7 @@
       hn = ent->h_name;
   }    
 #endif
+#endif
   n = 4*4+7+6 + strlen(hn) + 10;
   ret = MALLOC(n);
   if (strlen(hn) > 0) {

Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2007-06-02 22:22:18 UTC (rev 4902)
+++ GNUnet/src/transports/tcp.c 2007-06-03 03:28:11 UTC (rev 4903)
@@ -505,9 +505,30 @@
   const HostAddress * haddr = (const HostAddress*) &hello[1];
   size_t n;
   const char * hn = "";
-  struct hostent * ent;
+#if HAVE_GETNAMEINFO
+  char hostname[256];
+  struct sockaddr_in serverAddr;
 
+  if (do_resolve) {
+    memset((char *) &serverAddr,
+          0,
+          sizeof(serverAddr));
+    serverAddr.sin_family   = AF_INET;
+    memcpy(&serverAddr.sin_addr,
+          haddr,
+          sizeof(IPaddr));  
+    serverAddr.sin_port = haddr->port;
+    if (0 == getnameinfo((const struct sockaddr*) &serverAddr,
+                        sizeof(struct sockaddr_in),
+                        hostname,
+                        255,
+                        NULL, 0,
+                        NI_NAMEREQD))
+      hn = hostname;   
+  }
+#else
 #if HAVE_GETHOSTBYADDR
+  struct hostent * ent;
   if (do_resolve) {
     ent = gethostbyaddr(haddr,
                        sizeof(IPaddr),
@@ -516,6 +537,7 @@
       hn = ent->h_name;
   }    
 #endif
+#endif
   n = 4*4+6+6 + strlen(hn) + 10;
   ret = MALLOC(n);
   if (strlen(hn) > 0) {

Modified: GNUnet/src/transports/tcp6.c
===================================================================
--- GNUnet/src/transports/tcp6.c        2007-06-02 22:22:18 UTC (rev 4902)
+++ GNUnet/src/transports/tcp6.c        2007-06-03 03:28:11 UTC (rev 4903)
@@ -453,22 +453,47 @@
 static char * 
 addressToString(const P2P_hello_MESSAGE * hello,
                int do_resolve) {
+  
   char * ret;
   char inet6[INET6_ADDRSTRLEN];
   const Host6Address * haddr = (const Host6Address*) &hello[1];
   const char * hn = "";
-  struct hostent * ent;
   size_t n;
 
+#if HAVE_GETNAMEINFO
+  struct sockaddr_in6 serverAddr;
+  char hostname[256];
+
+  if (do_resolve) {
+    memset((char *) &serverAddr,
+          0,
+          sizeof(serverAddr));
+    serverAddr.sin6_family   = AF_INET6;
+    memcpy(&serverAddr.sin6_addr,
+          haddr,
+          sizeof(IP6addr));
+    serverAddr.sin6_port     = haddr->port;
+    if (0 == getnameinfo((const struct sockaddr* ) haddr,
+                        sizeof(struct sockaddr_in6),
+                        hostname,
+                        255,
+                        NULL, 0,
+                        NI_NAMEREQD))
+      hn = hostname;   
+  }
+#else
 #if HAVE_GETHOSTBYADDR
+  struct hostent * ent;
+
   if (do_resolve) {
     ent = gethostbyaddr(haddr,
-                       sizeof(IPaddr),
-                       AF_INET);
+                       sizeof(IP6addr),
+                       AF_INET6);
     if (ent != NULL)
       hn = ent->h_name;
   }    
 #endif
+#endif
   n = INET6_ADDRSTRLEN + 16 + strlen(hn) + 10;
   ret = MALLOC(n);
   if (strlen(hn) > 0) {

Modified: GNUnet/src/transports/udp.c
===================================================================
--- GNUnet/src/transports/udp.c 2007-06-02 22:22:18 UTC (rev 4902)
+++ GNUnet/src/transports/udp.c 2007-06-03 03:28:11 UTC (rev 4903)
@@ -470,9 +470,31 @@
   const HostAddress * haddr = (const HostAddress*) &hello[1];
   size_t n;
   const char * hn = "";
-  struct hostent * ent;
 
+#if HAVE_GETNAMEINFO
+  char hostname[256];
+  struct sockaddr_in serverAddr;
+
+  if (do_resolve) {
+    memset((char *) &serverAddr,
+          0,
+          sizeof(serverAddr));
+    serverAddr.sin_family   = AF_INET;
+    memcpy(&serverAddr.sin_addr,
+          haddr,
+          sizeof(IPaddr));  
+    serverAddr.sin_port = haddr->senderPort;
+    if (0 == getnameinfo((const struct sockaddr* ) &serverAddr,
+                        sizeof(struct sockaddr_in),
+                        hostname,
+                        255,
+                        NULL, 0,
+                        NI_NAMEREQD))
+      hn = hostname;   
+  }
+#else
 #if HAVE_GETHOSTBYADDR
+  struct hostent * ent;
   if (do_resolve) {
     ent = gethostbyaddr(haddr,
                        sizeof(IPaddr),
@@ -481,6 +503,7 @@
       hn = ent->h_name;
   }    
 #endif
+#endif
   n = 4*4+6+6 + strlen(hn) + 10;
   ret = MALLOC(n);
   if (strlen(hn) > 0) {

Modified: GNUnet/src/transports/udp6.c
===================================================================
--- GNUnet/src/transports/udp6.c        2007-06-02 22:22:18 UTC (rev 4902)
+++ GNUnet/src/transports/udp6.c        2007-06-03 03:28:11 UTC (rev 4903)
@@ -449,10 +449,32 @@
   char inet6[INET6_ADDRSTRLEN];
   const Host6Address * haddr = (const Host6Address*) &hello[1];
   const char * hn = "";
-  struct hostent * ent;
   size_t n;
 
+#if HAVE_GETNAMEINFO
+  struct sockaddr_in6 serverAddr;
+  char hostname[256];
+
+  if (do_resolve) {
+    memset((char *) &serverAddr,
+          0,
+          sizeof(serverAddr));
+    serverAddr.sin6_family   = AF_INET6;
+    memcpy(&serverAddr.sin6_addr,
+          haddr,
+          sizeof(IP6addr));
+    serverAddr.sin6_port     = haddr->senderPort;
+    if (0 == getnameinfo((const struct sockaddr*  ) haddr,
+                        sizeof(struct sockaddr_in6),
+                        hostname,
+                        255,
+                        NULL, 0,
+                        NI_NAMEREQD))
+      hn = hostname;   
+  }
+#else
 #if HAVE_GETHOSTBYADDR
+  struct hostent * ent;
   if (do_resolve) {
     ent = gethostbyaddr(haddr,
                        sizeof(IPaddr),
@@ -461,6 +483,7 @@
       hn = ent->h_name;
   }    
 #endif
+#endif
   n = INET6_ADDRSTRLEN + 16 + strlen(hn) + 10;
   ret = MALLOC(n);
   if (strlen(hn) > 0) {

Modified: GNUnet/src/util/loggers/file.c
===================================================================
--- GNUnet/src/util/loggers/file.c      2007-06-02 22:22:18 UTC (rev 4902)
+++ GNUnet/src/util/loggers/file.c      2007-06-03 03:28:11 UTC (rev 4903)
@@ -238,7 +238,7 @@
   }
   if (fctx->logdate) {
     ret = fprintf(fctx->handle,
-                 "%s: %s %s",
+                 "%s %s: %s",
                  date,
                  GE_kindToString(kind & GE_EVENTKIND),
                  msg);