diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-09-01 13:19:43 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-09-01 13:19:43 +0000 |
commit | 05186db103486d199c2dc9357264a265e9c33117 (patch) | |
tree | f0fba3bc564c59e9ef13de8fe44aa2181268c179 /src/dht/test_dhtlog.c | |
parent | c34548d2d6629269e689a9b2685df7e375a9c7a8 (diff) | |
download | gnunet-05186db103486d199c2dc9357264a265e9c33117.tar.gz gnunet-05186db103486d199c2dc9357264a265e9c33117.zip |
klocwork fixes, dht routing changes (hopefully fixes)
Diffstat (limited to 'src/dht/test_dhtlog.c')
-rw-r--r-- | src/dht/test_dhtlog.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/dht/test_dhtlog.c b/src/dht/test_dhtlog.c index 1fef8857e..c2c5ccf72 100644 --- a/src/dht/test_dhtlog.c +++ b/src/dht/test_dhtlog.c | |||
@@ -72,37 +72,52 @@ test (struct GNUNET_DHTLOG_Handle * api) | |||
72 | ret = api->insert_topology(500); | 72 | ret = api->insert_topology(500); |
73 | CHECK(ret); | 73 | CHECK(ret); |
74 | ret = api->insert_node (&nodeuid, &p1); | 74 | ret = api->insert_node (&nodeuid, &p1); |
75 | CHECK(ret); | ||
75 | ret = api->insert_node (&nodeuid, &p2); | 76 | ret = api->insert_node (&nodeuid, &p2); |
77 | CHECK(ret); | ||
76 | ret = api->insert_node (&nodeuid, &p3); | 78 | ret = api->insert_node (&nodeuid, &p3); |
79 | CHECK(ret); | ||
77 | ret = api->insert_node (&nodeuid, &p4); | 80 | ret = api->insert_node (&nodeuid, &p4); |
81 | CHECK(ret); | ||
78 | ret = api->set_malicious(&p1); | 82 | ret = api->set_malicious(&p1); |
79 | CHECK(ret); | 83 | CHECK(ret); |
80 | ret = api->insert_topology(0); | 84 | ret = api->insert_topology(0); |
85 | CHECK(ret); | ||
81 | ret = api->insert_extended_topology(&p1, &p2); | 86 | ret = api->insert_extended_topology(&p1, &p2); |
87 | CHECK(ret); | ||
82 | ret = api->insert_extended_topology(&p3, &p4); | 88 | ret = api->insert_extended_topology(&p3, &p4); |
89 | CHECK(ret); | ||
83 | ret = api->update_topology(101); | 90 | ret = api->update_topology(101); |
84 | CHECK(ret); | 91 | CHECK(ret); |
85 | ret = api->insert_dhtkey (&dhtkeyuid, &k1); | 92 | ret = api->insert_dhtkey (&dhtkeyuid, &k1); |
93 | CHECK(ret); | ||
86 | ret = api->insert_dhtkey (&dhtkeyuid, &k2); | 94 | ret = api->insert_dhtkey (&dhtkeyuid, &k2); |
87 | CHECK(ret); | 95 | CHECK(ret); |
88 | ret = api->insert_query (&sqlqueryuid, internaluid, 2, 4, 0, &p2, &k1); | 96 | ret = api->insert_query (&sqlqueryuid, internaluid, 2, 4, 0, &p2, &k1); |
97 | CHECK(ret); | ||
89 | ret = | 98 | ret = |
90 | api->insert_route (&sqlrouteuid, sqlqueryuid, 1, 1, DHTLOG_GET, &p1, &k2, | 99 | api->insert_route (&sqlrouteuid, sqlqueryuid, 1, 1, DHTLOG_GET, &p1, &k2, |
91 | &p4, &p3); | 100 | &p4, &p3); |
101 | CHECK(ret); | ||
92 | ret = | 102 | ret = |
93 | api->insert_route (&sqlrouteuid, sqlqueryuid, 2, 0, DHTLOG_PUT, &p3, &k1, | 103 | api->insert_route (&sqlrouteuid, sqlqueryuid, 2, 0, DHTLOG_PUT, &p3, &k1, |
94 | &p4, &p2); | 104 | &p4, &p2); |
105 | CHECK(ret); | ||
95 | ret = | 106 | ret = |
96 | api->insert_route (&sqlrouteuid, sqlqueryuid, 3, 1, DHTLOG_ROUTE, &p3, &k2, | 107 | api->insert_route (&sqlrouteuid, sqlqueryuid, 3, 1, DHTLOG_ROUTE, &p3, &k2, |
97 | &p2, NULL); | 108 | &p2, NULL); |
109 | CHECK(ret); | ||
98 | ret = | 110 | ret = |
99 | api->insert_route (&sqlrouteuid, sqlqueryuid, 4, 7, DHTLOG_ROUTE, &p3, &k2, | 111 | api->insert_route (&sqlrouteuid, sqlqueryuid, 4, 7, DHTLOG_ROUTE, &p3, &k2, |
100 | NULL, NULL); | 112 | NULL, NULL); |
113 | CHECK(ret); | ||
101 | sleep (1); | 114 | sleep (1); |
102 | ret = api->insert_stat(&p1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17); | 115 | ret = api->insert_stat(&p1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17); |
116 | CHECK(ret); | ||
103 | ret = api->insert_stat(&p2, 12, 23, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27); | 117 | ret = api->insert_stat(&p2, 12, 23, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27); |
104 | CHECK(ret); | 118 | CHECK(ret); |
105 | ret = api->update_trial (trialuid, 787); | 119 | ret = api->update_trial (trialuid, 787); |
120 | CHECK(ret); | ||
106 | ret = api->add_generic_stat (&p2, "nonsense", "section", 77765); | 121 | ret = api->add_generic_stat (&p2, "nonsense", "section", 77765); |
107 | CHECK(ret); | 122 | CHECK(ret); |
108 | return 0; | 123 | return 0; |