fixes to blacklisting

1 files changed, 53 insertions, 8 deletions

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index a7032e283..aad49299c 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -323,7 +323,11 @@ check_PROGRAMS = \
  $(HTTP_SERVER_PLUGIN_TEST) \
  $(HTTPS_SERVER_PLUGIN_TEST) \
  test_transport_api_blacklisting \
- test_transport_blacklisting_cfg \
+ test_transport_blacklisting_no_bl \
+ test_transport_blacklisting_outbound_bl_full \
+ test_transport_blacklisting_outbound_bl_plugin \
+ test_transport_blacklisting_inbound_bl_plugin \
+ test_transport_blacklisting_inbound_bl_full \
  test_transport_api_disconnect_tcp \
  test_transport_api_bidirectional_connect \
  test_transport_api_tcp \
@@ -374,7 +378,11 @@ TESTS = \
  $(UNIX_TEST) \
  $(WLAN_PLUGIN_TEST) \
  test_transport_api_blacklisting \
- test_transport_blacklisting_cfg \
+ test_transport_blacklisting_no_bl \
+ test_transport_blacklisting_outbound_bl_full \
+ test_transport_blacklisting_outbound_bl_plugin \
+ test_transport_blacklisting_inbound_bl_plugin \
+ test_transport_blacklisting_inbound_bl_full \
  test_transport_api_disconnect_tcp \
  test_transport_api_bidirectional_connect \
  test_transport_api_tcp \
@@ -445,16 +453,51 @@ test_transport_api_blacklisting_LDADD = \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
- 
-test_transport_blacklisting_cfg_SOURCES = \
- test_transport_blacklisting_cfg.c
-test_transport_blacklisting_cfg_LDADD = \
+
+test_transport_blacklisting_no_bl_SOURCES = \
+ test_transport_blacklisting.c
+test_transport_blacklisting_no_bl_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
  
+test_transport_blacklisting_outbound_bl_full_SOURCES = \
+ test_transport_blacklisting.c
+test_transport_blacklisting_outbound_bl_full_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la  
+ 
+test_transport_blacklisting_outbound_bl_plugin_SOURCES = \
+ test_transport_blacklisting.c
+test_transport_blacklisting_outbound_bl_plugin_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la   
+
+test_transport_blacklisting_inbound_bl_full_SOURCES = \
+ test_transport_blacklisting.c
+test_transport_blacklisting_inbound_bl_full_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la   
+ 
+test_transport_blacklisting_inbound_bl_plugin_SOURCES = \
+ test_transport_blacklisting.c
+test_transport_blacklisting_inbound_bl_plugin_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la  
 
 test_transport_api_disconnect_tcp_SOURCES = \
  test_transport_api_disconnect.c
@@ -984,7 +1027,9 @@ test_transport_api_unreliability_constant_udp_peer1.conf\
 test_transport_api_unreliability_constant_udp_peer2.conf\
 test_transport_blacklisting_cfg_peer1.conf \
 test_transport_blacklisting_cfg_peer2.conf \
-test_transport_blacklisting_cfg_blp_peer1.conf \
-test_transport_blacklisting_cfg_blp_peer2.conf\
+test_transport_blacklisting_cfg_blp_peer1_full.conf\
+test_transport_blacklisting_cfg_blp_peer1_plugin.conf \
+test_transport_blacklisting_cfg_blp_peer2_full.conf\
+test_transport_blacklisting_cfg_blp_peer2_plugin.conf \
 test_transport_api_http_reverse_peer1.conf \
 test_transport_api_http_reverse_peer2.conf