aboutsummaryrefslogtreecommitdiff
path: root/src/testbed
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-03-17 20:00:42 +0100
committerChristian Grothoff <christian@grothoff.org>2017-03-17 20:00:42 +0100
commit646964ac643b33c6b0fd71bb41023ca654104f4c (patch)
tree99f958a26fd6e1937253c30273e98b1a8cb7b207 /src/testbed
parenta11ff698257f9698552347e2d858b2fa54c97d45 (diff)
downloadgnunet-646964ac643b33c6b0fd71bb41023ca654104f4c.tar.gz
gnunet-646964ac643b33c6b0fd71bb41023ca654104f4c.zip
fix #4957
Diffstat (limited to 'src/testbed')
-rw-r--r--src/testbed/test_gnunet_helper_testbed.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/testbed/test_gnunet_helper_testbed.c b/src/testbed/test_gnunet_helper_testbed.c
index 7a2dce8a5..7ba9e7c31 100644
--- a/src/testbed/test_gnunet_helper_testbed.c
+++ b/src/testbed/test_gnunet_helper_testbed.c
@@ -121,10 +121,12 @@ do_abort (void *cls)
121 * #GNUNET_SYSERR during GNUNET_HELPER_stop() 121 * #GNUNET_SYSERR during GNUNET_HELPER_stop()
122 */ 122 */
123static void 123static void
124cont_cb (void *cls, int result) 124cont_cb (void *cls,
125 int result)
125{ 126{
126 shandle = NULL; 127 shandle = NULL;
127 LOG (GNUNET_ERROR_TYPE_DEBUG, "Message sent\n"); 128 LOG (GNUNET_ERROR_TYPE_DEBUG,
129 "Message sent\n");
128 GNUNET_assert (GNUNET_OK == result); 130 GNUNET_assert (GNUNET_OK == result);
129} 131}
130 132
@@ -138,11 +140,11 @@ cont_cb (void *cls, int result)
138 * @param cls closure 140 * @param cls closure
139 * @param client identification of the client 141 * @param client identification of the client
140 * @param message the actual message 142 * @param message the actual message
141 *
142 * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing 143 * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing
143 */ 144 */
144static int 145static int
145mst_cb (void *cls, void *client, const struct GNUNET_MessageHeader *message) 146mst_cb (void *cls,
147 const struct GNUNET_MessageHeader *message)
146{ 148{
147 const struct GNUNET_TESTBED_HelperReply *msg; 149 const struct GNUNET_TESTBED_HelperReply *msg;
148 char *config; 150 char *config;
@@ -207,8 +209,12 @@ run (void *cls, char *const *args, const char *cfgfile,
207 const char *trusted_ip = "127.0.0.1"; 209 const char *trusted_ip = "127.0.0.1";
208 210
209 helper = 211 helper =
210 GNUNET_HELPER_start (GNUNET_YES, "gnunet-helper-testbed", binary_argv, 212 GNUNET_HELPER_start (GNUNET_YES,
211 &mst_cb, &exp_cb, NULL); 213 "gnunet-helper-testbed",
214 binary_argv,
215 &mst_cb,
216 &exp_cb,
217 NULL);
212 GNUNET_assert (NULL != helper); 218 GNUNET_assert (NULL != helper);
213 cfg = GNUNET_CONFIGURATION_dup (cfg2); 219 cfg = GNUNET_CONFIGURATION_dup (cfg2);
214 msg = GNUNET_TESTBED_create_helper_init_msg_ (trusted_ip, NULL, cfg); 220 msg = GNUNET_TESTBED_create_helper_init_msg_ (trusted_ip, NULL, cfg);