aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ats-tests/Makefile.am6
-rw-r--r--src/ats-tests/ats-testing.c1
-rw-r--r--src/ats-tests/perf_ats.c1
3 files changed, 6 insertions, 2 deletions
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index f6fed4ced..22b5592a8 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -82,10 +82,14 @@ perf_ats_proportional_core_none_SOURCES = \
82 perf_ats.c perf_ats_logging.c perf_ats.h 82 perf_ats.c perf_ats_logging.c perf_ats.h
83perf_ats_proportional_core_none_LDADD = \ 83perf_ats_proportional_core_none_LDADD = \
84 $(top_builddir)/src/util/libgnunetutil.la \ 84 $(top_builddir)/src/util/libgnunetutil.la \
85 $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
85 $(top_builddir)/src/testbed/libgnunettestbed.la \ 86 $(top_builddir)/src/testbed/libgnunettestbed.la \
86 $(top_builddir)/src/ats/libgnunetats.la \ 87 $(top_builddir)/src/ats/libgnunetats.la \
87 $(top_builddir)/src/core/libgnunetcore.la \ 88 $(top_builddir)/src/core/libgnunetcore.la \
88 $(top_builddir)/src/transport/libgnunettransport.la 89 $(top_builddir)/src/transport/libgnunettransport.la
90perf_ats_proportional_core_DEPENDENCIES = \
91 $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
92 $(top_builddir)/src/util/libgnunetutil.la
89 93
90perf_ats_proportional_transport_none_SOURCES = \ 94perf_ats_proportional_transport_none_SOURCES = \
91 perf_ats.c perf_ats_logging.c 95 perf_ats.c perf_ats_logging.c
@@ -96,7 +100,7 @@ perf_ats_proportional_transport_none_LDADD = \
96 $(top_builddir)/src/ats/libgnunetats.la \ 100 $(top_builddir)/src/ats/libgnunetats.la \
97 $(top_builddir)/src/core/libgnunetcore.la \ 101 $(top_builddir)/src/core/libgnunetcore.la \
98 $(top_builddir)/src/transport/libgnunettransport.la 102 $(top_builddir)/src/transport/libgnunettransport.la
99gnunet_ats_sim_DEPENDENCIES = \ 103perf_ats_proportional_transport_DEPENDENCIES = \
100 $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ 104 $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
101 $(top_builddir)/src/util/libgnunetutil.la 105 $(top_builddir)/src/util/libgnunetutil.la
102 106
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c
index 5da7e0999..667edb71f 100644
--- a/src/ats-tests/ats-testing.c
+++ b/src/ats-tests/ats-testing.c
@@ -794,6 +794,7 @@ GNUNET_ATS_TEST_create_topology (char *name, char *cfg_file,
794 top->done_cb = done_cb; 794 top->done_cb = done_cb;
795 top->done_cb_cls = done_cb_cls; 795 top->done_cb_cls = done_cb_cls;
796 top->test_core = test_core; 796 top->test_core = test_core;
797 top->transport_recv_cb = transport_recv_cb;
797 798
798 top->mps = GNUNET_malloc (num_masters * sizeof (struct BenchmarkPeer)); 799 top->mps = GNUNET_malloc (num_masters * sizeof (struct BenchmarkPeer));
799 top->sps = GNUNET_malloc (num_slaves * sizeof (struct BenchmarkPeer)); 800 top->sps = GNUNET_malloc (num_slaves * sizeof (struct BenchmarkPeer));
diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c
index daffb9f28..de991e926 100644
--- a/src/ats-tests/perf_ats.c
+++ b/src/ats-tests/perf_ats.c
@@ -428,7 +428,6 @@ transport_recv_cb (void *cls,
428 const struct GNUNET_PeerIdentity * peer, 428 const struct GNUNET_PeerIdentity * peer,
429 const struct GNUNET_MessageHeader * message) 429 const struct GNUNET_MessageHeader * message)
430{ 430{
431 GNUNET_break (0);
432 if (TEST_MESSAGE_SIZE != ntohs (message->size) || 431 if (TEST_MESSAGE_SIZE != ntohs (message->size) ||
433 (TEST_MESSAGE_TYPE_PING != ntohs (message->type) && 432 (TEST_MESSAGE_TYPE_PING != ntohs (message->type) &&
434 TEST_MESSAGE_TYPE_PONG != ntohs (message->type))) 433 TEST_MESSAGE_TYPE_PONG != ntohs (message->type)))