diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-08-24 15:21:32 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-08-24 15:21:32 +0200 |
commit | 5bb46d9a3ab568145f594c5a3cfa31ead3df38eb (patch) | |
tree | 021dd56b9a4fd7d349139a844635bb1675b80167 /src/transport | |
parent | 5ddaa3f8eb5e01882540f21ddf237f3a41311e8a (diff) | |
download | gnunet-5bb46d9a3ab568145f594c5a3cfa31ead3df38eb.tar.gz gnunet-5bb46d9a3ab568145f594c5a3cfa31ead3df38eb.zip |
-remove dead ats-tests, fix strange Debian build issues
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/Makefile.am | 29 | ||||
-rw-r--r-- | src/transport/transport_api_cmd_start_peer.c | 7 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index afa37bac5..70687f7b5 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -156,13 +156,6 @@ libgnunettransporttesting_la_LIBADD = \ | |||
156 | $(top_builddir)/src/testing/libgnunettesting.la \ | 156 | $(top_builddir)/src/testing/libgnunettesting.la \ |
157 | $(top_builddir)/src/arm/libgnunetarm.la \ | 157 | $(top_builddir)/src/arm/libgnunetarm.la \ |
158 | $(GN_LIBINTL) | 158 | $(GN_LIBINTL) |
159 | libgnunettransporttesting_la_DEPENDENCIES = \ | ||
160 | libgnunettransport.la \ | ||
161 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
162 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
163 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
164 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
165 | $(top_builddir)/src/arm/libgnunetarm.la | ||
166 | libgnunettransporttesting_la_LDFLAGS = \ | 159 | libgnunettransporttesting_la_LDFLAGS = \ |
167 | $(GN_LIB_LDFLAGS) | 160 | $(GN_LIB_LDFLAGS) |
168 | 161 | ||
@@ -190,7 +183,8 @@ libgnunettransporttesting2_la_LIBADD = \ | |||
190 | $(top_builddir)/src/util/libgnunetutil.la | 183 | $(top_builddir)/src/util/libgnunetutil.la |
191 | libgnunettransporttesting2_la_LDFLAGS = \ | 184 | libgnunettransporttesting2_la_LDFLAGS = \ |
192 | $(GN_LIBINTL) \ | 185 | $(GN_LIBINTL) \ |
193 | $(GN_LIB_LDFLAGS) | 186 | $(GN_LIB_LDFLAGS) \ |
187 | -version-info 0:0:0 | ||
194 | 188 | ||
195 | libgnunettransport_la_SOURCES = \ | 189 | libgnunettransport_la_SOURCES = \ |
196 | transport.h \ | 190 | transport.h \ |
@@ -208,10 +202,6 @@ libgnunettransport_la_LIBADD = \ | |||
208 | $(top_builddir)/src/ats/libgnunetats.la \ | 202 | $(top_builddir)/src/ats/libgnunetats.la \ |
209 | $(top_builddir)/src/util/libgnunetutil.la \ | 203 | $(top_builddir)/src/util/libgnunetutil.la \ |
210 | $(GN_LIBINTL) | 204 | $(GN_LIBINTL) |
211 | libgnunettransport_la_DEPENDENCIES = \ | ||
212 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
213 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
214 | $(top_builddir)/src/util/libgnunetutil.la | ||
215 | libgnunettransport_la_LDFLAGS = \ | 205 | libgnunettransport_la_LDFLAGS = \ |
216 | $(GN_LIB_LDFLAGS) \ | 206 | $(GN_LIB_LDFLAGS) \ |
217 | -version-info 4:0:2 | 207 | -version-info 4:0:2 |
@@ -406,16 +396,23 @@ plugin_LTLIBRARIES = \ | |||
406 | libgnunet_test_transport_plugin_cmd_simple_send_la_SOURCES = \ | 396 | libgnunet_test_transport_plugin_cmd_simple_send_la_SOURCES = \ |
407 | test_transport_plugin_cmd_simple_send.c | 397 | test_transport_plugin_cmd_simple_send.c |
408 | libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = \ | 398 | libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = \ |
409 | $(top_builddir)/src/util/libgnunetutil.la \ | 399 | libgnunettransporttesting2.la \ |
400 | libgnunettransportapplication.la \ | ||
401 | libgnunettransport.la \ | ||
410 | $(top_builddir)/src/testing/libgnunettesting.la \ | 402 | $(top_builddir)/src/testing/libgnunettesting.la \ |
403 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | ||
411 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 404 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
412 | libgnunettransporttesting2.la \ | 405 | $(top_builddir)/src/hello/libgnunethello.la \ |
406 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
407 | $(top_builddir)/src/arm/libgnunetarm.la \ | ||
408 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
413 | $(LTLIBINTL) | 409 | $(LTLIBINTL) |
414 | libgnunet_test_transport_plugin_cmd_simple_send_la_LDFLAGS = \ | 410 | libgnunet_test_transport_plugin_cmd_simple_send_la_LDFLAGS = \ |
415 | $(GN_PLUGIN_LDFLAGS) | 411 | $(GN_PLUGIN_LDFLAGS) |
416 | 412 | ||
417 | if HAVE_EXPERIMENTAL | 413 | if HAVE_EXPERIMENTAL |
418 | plugin_LTLIBRARIES += libgnunet_plugin_transport_udp.la | 414 | plugin_LTLIBRARIES += \ |
415 | libgnunet_plugin_transport_udp.la | ||
419 | endif | 416 | endif |
420 | 417 | ||
421 | # Note: real plugins of course need to be added | 418 | # Note: real plugins of course need to be added |
@@ -731,8 +728,8 @@ test_transport_api_cmd_simple_send_LDADD = \ | |||
731 | $(top_builddir)/src/testing/libgnunettesting.la \ | 728 | $(top_builddir)/src/testing/libgnunettesting.la \ |
732 | $(top_builddir)/src/util/libgnunetutil.la \ | 729 | $(top_builddir)/src/util/libgnunetutil.la \ |
733 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 730 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
734 | libgnunettransport.la \ | ||
735 | $(top_builddir)/src/hello/libgnunethello.la \ | 731 | $(top_builddir)/src/hello/libgnunethello.la \ |
732 | libgnunettransport.la \ | ||
736 | libgnunettransporttesting.la | 733 | libgnunettransporttesting.la |
737 | 734 | ||
738 | test_transport_testing_startstop_SOURCES = \ | 735 | test_transport_testing_startstop_SOURCES = \ |
diff --git a/src/transport/transport_api_cmd_start_peer.c b/src/transport/transport_api_cmd_start_peer.c index 9277bc346..729d981c0 100644 --- a/src/transport/transport_api_cmd_start_peer.c +++ b/src/transport/transport_api_cmd_start_peer.c | |||
@@ -69,9 +69,9 @@ hello_iter_cb (void *cb_cls, | |||
69 | } | 69 | } |
70 | 70 | ||
71 | 71 | ||
72 | |||
73 | /** | 72 | /** |
74 | * Function to start the retrival task to retrieve the hello of this peer from the peerstore. | 73 | * Function to start the retrieval task to retrieve the hello of this peer |
74 | * from the peerstore. | ||
75 | * | 75 | * |
76 | */ | 76 | */ |
77 | static void | 77 | static void |
@@ -170,6 +170,7 @@ notify_connect (void *cls, | |||
170 | return ret; | 170 | return ret; |
171 | } | 171 | } |
172 | 172 | ||
173 | |||
173 | /** | 174 | /** |
174 | * The run method of this cmd will start all services of a peer to test the transport service. | 175 | * The run method of this cmd will start all services of a peer to test the transport service. |
175 | * | 176 | * |
@@ -309,6 +310,7 @@ start_peer_run (void *cls, | |||
309 | sps->rh_task = GNUNET_SCHEDULER_add_now (retrieve_hello, sps); | 310 | sps->rh_task = GNUNET_SCHEDULER_add_now (retrieve_hello, sps); |
310 | } | 311 | } |
311 | 312 | ||
313 | |||
312 | /** | 314 | /** |
313 | * The cleanup function of this cmd frees resources the cmd allocated. | 315 | * The cleanup function of this cmd frees resources the cmd allocated. |
314 | * | 316 | * |
@@ -434,6 +436,7 @@ GNUNET_TRANSPORT_get_trait_hello_size (const struct | |||
434 | (unsigned int) 4); | 436 | (unsigned int) 4); |
435 | } | 437 | } |
436 | 438 | ||
439 | |||
437 | /** | 440 | /** |
438 | * Function to get the trait with the hello. | 441 | * Function to get the trait with the hello. |
439 | * | 442 | * |