diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-10-05 15:09:28 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-10-05 15:09:28 +0200 |
commit | c4e9ba925ffd758aaa3feee2ccfc0b76f26fe207 (patch) | |
tree | cac3ce030d77b4cbe7c7dc62ed58cfe6d24f73e1 /src/transport/test_transport_api_blacklisting.c | |
parent | fbb71d527c7d6babf269a8fefce1db291b9f7068 (diff) | |
download | gnunet-c4e9ba925ffd758aaa3feee2ccfc0b76f26fe207.tar.gz gnunet-c4e9ba925ffd758aaa3feee2ccfc0b76f26fe207.zip |
global reindent, now with uncrustify hook enabled
Diffstat (limited to 'src/transport/test_transport_api_blacklisting.c')
-rw-r--r-- | src/transport/test_transport_api_blacklisting.c | 165 |
1 files changed, 83 insertions, 82 deletions
diff --git a/src/transport/test_transport_api_blacklisting.c b/src/transport/test_transport_api_blacklisting.c index 6cf5b251b..2ba88a863 100644 --- a/src/transport/test_transport_api_blacklisting.c +++ b/src/transport/test_transport_api_blacklisting.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "gnunet_transport_service.h" | 28 | #include "gnunet_transport_service.h" |
29 | #include "transport-testing.h" | 29 | #include "transport-testing.h" |
30 | 30 | ||
31 | #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30) | 31 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) |
32 | 32 | ||
33 | static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc; | 33 | static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc; |
34 | 34 | ||
@@ -46,135 +46,136 @@ static struct GNUNET_SCHEDULER_Task *shutdown_task; | |||
46 | 46 | ||
47 | 47 | ||
48 | static void | 48 | static void |
49 | end(void *cls) | 49 | end (void *cls) |
50 | { | 50 | { |
51 | shutdown_task = NULL; | 51 | shutdown_task = NULL; |
52 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | 52 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
53 | "Stopping\n"); | 53 | "Stopping\n"); |
54 | if ((GNUNET_YES == blacklist_request_p1) && | 54 | if ((GNUNET_YES == blacklist_request_p1) && |
55 | (GNUNET_YES == blacklist_request_p2) && | 55 | (GNUNET_YES == blacklist_request_p2) && |
56 | (GNUNET_NO == connected)) | 56 | (GNUNET_NO == connected)) |
57 | { | 57 | { |
58 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | 58 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
59 | "Peers were never connected, success\n"); | 59 | "Peers were never connected, success\n"); |
60 | ccc->global_ret = GNUNET_OK; | 60 | ccc->global_ret = GNUNET_OK; |
61 | } | 61 | } |
62 | else | 62 | else |
63 | { | 63 | { |
64 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, | 64 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
65 | "Peers were not connected, fail\n"); | 65 | "Peers were not connected, fail\n"); |
66 | ccc->global_ret = GNUNET_SYSERR; | 66 | ccc->global_ret = GNUNET_SYSERR; |
67 | } | 67 | } |
68 | GNUNET_SCHEDULER_shutdown(); | 68 | GNUNET_SCHEDULER_shutdown (); |
69 | } | 69 | } |
70 | 70 | ||
71 | 71 | ||
72 | static void | 72 | static void |
73 | custom_shutdown(void *cls) | 73 | custom_shutdown (void *cls) |
74 | { | 74 | { |
75 | if (NULL != shutdown_task) | 75 | if (NULL != shutdown_task) |
76 | { | 76 | { |
77 | GNUNET_SCHEDULER_cancel(shutdown_task); | 77 | GNUNET_SCHEDULER_cancel (shutdown_task); |
78 | shutdown_task = NULL; | 78 | shutdown_task = NULL; |
79 | } | 79 | } |
80 | if (NULL != blacklist_p1) | 80 | if (NULL != blacklist_p1) |
81 | { | 81 | { |
82 | GNUNET_TRANSPORT_blacklist_cancel(blacklist_p1); | 82 | GNUNET_TRANSPORT_blacklist_cancel (blacklist_p1); |
83 | blacklist_p1 = NULL; | 83 | blacklist_p1 = NULL; |
84 | } | 84 | } |
85 | if (NULL != blacklist_p2) | 85 | if (NULL != blacklist_p2) |
86 | { | 86 | { |
87 | GNUNET_TRANSPORT_blacklist_cancel(blacklist_p2); | 87 | GNUNET_TRANSPORT_blacklist_cancel (blacklist_p2); |
88 | blacklist_p2 = NULL; | 88 | blacklist_p2 = NULL; |
89 | } | 89 | } |
90 | } | 90 | } |
91 | 91 | ||
92 | 92 | ||
93 | static void | 93 | static void |
94 | notify_receive(void *cls, | 94 | notify_receive (void *cls, |
95 | struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver, | 95 | struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver, |
96 | const struct GNUNET_PeerIdentity *sender, | 96 | const struct GNUNET_PeerIdentity *sender, |
97 | const struct GNUNET_TRANSPORT_TESTING_TestMessage *message) | 97 | const struct GNUNET_TRANSPORT_TESTING_TestMessage *message) |
98 | { | 98 | { |
99 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, | 99 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
100 | "Unexpectedly even received the message despite blacklist\n"); | 100 | "Unexpectedly even received the message despite blacklist\n"); |
101 | connected = GNUNET_YES; | 101 | connected = GNUNET_YES; |
102 | GNUNET_SCHEDULER_cancel(shutdown_task); | 102 | GNUNET_SCHEDULER_cancel (shutdown_task); |
103 | end(NULL); | 103 | end (NULL); |
104 | } | 104 | } |
105 | 105 | ||
106 | 106 | ||
107 | static void | 107 | static void |
108 | notify_connect(void *cls, | 108 | notify_connect (void *cls, |
109 | struct GNUNET_TRANSPORT_TESTING_PeerContext *me, | 109 | struct GNUNET_TRANSPORT_TESTING_PeerContext *me, |
110 | const struct GNUNET_PeerIdentity *other) | 110 | const struct GNUNET_PeerIdentity *other) |
111 | { | 111 | { |
112 | GNUNET_TRANSPORT_TESTING_log_connect(cls, | 112 | GNUNET_TRANSPORT_TESTING_log_connect (cls, |
113 | me, | 113 | me, |
114 | other); | 114 | other); |
115 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, | 115 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
116 | "Peers connected despite blacklist!\n"); | 116 | "Peers connected despite blacklist!\n"); |
117 | connected = GNUNET_YES; /* this test now failed */ | 117 | connected = GNUNET_YES; /* this test now failed */ |
118 | GNUNET_SCHEDULER_cancel(shutdown_task); | 118 | GNUNET_SCHEDULER_cancel (shutdown_task); |
119 | end(NULL); | 119 | end (NULL); |
120 | } | 120 | } |
121 | 121 | ||
122 | 122 | ||
123 | static int | 123 | static int |
124 | blacklist_cb(void *cls, | 124 | blacklist_cb (void *cls, |
125 | const struct GNUNET_PeerIdentity *pid) | 125 | const struct GNUNET_PeerIdentity *pid) |
126 | { | 126 | { |
127 | struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; | 127 | struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls; |
128 | int res = GNUNET_SYSERR; | 128 | int res = GNUNET_SYSERR; |
129 | 129 | ||
130 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | 130 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
131 | "Peer %u: Blacklist request for peer `%s'\n", | 131 | "Peer %u: Blacklist request for peer `%s'\n", |
132 | p->no, | 132 | p->no, |
133 | GNUNET_i2s(pid)); | 133 | GNUNET_i2s (pid)); |
134 | 134 | ||
135 | if (p == ccc->p[0]) | 135 | if (p == ccc->p[0]) |
136 | { | 136 | { |
137 | blacklist_request_p1 = GNUNET_YES; | 137 | blacklist_request_p1 = GNUNET_YES; |
138 | res = GNUNET_OK; | 138 | res = GNUNET_OK; |
139 | } | 139 | } |
140 | if (p == ccc->p[1]) | 140 | if (p == ccc->p[1]) |
141 | { | 141 | { |
142 | blacklist_request_p2 = GNUNET_YES; | 142 | blacklist_request_p2 = GNUNET_YES; |
143 | res = GNUNET_SYSERR; | 143 | res = GNUNET_SYSERR; |
144 | } | 144 | } |
145 | 145 | ||
146 | if ((GNUNET_YES == blacklist_request_p2) && | 146 | if ((GNUNET_YES == blacklist_request_p2) && |
147 | (GNUNET_YES == blacklist_request_p1) && | 147 | (GNUNET_YES == blacklist_request_p1) && |
148 | (NULL == shutdown_task)) | 148 | (NULL == shutdown_task)) |
149 | { | 149 | { |
150 | shutdown_task | 150 | shutdown_task |
151 | = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3), | 151 | = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply ( |
152 | &end, | 152 | GNUNET_TIME_UNIT_SECONDS, 3), |
153 | NULL); | 153 | &end, |
154 | } | 154 | NULL); |
155 | } | ||
155 | return res; | 156 | return res; |
156 | } | 157 | } |
157 | 158 | ||
158 | 159 | ||
159 | static void | 160 | static void |
160 | start_blacklist(void *cls) | 161 | start_blacklist (void *cls) |
161 | { | 162 | { |
162 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | 163 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
163 | "Starting blacklists\n"); | 164 | "Starting blacklists\n"); |
164 | blacklist_p1 = GNUNET_TRANSPORT_blacklist(ccc->p[0]->cfg, | 165 | blacklist_p1 = GNUNET_TRANSPORT_blacklist (ccc->p[0]->cfg, |
165 | &blacklist_cb, | 166 | &blacklist_cb, |
166 | ccc->p[0]); | 167 | ccc->p[0]); |
167 | GNUNET_assert(NULL != blacklist_p1); | 168 | GNUNET_assert (NULL != blacklist_p1); |
168 | blacklist_p2 = GNUNET_TRANSPORT_blacklist(ccc->p[1]->cfg, | 169 | blacklist_p2 = GNUNET_TRANSPORT_blacklist (ccc->p[1]->cfg, |
169 | &blacklist_cb, | 170 | &blacklist_cb, |
170 | ccc->p[1]); | 171 | ccc->p[1]); |
171 | GNUNET_assert(NULL != blacklist_p2); | 172 | GNUNET_assert (NULL != blacklist_p2); |
172 | } | 173 | } |
173 | 174 | ||
174 | 175 | ||
175 | int | 176 | int |
176 | main(int argc, | 177 | main (int argc, |
177 | char *argv[]) | 178 | char *argv[]) |
178 | { | 179 | { |
179 | struct GNUNET_TRANSPORT_TESTING_SendClosure sc = { | 180 | struct GNUNET_TRANSPORT_TESTING_SendClosure sc = { |
180 | .num_messages = 1 | 181 | .num_messages = 1 |
@@ -194,9 +195,9 @@ main(int argc, | |||
194 | 195 | ||
195 | ccc = &my_ccc; | 196 | ccc = &my_ccc; |
196 | if (GNUNET_OK != | 197 | if (GNUNET_OK != |
197 | GNUNET_TRANSPORT_TESTING_main(2, | 198 | GNUNET_TRANSPORT_TESTING_main (2, |
198 | &GNUNET_TRANSPORT_TESTING_connect_check, | 199 | &GNUNET_TRANSPORT_TESTING_connect_check, |
199 | ccc)) | 200 | ccc)) |
200 | return 1; | 201 | return 1; |
201 | return 0; | 202 | return 0; |
202 | } | 203 | } |