diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-03-28 12:21:29 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-03-28 12:21:29 +0000 |
commit | 9e825dbbe49d3e856a0a79fc8b75b7da65c993e9 (patch) | |
tree | d592d0b34af1c6733973e543a7c93c2091952e6b /src/dv | |
parent | 03daaebff579d25715c3db30e5076f5ae87bca9e (diff) | |
download | gnunet-9e825dbbe49d3e856a0a79fc8b75b7da65c993e9.tar.gz gnunet-9e825dbbe49d3e856a0a79fc8b75b7da65c993e9.zip |
-adding blacklist test to check that as well
Diffstat (limited to 'src/dv')
-rw-r--r-- | src/dv/Makefile.am | 20 | ||||
-rw-r--r-- | src/dv/test_transport_blacklist.c | 63 | ||||
-rw-r--r-- | src/dv/test_transport_blacklist_data.conf | 68 | ||||
-rw-r--r-- | src/dv/test_transport_dv.c (renamed from src/dv/test_transport_api_dv.c) | 4 | ||||
-rw-r--r-- | src/dv/test_transport_dv_data.conf | 1 |
5 files changed, 148 insertions, 8 deletions
diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am index 52872f574..fecff08a7 100644 --- a/src/dv/Makefile.am +++ b/src/dv/Makefile.am | |||
@@ -66,21 +66,31 @@ libgnunet_plugin_transport_dv_la_DEPENDENCIES = \ | |||
66 | libgnunetdv.la | 66 | libgnunetdv.la |
67 | 67 | ||
68 | check_PROGRAMS = \ | 68 | check_PROGRAMS = \ |
69 | test_transport_api_dv | 69 | test_transport_blacklist \ |
70 | test_transport_dv | ||
70 | 71 | ||
71 | 72 | ||
72 | if ENABLE_TEST_RUN | 73 | if ENABLE_TEST_RUN |
73 | TESTS = $(check_PROGRAMS) | 74 | TESTS = $(check_PROGRAMS) |
74 | endif | 75 | endif |
75 | 76 | ||
76 | test_transport_api_dv_SOURCES = \ | 77 | test_transport_dv_SOURCES = \ |
77 | test_transport_api_dv.c | 78 | test_transport_dv.c |
78 | test_transport_api_dv_LDADD = \ | 79 | test_transport_dv_LDADD = \ |
80 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
81 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
82 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
83 | $(top_builddir)/src/util/libgnunetutil.la | ||
84 | |||
85 | test_transport_blacklist_SOURCES = \ | ||
86 | test_transport_blacklist.c | ||
87 | test_transport_blacklist_LDADD = \ | ||
79 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 88 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
80 | $(top_builddir)/src/core/libgnunetcore.la \ | 89 | $(top_builddir)/src/core/libgnunetcore.la \ |
81 | $(top_builddir)/src/transport/libgnunettransport.la \ | 90 | $(top_builddir)/src/transport/libgnunettransport.la \ |
82 | $(top_builddir)/src/util/libgnunetutil.la | 91 | $(top_builddir)/src/util/libgnunetutil.la |
83 | 92 | ||
84 | EXTRA_DIST = \ | 93 | EXTRA_DIST = \ |
85 | test_transport_dv_data.conf | 94 | test_transport_dv_data.conf \ |
95 | test_transport_blacklist_data.conf | ||
86 | 96 | ||
diff --git a/src/dv/test_transport_blacklist.c b/src/dv/test_transport_blacklist.c new file mode 100644 index 000000000..1eaf95f05 --- /dev/null +++ b/src/dv/test_transport_blacklist.c | |||
@@ -0,0 +1,63 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet. | ||
3 | (C) 2009, 2013 Christian Grothoff (and other contributing authors) | ||
4 | |||
5 | GNUnet is free software; you can redistribute it and/or modify | ||
6 | it under the terms of the GNU General Public License as published | ||
7 | by the Free Software Foundation; either version 3, or (at your | ||
8 | option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU General Public License | ||
16 | along with GNUnet; see the file COPYING. If not, write to the | ||
17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
18 | Boston, MA 02111-1307, USA. | ||
19 | */ | ||
20 | /** | ||
21 | * @file dv/test_transport_blacklist.c | ||
22 | * @brief base testcase for testing blacklist | ||
23 | */ | ||
24 | #include "platform.h" | ||
25 | #include "gnunet_core_service.h" | ||
26 | #include "gnunet_testbed_service.h" | ||
27 | |||
28 | /** | ||
29 | * Return value from main, set to 0 on success. | ||
30 | */ | ||
31 | static int ok; | ||
32 | |||
33 | |||
34 | static void | ||
35 | test_connection (void *cls, | ||
36 | unsigned int num_peers, | ||
37 | struct GNUNET_TESTBED_Peer **peers) | ||
38 | { | ||
39 | if (4 != num_peers) | ||
40 | { | ||
41 | ok = 0; | ||
42 | } | ||
43 | else | ||
44 | { | ||
45 | fprintf (stderr, "Testbed connect peers despite blacklist!\n"); | ||
46 | } | ||
47 | GNUNET_SCHEDULER_shutdown (); | ||
48 | } | ||
49 | |||
50 | |||
51 | int | ||
52 | main (int argc, char *argv[]) | ||
53 | { | ||
54 | ok = 1; | ||
55 | (void) GNUNET_TESTBED_test_run ("test-transport-blacklist", | ||
56 | "test_transport_blacklist_data.conf", | ||
57 | 4, | ||
58 | 0, NULL, NULL, | ||
59 | &test_connection, NULL); | ||
60 | return ok; | ||
61 | } | ||
62 | |||
63 | /* end of test_transport_blacklist.c */ | ||
diff --git a/src/dv/test_transport_blacklist_data.conf b/src/dv/test_transport_blacklist_data.conf new file mode 100644 index 000000000..2c7829b67 --- /dev/null +++ b/src/dv/test_transport_blacklist_data.conf | |||
@@ -0,0 +1,68 @@ | |||
1 | [PATHS] | ||
2 | SERVICEHOME = /tmp/test-gnunet-dv-testing/ | ||
3 | |||
4 | [transport] | ||
5 | PORT = 2565 | ||
6 | PLUGINS = tcp | ||
7 | |||
8 | [arm] | ||
9 | DEFAULTSERVICES = core | ||
10 | |||
11 | [dv] | ||
12 | AUTOSTART = YES | ||
13 | #PREFIX = valgrind | ||
14 | |||
15 | [consensus] | ||
16 | PREFIX = valgrind | ||
17 | |||
18 | [testbed] | ||
19 | OVERLAY_TOPOLOGY = CLIQUE | ||
20 | |||
21 | [fs] | ||
22 | AUTOSTART = NO | ||
23 | |||
24 | [datastore] | ||
25 | AUTOSTART = NO | ||
26 | |||
27 | [dns] | ||
28 | AUTOSTART = NO | ||
29 | |||
30 | [nse] | ||
31 | AUTOSTART = NO | ||
32 | |||
33 | [chat] | ||
34 | AUTOSTART = NO | ||
35 | |||
36 | [gns] | ||
37 | AUTOSTART = NO | ||
38 | |||
39 | [vpn] | ||
40 | AUTOSTART = NO | ||
41 | |||
42 | [namestore] | ||
43 | AUTOSTART = NO | ||
44 | |||
45 | [lockmanager] | ||
46 | AUTOSTART = NO | ||
47 | |||
48 | # Topology: | ||
49 | # 5M-HT | ||
50 | # HT-P5 | ||
51 | # HT-AG | ||
52 | # 5M-P5 | ||
53 | # 5M-AG | ||
54 | # Disallowed: P5-AG => needs DV! | ||
55 | |||
56 | [transport-blacklist-HT3HI3HOVEI05OQANEDN3OELVO8LPS6DDGVI612TKMH0TA1R06NGB197LS0HGSIA4BQVBA93S6PCU4M70NN6GSLLML6ADI2CV5KIIE0] | ||
57 | |||
58 | [transport-blacklist-P565723JO1C2HSN6J29TAQ22MN6CI8HTMUU55T0FUQG4CMDGGEQ8UCNBKUMB94GC8R9G4FB2SF9LDOBAJ6AMINBP4JHHDD6L7VD801G] | ||
59 | # forbid P565 to talk to AG2P via TCP to force DV @ distance 2 | ||
60 | AG2PHES1BARB9IJCPAMJTFPVJ5V3A72S3F2A8SBUB8DAQ2V0O3V8G6G2JU56FHGFOHMQVKBSQFV98TCGTC3RJ1NINP82G0RC00N1520 = tcp | ||
61 | |||
62 | [transport-blacklist-AG2PHES1BARB9IJCPAMJTFPVJ5V3A72S3F2A8SBUB8DAQ2V0O3V8G6G2JU56FHGFOHMQVKBSQFV98TCGTC3RJ1NINP82G0RC00N1520] | ||
63 | |||
64 | # forbid P565 to talk to AG2P via TCP to force DV @ distance 2 (again, just to be sure) | ||
65 | P565723JO1C2HSN6J29TAQ22MN6CI8HTMUU55T0FUQG4CMDGGEQ8UCNBKUMB94GC8R9G4FB2SF9LDOBAJ6AMINBP4JHHDD6L7VD801G = tcp | ||
66 | |||
67 | [transport-blacklist-5MBMI6V7A8UFH0BD965HNNAQEDBIQRCC4LDNT9Q7KMEAQU00VEJFEQKDU4KCL9E64ACCRO0PJ1C689K765NCAHFUVSV99Q15KPK1RRO] | ||
68 | |||
diff --git a/src/dv/test_transport_api_dv.c b/src/dv/test_transport_dv.c index 260b663f5..b36831693 100644 --- a/src/dv/test_transport_api_dv.c +++ b/src/dv/test_transport_dv.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | (C) 2009 Christian Grothoff (and other contributing authors) | 3 | (C) 2009, 2013 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file dv/test_transport_api_dv.c | 21 | * @file dv/test_transport_dv.c |
22 | * @brief base testcase for testing distance vector transport | 22 | * @brief base testcase for testing distance vector transport |
23 | */ | 23 | */ |
24 | #include "platform.h" | 24 | #include "platform.h" |
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf index c8efa9b43..59243ba06 100644 --- a/src/dv/test_transport_dv_data.conf +++ b/src/dv/test_transport_dv_data.conf | |||
@@ -4,7 +4,6 @@ SERVICEHOME = /tmp/test-gnunet-dv-testing/ | |||
4 | [transport] | 4 | [transport] |
5 | PORT = 2565 | 5 | PORT = 2565 |
6 | PLUGINS = tcp dv | 6 | PLUGINS = tcp dv |
7 | BLACKLIST_FILE = $SERVICEHOME/blacklist | ||
8 | 7 | ||
9 | [arm] | 8 | [arm] |
10 | DEFAULTSERVICES = core | 9 | DEFAULTSERVICES = core |