diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-10-28 08:30:40 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-10-28 08:30:40 +0000 |
commit | 0beac08710f27b7803491e3c80acc36e917def68 (patch) | |
tree | 854df71281d63b8b5a8234864a6ab7a52c97dedc | |
parent | 9f3b114994eb61226ded9433daa89e625818708c (diff) | |
download | gnunet-0beac08710f27b7803491e3c80acc36e917def68.tar.gz gnunet-0beac08710f27b7803491e3c80acc36e917def68.zip |
one commit to ruin the day:
give transport to the buildbots
-rw-r--r-- | src/transport/Makefile.am | 36 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours_3way.c | 16 |
2 files changed, 27 insertions, 25 deletions
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 = \ | |||
129 | gnunet_transport_DEPENDENCIES = \ | 129 | gnunet_transport_DEPENDENCIES = \ |
130 | libgnunettransport.la | 130 | libgnunettransport.la |
131 | 131 | ||
132 | # transport with 3way handshake | ||
133 | gnunet_service_transport_SOURCES = \ | 132 | gnunet_service_transport_SOURCES = \ |
134 | gnunet-service-transport_3way.c gnunet-service-transport.h \ | 133 | gnunet-service-transport_3way.c gnunet-service-transport.h \ |
135 | gnunet-service-transport_blacklist.h gnunet-service-transport_blacklist.c \ | 134 | gnunet-service-transport_blacklist.h gnunet-service-transport_blacklist.c \ |
@@ -146,24 +145,25 @@ gnunet_service_transport_LDADD = \ | |||
146 | $(top_builddir)/src/util/libgnunetutil.la \ | 145 | $(top_builddir)/src/util/libgnunetutil.la \ |
147 | $(GN_GLPK) \ | 146 | $(GN_GLPK) \ |
148 | $(GN_LIBINTL) | 147 | $(GN_LIBINTL) |
149 | # | ||
150 | 148 | ||
151 | gnunet_service_transport_SOURCES = \ | 149 | |
152 | gnunet-service-transport.c gnunet-service-transport.h \ | 150 | #gnunet_service_transport_SOURCES = \ |
153 | gnunet-service-transport_blacklist.h gnunet-service-transport_blacklist.c \ | 151 | # gnunet-service-transport.c gnunet-service-transport.h \ |
154 | gnunet-service-transport_clients.h gnunet-service-transport_clients.c \ | 152 | # gnunet-service-transport_blacklist.h gnunet-service-transport_blacklist.c \ |
155 | gnunet-service-transport_hello.h gnunet-service-transport_hello.c \ | 153 | # gnunet-service-transport_clients.h gnunet-service-transport_clients.c \ |
156 | gnunet-service-transport_neighbours.h gnunet-service-transport_neighbours.c \ | 154 | # gnunet-service-transport_hello.h gnunet-service-transport_hello.c \ |
157 | gnunet-service-transport_plugins.h gnunet-service-transport_plugins.c \ | 155 | # gnunet-service-transport_neighbours.h gnunet-service-transport_neighbours.c \ |
158 | gnunet-service-transport_validation.h gnunet-service-transport_validation.c | 156 | # gnunet-service-transport_plugins.h gnunet-service-transport_plugins.c \ |
159 | gnunet_service_transport_LDADD = \ | 157 | # gnunet-service-transport_validation.h gnunet-service-transport_validation.c |
160 | $(top_builddir)/src/ats/libgnunetats.la \ | 158 | #gnunet_service_transport_LDADD = \ |
161 | $(top_builddir)/src/hello/libgnunethello.la \ | 159 | # $(top_builddir)/src/ats/libgnunetats.la \ |
162 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 160 | # $(top_builddir)/src/hello/libgnunethello.la \ |
163 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 161 | # $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
164 | $(top_builddir)/src/util/libgnunetutil.la \ | 162 | # $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
165 | $(GN_GLPK) \ | 163 | # $(top_builddir)/src/util/libgnunetutil.la \ |
166 | $(GN_LIBINTL) | 164 | # $(GN_GLPK) \ |
165 | # $(GN_LIBINTL) | ||
166 | |||
167 | 167 | ||
168 | plugin_LTLIBRARIES = \ | 168 | plugin_LTLIBRARIES = \ |
169 | libgnunet_plugin_transport_tcp.la \ | 169 | 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, | |||
673 | neighbours = GNUNET_CONTAINER_multihashmap_create (NEIGHBOUR_TABLE_SIZE); | 673 | neighbours = GNUNET_CONTAINER_multihashmap_create (NEIGHBOUR_TABLE_SIZE); |
674 | } | 674 | } |
675 | 675 | ||
676 | /* | 676 | |
677 | static void | 677 | static void |
678 | send_disconnect_cont (void *cls, | 678 | send_disconnect_cont (void *cls, |
679 | const struct GNUNET_PeerIdentity * target, | 679 | const struct GNUNET_PeerIdentity * target, |
680 | int result) | 680 | int result) |
681 | { | 681 | { |
682 | #if DEBUG_TRANSPORT | ||
682 | struct NeighbourMapEntry *n = cls; | 683 | struct NeighbourMapEntry *n = cls; |
683 | 684 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending DISCONNECT message to peer `%4s': %i\n", | |
684 | }*/ | 685 | GNUNET_i2s (&n->id), result); |
686 | #endif | ||
687 | } | ||
685 | 688 | ||
686 | static int | 689 | static int |
687 | send_disconnect (struct NeighbourMapEntry *n) | 690 | send_disconnect (struct NeighbourMapEntry *n) |
@@ -711,7 +714,7 @@ send_disconnect (struct NeighbourMapEntry *n) | |||
711 | ret = send_with_plugin(&n->id, (const char *) &disconnect_msg, sizeof (disconnect_msg), | 714 | ret = send_with_plugin(&n->id, (const char *) &disconnect_msg, sizeof (disconnect_msg), |
712 | UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, | 715 | UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, |
713 | n->session, n->plugin_name, n->addr, n->addrlen, | 716 | n->session, n->plugin_name, n->addr, n->addrlen, |
714 | GNUNET_YES, NULL, NULL); | 717 | GNUNET_YES, &send_disconnect_cont, n); |
715 | 718 | ||
716 | if (ret == GNUNET_SYSERR) | 719 | if (ret == GNUNET_SYSERR) |
717 | return GNUNET_SYSERR; | 720 | return GNUNET_SYSERR; |
@@ -2051,10 +2054,9 @@ GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message, | |||
2051 | struct BlackListCheckContext * bcc = NULL; | 2054 | struct BlackListCheckContext * bcc = NULL; |
2052 | 2055 | ||
2053 | #if DEBUG_TRANSPORT | 2056 | #if DEBUG_TRANSPORT |
2054 | #endif | 2057 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2055 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
2056 | "Received CONNECT message from peer `%s'\n", GNUNET_i2s (peer)); | 2058 | "Received CONNECT message from peer `%s'\n", GNUNET_i2s (peer)); |
2057 | 2059 | #endif | |
2058 | 2060 | ||
2059 | if (ntohs (message->size) != sizeof (struct SessionConnectMessage)) | 2061 | if (ntohs (message->size) != sizeof (struct SessionConnectMessage)) |
2060 | { | 2062 | { |