From 49f773669dc0e7bfced5b1082b52de81595a15c0 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Wed, 6 Nov 2013 16:19:37 +0000 Subject: new identities for blacklist checks --- src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf | 4 ++-- .../test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf | 4 ++-- src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf | 4 ++-- src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf | 5 ++--- .../test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf | 4 ++-- src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf | 4 ++-- src/transport/transport-testing.c | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf index ed04799f5..e51980590 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf @@ -29,6 +29,6 @@ PORT = 12001 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = tcp -[transport-blacklist-ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO] -CQQU54C07Q4P8HGGM6ATP8NV8ACJONGK5NJSP0UAL1RGH34V553JT70UEBO52VKOBHGJ6RJVDPUKUJ2F9U6EBAICJJEBHIHAC1TI238 = +[transport-blacklist-6ULBJK6QQJ64FAG9DF0292AS5IA9CCAC04IQU0HF8THM635HMBBG] +DJ5SVJJDHH06BH1H0DE0V8CMBQG9AD8M85PF02SS3285AQ3R0R50 = \ No newline at end of file diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf index 07d779bab..a7a0cbc02 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf @@ -29,6 +29,6 @@ PORT = 12001 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = tcp udp -[transport-blacklist-ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO] -CQQU54C07Q4P8HGGM6ATP8NV8ACJONGK5NJSP0UAL1RGH34V553JT70UEBO52VKOBHGJ6RJVDPUKUJ2F9U6EBAICJJEBHIHAC1TI238 = tcp +[transport-blacklist-6ULBJK6QQJ64FAG9DF0292AS5IA9CCAC04IQU0HF8THM635HMBBG] +DJ5SVJJDHH06BH1H0DE0V8CMBQG9AD8M85PF02SS3285AQ3R0R50 = tcp \ No newline at end of file diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf index f4d955f06..788de5e10 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf @@ -29,6 +29,6 @@ PORT = 12001 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = tcp -[transport-blacklist-ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO] -CQQU54C07Q4P8HGGM6ATP8NV8ACJONGK5NJSP0UAL1RGH34V553JT70UEBO52VKOBHGJ6RJVDPUKUJ2F9U6EBAICJJEBHIHAC1TI238 = tcp +[transport-blacklist-6ULBJK6QQJ64FAG9DF0292AS5IA9CCAC04IQU0HF8THM635HMBBG] +DJ5SVJJDHH06BH1H0DE0V8CMBQG9AD8M85PF02SS3285AQ3R0R50 = tcp \ No newline at end of file diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf index 830c3d4c0..1a6138889 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf @@ -29,7 +29,6 @@ PORT = 12010 PLUGINS = tcp UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock - -[transport-blacklist-CQQU54C07Q4P8HGGM6ATP8NV8ACJONGK5NJSP0UAL1RGH34V553JT70UEBO52VKOBHGJ6RJVDPUKUJ2F9U6EBAICJJEBHIHAC1TI238] -ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO = +[transport-blacklist-DJ5SVJJDHH06BH1H0DE0V8CMBQG9AD8M85PF02SS3285AQ3R0R50] +6ULBJK6QQJ64FAG9DF0292AS5IA9CCAC04IQU0HF8THM635HMBBG = \ No newline at end of file diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf index ef4efd373..3a6e471d5 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf @@ -29,5 +29,5 @@ PORT = 12010 PLUGINS = tcp udp UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock -[transport-blacklist-CQQU54C07Q4P8HGGM6ATP8NV8ACJONGK5NJSP0UAL1RGH34V553JT70UEBO52VKOBHGJ6RJVDPUKUJ2F9U6EBAICJJEBHIHAC1TI238] -ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO = tcp \ No newline at end of file +[transport-blacklist-DJ5SVJJDHH06BH1H0DE0V8CMBQG9AD8M85PF02SS3285AQ3R0R50] +6ULBJK6QQJ64FAG9DF0292AS5IA9CCAC04IQU0HF8THM635HMBBG = tcp \ No newline at end of file diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf index 254425a09..0e8bd3305 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf @@ -29,5 +29,5 @@ PORT = 12010 PLUGINS = tcp UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock -[transport-blacklist-CQQU54C07Q4P8HGGM6ATP8NV8ACJONGK5NJSP0UAL1RGH34V553JT70UEBO52VKOBHGJ6RJVDPUKUJ2F9U6EBAICJJEBHIHAC1TI238] -ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO = tcp \ No newline at end of file +[transport-blacklist-DJ5SVJJDHH06BH1H0DE0V8CMBQG9AD8M85PF02SS3285AQ3R0R50] +6ULBJK6QQJ64FAG9DF0292AS5IA9CCAC04IQU0HF8THM635HMBBG = tcp \ No newline at end of file diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c index 30cb87832..51aa0a55f 100644 --- a/src/transport/transport-testing.c +++ b/src/transport/transport-testing.c @@ -299,7 +299,7 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing", "Peer %u configured with identity `%s'\n", p->no, - GNUNET_i2s (&p->id)); + GNUNET_i2s_full (&p->id)); } p->tth = tth; -- cgit v1.2.3