[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33767 - gnunet/src/transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33767 - gnunet/src/transport |
|
Date: |
Mon, 23 Jun 2014 10:55:30 +0200 |
Author: wachs
Date: 2014-06-23 10:55:30 +0200 (Mon, 23 Jun 2014)
New Revision: 33767
Modified:
gnunet/src/transport/test_transport_blacklisting.c
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
Log:
extended test to check configuration files
+ fixed cfg files
Modified: gnunet/src/transport/test_transport_blacklisting.c
===================================================================
--- gnunet/src/transport/test_transport_blacklisting.c 2014-06-23 08:20:01 UTC
(rev 33766)
+++ gnunet/src/transport/test_transport_blacklisting.c 2014-06-23 08:55:30 UTC
(rev 33767)
@@ -186,8 +186,41 @@
}
-static int check_bl_config (char *src, char *dest)
+static int check_blacklist_config (char *cfg_file,
+ struct GNUNET_PeerIdentity *peer, struct GNUNET_PeerIdentity *bl_peer)
{
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+ char *section;
+ char *peer_str;
+ cfg = GNUNET_CONFIGURATION_create ();
+ if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cfg_file))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Could not load configuration `%s'\n",
cfg_file);
+ GNUNET_CONFIGURATION_destroy (cfg);
+ return GNUNET_SYSERR;
+ }
+
+ peer_str = GNUNET_strdup (GNUNET_i2s_full(peer));
+ GNUNET_asprintf (§ion, "transport-blacklist-%s", peer_str);
+
+ if (GNUNET_NO == GNUNET_CONFIGURATION_have_value (cfg, section,
GNUNET_i2s_full(bl_peer)))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "Configuration `%s' does not have blacklisting section for peer `%s'
blacklisting `%s'\n",
+ cfg_file, peer_str, GNUNET_i2s_full(bl_peer));
+ GNUNET_CONFIGURATION_destroy (cfg);
+ GNUNET_free (section);
+ GNUNET_free (peer_str);
+ return GNUNET_SYSERR;
+ }
+
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Configuration `%s' does have blacklisting section for peer `%s'
blacklisting `%s'\n",
+ cfg_file, peer_str, GNUNET_i2s_full(bl_peer));
+
+ GNUNET_CONFIGURATION_destroy (cfg);
+ GNUNET_free (section);
+ GNUNET_free (peer_str);
return GNUNET_OK;
}
@@ -218,57 +251,130 @@
else if (0
== strcmp (test_name, "test_transport_blacklisting_outbound_bl_full"))
{
+ char * cfg_p1 = "test_transport_blacklisting_cfg_blp_peer1_full.conf";
+ char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_full.conf";
p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- "test_transport_blacklisting_cfg_blp_peer1_full.conf", 1, NULL, NULL,
- NULL, &start_cb, NULL );
+ cfg_p1 , 1, NULL, NULL, NULL, &start_cb, NULL );
p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- "test_transport_blacklisting_cfg_peer2.conf", 2, NULL, NULL, NULL,
+ cfg_p2, 2, NULL, NULL, NULL,
&start_cb, NULL );
+
+ /* check if configuration contain correct blacklist entries */
+ if ((GNUNET_SYSERR == check_blacklist_config (cfg_p1, &p1->id, &p2->id))
||
+ (GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id))
)
+ {
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ p1 = NULL;
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ p2 = NULL;
+ ok = 1;
+ GNUNET_SCHEDULER_add_now (&end, NULL );
+ }
+
}
else if (0
== strcmp (test_name,
"test_transport_blacklisting_outbound_bl_plugin"))
{
+ char * cfg_p1 = "test_transport_blacklisting_cfg_blp_peer1_plugin.conf";
+ char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_plugin.conf";
+
p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- "test_transport_blacklisting_cfg_blp_peer1_plugin.conf", 1, NULL,
+ cfg_p1, 1, NULL,
NULL, NULL, &start_cb, NULL );
p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- "test_transport_blacklisting_cfg_peer2.conf", 2, NULL, NULL, NULL,
+ cfg_p2, 2, NULL, NULL, NULL,
&start_cb, NULL );
+
+ /* check if configuration contain correct blacklist entries */
+ if ((GNUNET_SYSERR == check_blacklist_config (cfg_p1, &p1->id, &p2->id))
||
+ (GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id))
)
+ {
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ p1 = NULL;
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ p2 = NULL;
+ ok = 1;
+ GNUNET_SCHEDULER_add_now (&end, NULL );
+ }
}
else if (0
== strcmp (test_name, "test_transport_blacklisting_inbound_bl_full"))
{
+ char * cfg_p1 = "test_transport_blacklisting_cfg_peer1.conf";
+ char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_full.conf";
+
p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- "test_transport_blacklisting_cfg_peer1.conf", 1, NULL, NULL, NULL,
+ cfg_p1, 1, NULL, NULL, NULL,
&start_cb, NULL );
p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- "test_transport_blacklisting_cfg_blp_peer2_full.conf", 2, NULL, NULL,
+ cfg_p2, 2, NULL, NULL,
NULL, &start_cb, NULL );
+
+ /* check if configuration contain correct blacklist entries */
+ if ((GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id))
)
+ {
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ p1 = NULL;
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ p2 = NULL;
+ ok = 1;
+ GNUNET_SCHEDULER_add_now (&end, NULL );
+ }
}
else if (0
== strcmp (test_name, "test_transport_blacklisting_inbound_bl_plugin"))
{
+ char * cfg_p1 = "test_transport_blacklisting_cfg_peer1.conf";
+ char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_plugin.conf";
+
p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- "test_transport_blacklisting_cfg_peer1.conf", 1, NULL, NULL, NULL,
+ cfg_p1, 1, NULL, NULL, NULL,
&start_cb, NULL );
p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- "test_transport_blacklisting_cfg_blp_peer2_plugin.conf", 2, NULL,
- NULL, NULL, &start_cb, NULL );
+ cfg_p2, 2, NULL, NULL,
+ NULL, &start_cb, NULL );
+
+ /* check if configuration contain correct blacklist entries */
+ if ((GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id))
)
+ {
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ p1 = NULL;
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ p2 = NULL;
+ ok = 1;
+ GNUNET_SCHEDULER_add_now (&end, NULL );
+ }
+
}
else if (0
== strcmp (test_name, "test_transport_blacklisting_multiple_plugins"))
{
+ char * cfg_p1 =
"test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf";
+ char * cfg_p2 =
"test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf";
+
p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- "test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf", 1,
+ cfg_p1, 1,
NULL, NULL, NULL, &start_cb, NULL );
p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- "test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf", 2,
+ cfg_p2, 2,
NULL, NULL, NULL, &start_cb, NULL );
+
+ /* check if configuration contain correct blacklist entries */
+ if ((GNUNET_SYSERR == check_blacklist_config (cfg_p1, &p1->id, &p2->id))
||
+ (GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id)))
+ {
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ p1 = NULL;
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ p2 = NULL;
+ ok = 1;
+ GNUNET_SCHEDULER_add_now (&end, NULL );
+ }
}
else
{
@@ -311,8 +417,7 @@
(GNUNET_YES == connected) ? "CONNECTED" : "NOT CONNECTED");
if ((0 == strcmp (test_name, "test_transport_blacklisting_no_bl"))
- || (0
- == strcmp (test_name,
"test_transport_blacklisting_multiple_plugins")))
+ || (0 == strcmp (test_name,
"test_transport_blacklisting_multiple_plugins")))
{
if ((GNUNET_NO != started) && (GNUNET_YES == connected))
ok = 0;
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
2014-06-23 08:20:01 UTC (rev 33766)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
2014-06-23 08:55:30 UTC (rev 33767)
@@ -29,8 +29,8 @@
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
PLUGINS = tcp
+#Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG
+#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
+
[transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG]
-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 =
-
-#Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG
-#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
\ No newline at end of file
+DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 =
\ No newline at end of file
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
===================================================================
---
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
2014-06-23 08:20:01 UTC (rev 33766)
+++
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
2014-06-23 08:55:30 UTC (rev 33767)
@@ -29,6 +29,9 @@
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
PLUGINS = tcp udp
-[transport-blacklist-6ULBJK6QQJ64FAG9DF0292AS5IA9CCAC04IQU0HF8THM635HMBBG]
-DJ5SVJJDHH06BH1H0DE0V8CMBQG9AD8M85PF02SS3285AQ3R0R50 = tcp
+#Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG
+#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
+
+[transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG]
+DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp
\ No newline at end of file
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
2014-06-23 08:20:01 UTC (rev 33766)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
2014-06-23 08:55:30 UTC (rev 33767)
@@ -29,6 +29,9 @@
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
PLUGINS = tcp
-[transport-blacklist-6ULBJK6QQJ64FAG9DF0292AS5IA9CCAC04IQU0HF8THM635HMBBG]
-DJ5SVJJDHH06BH1H0DE0V8CMBQG9AD8M85PF02SS3285AQ3R0R50 = tcp
+#Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG
+#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
+
+[transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG]
+DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp
\ No newline at end of file
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
===================================================================
---
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
2014-06-23 08:20:01 UTC (rev 33766)
+++
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
2014-06-23 08:55:30 UTC (rev 33767)
@@ -29,5 +29,8 @@
PLUGINS = tcp udp
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-[transport-blacklist-DJ5SVJJDHH06BH1H0DE0V8CMBQG9AD8M85PF02SS3285AQ3R0R50]
-6ULBJK6QQJ64FAG9DF0292AS5IA9CCAC04IQU0HF8THM635HMBBG = tcp
\ No newline at end of file
+#Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG
+#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
+
+[transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50]
+6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp
\ No newline at end of file
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
2014-06-23 08:20:01 UTC (rev 33766)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
2014-06-23 08:55:30 UTC (rev 33767)
@@ -29,5 +29,8 @@
PLUGINS = tcp
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-[transport-blacklist-DJ5SVJJDHH06BH1H0DE0V8CMBQG9AD8M85PF02SS3285AQ3R0R50]
-6ULBJK6QQJ64FAG9DF0292AS5IA9CCAC04IQU0HF8THM635HMBBG = tcp
\ No newline at end of file
+#Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG
+#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
+
+[transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50]
+6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33767 - gnunet/src/transport,
gnunet <=