From: Matthias Wachs <wachs@net.in.tum.de>
Date: Fri, 28 Oct 2011 08:30:40 +0000 (+0000)
Subject: one commit to ruin the day:
X-Git-Tag: initial-import-from-subversion-38251~16179
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0beac08710f27b7803491e3c80acc36e917def68;p=oweals%2Fgnunet.git

one commit to ruin the day:
give transport to the buildbots
---

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 5a04a81bc..bc116171f 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -129,7 +129,6 @@ gnunet_transport_LDADD = \
 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,24 +145,25 @@ gnunet_service_transport_LDADD = \
   $(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 \
diff --git a/src/transport/gnunet-service-transport_neighbours_3way.c b/src/transport/gnunet-service-transport_neighbours_3way.c
index a10d23240..b184162b2 100644
--- a/src/transport/gnunet-service-transport_neighbours_3way.c
+++ b/src/transport/gnunet-service-transport_neighbours_3way.c
@@ -673,15 +673,18 @@ GST_neighbours_start (void *cls, GNUNET_TRANSPORT_NotifyConnect connect_cb,
   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 @@ send_disconnect (struct NeighbourMapEntry *n)
   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,10 +2054,9 @@ GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message,
   struct BlackListCheckContext * bcc = NULL;
 
 #if DEBUG_TRANSPORT
-#endif
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
       "Received CONNECT message from peer `%s'\n", GNUNET_i2s (peer));
-
+#endif
 
   if (ntohs (message->size) != sizeof (struct SessionConnectMessage))
   {