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

[gnunet]

Author: wachs
Date: 2011-10-28 10:30:40 +0200 (Fri, 28 Oct 2011)
New Revision: 17832

Modified:
   gnunet/src/transport/Makefile.am
   gnunet/src/transport/gnunet-service-transport_neighbours_3way.c
Log:
one commit to ruin the day:
give transport to the buildbots


Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2011-10-28 08:29:16 UTC (rev 17831)
+++ gnunet/src/transport/Makefile.am    2011-10-28 08:30:40 UTC (rev 17832)
@@ -129,7 +129,6 @@
 gnunet_transport_DEPENDENCIES = \
   libgnunettransport.la                                
 
-# transport with 3way handshake
 gnunet_service_transport_SOURCES = \
  gnunet-service-transport_3way.c gnunet-service-transport.h \
  gnunet-service-transport_blacklist.h gnunet-service-transport_blacklist.c \
@@ -146,25 +145,26 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_GLPK) \
   $(GN_LIBINTL)
-#
 
-gnunet_service_transport_SOURCES = \
- gnunet-service-transport.c gnunet-service-transport.h \
- gnunet-service-transport_blacklist.h gnunet-service-transport_blacklist.c \
- gnunet-service-transport_clients.h gnunet-service-transport_clients.c \
- gnunet-service-transport_hello.h gnunet-service-transport_hello.c \
- gnunet-service-transport_neighbours.h gnunet-service-transport_neighbours.c \
- gnunet-service-transport_plugins.h gnunet-service-transport_plugins.c \
- gnunet-service-transport_validation.h gnunet-service-transport_validation.c 
-gnunet_service_transport_LDADD = \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_GLPK) \
-  $(GN_LIBINTL)
 
+#gnunet_service_transport_SOURCES = \
+# gnunet-service-transport.c gnunet-service-transport.h \
+# gnunet-service-transport_blacklist.h gnunet-service-transport_blacklist.c \
+# gnunet-service-transport_clients.h gnunet-service-transport_clients.c \
+# gnunet-service-transport_hello.h gnunet-service-transport_hello.c \
+# gnunet-service-transport_neighbours.h gnunet-service-transport_neighbours.c \
+# gnunet-service-transport_plugins.h gnunet-service-transport_plugins.c \
+# gnunet-service-transport_validation.h gnunet-service-transport_validation.c 
+#gnunet_service_transport_LDADD = \
+#  $(top_builddir)/src/ats/libgnunetats.la \
+#  $(top_builddir)/src/hello/libgnunethello.la \
+#  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+#  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+#  $(top_builddir)/src/util/libgnunetutil.la \
+#  $(GN_GLPK) \
+#  $(GN_LIBINTL)
+
+
 plugin_LTLIBRARIES = \
   libgnunet_plugin_transport_tcp.la \
   libgnunet_plugin_transport_udp.la \

Modified: gnunet/src/transport/gnunet-service-transport_neighbours_3way.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours_3way.c     
2011-10-28 08:29:16 UTC (rev 17831)
+++ gnunet/src/transport/gnunet-service-transport_neighbours_3way.c     
2011-10-28 08:30:40 UTC (rev 17832)
@@ -673,16 +673,19 @@
   neighbours = GNUNET_CONTAINER_multihashmap_create (NEIGHBOUR_TABLE_SIZE);
 }
 
-/*
+
 static void
 send_disconnect_cont (void *cls,
     const struct GNUNET_PeerIdentity * target,
     int result)
 {
+#if DEBUG_TRANSPORT
   struct NeighbourMapEntry *n = cls;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending DISCONNECT message to peer 
`%4s': %i\n",
+              GNUNET_i2s (&n->id), result);
+#endif
+}
 
-}*/
-
 static int
 send_disconnect (struct NeighbourMapEntry *n)
 {
@@ -711,7 +714,7 @@
   ret = send_with_plugin(&n->id, (const char *) &disconnect_msg, sizeof 
(disconnect_msg),
                           UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL,
                           n->session, n->plugin_name, n->addr, n->addrlen,
-                          GNUNET_YES, NULL, NULL);
+                          GNUNET_YES, &send_disconnect_cont, n);
 
   if (ret == GNUNET_SYSERR)
     return GNUNET_SYSERR;
@@ -2051,11 +2054,10 @@
   struct BlackListCheckContext * bcc = NULL;
 
 #if DEBUG_TRANSPORT
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Received CONNECT message from peer `%s'\n", GNUNET_i2s (peer));
 #endif
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-      "Received CONNECT message from peer `%s'\n", GNUNET_i2s (peer));
 
-
   if (ntohs (message->size) != sizeof (struct SessionConnectMessage))
   {
     GNUNET_break_op (0);