diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-09-14 15:57:36 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-09-14 15:57:36 +0000 |
commit | 91d27e4d260d9cf49f06a9774cd139eb5ad8d565 (patch) | |
tree | 99af3b23b1451c65203f74bb9c0d27ede64a51b5 /src/fs/test_gnunet_service_fs_p2p.c | |
parent | b035fd00cb16ee7c2408c529e67edfb885ae46c1 (diff) | |
download | gnunet-91d27e4d260d9cf49f06a9774cd139eb5ad8d565.tar.gz gnunet-91d27e4d260d9cf49f06a9774cd139eb5ad8d565.zip |
-fixes
Diffstat (limited to 'src/fs/test_gnunet_service_fs_p2p.c')
-rw-r--r-- | src/fs/test_gnunet_service_fs_p2p.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c index df7b9604b..218f16b01 100644 --- a/src/fs/test_gnunet_service_fs_p2p.c +++ b/src/fs/test_gnunet_service_fs_p2p.c | |||
@@ -48,6 +48,8 @@ static int ok; | |||
48 | 48 | ||
49 | static struct GNUNET_TIME_Absolute start_time; | 49 | static struct GNUNET_TIME_Absolute start_time; |
50 | 50 | ||
51 | static struct GNUNET_TESTBED_Operation *op; | ||
52 | |||
51 | 53 | ||
52 | static void | 54 | static void |
53 | do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 55 | do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
@@ -99,9 +101,13 @@ do_download (void *cls, const struct GNUNET_FS_Uri *uri) | |||
99 | 101 | ||
100 | static void | 102 | static void |
101 | do_publish (void *cls, | 103 | do_publish (void *cls, |
102 | struct GNUNET_TESTBED_Operation *op, | 104 | struct GNUNET_TESTBED_Operation *opret, |
103 | const char *emsg) | 105 | const char *emsg) |
104 | { | 106 | { |
107 | GNUNET_assert (op == opret); | ||
108 | GNUNET_TESTBED_operation_done (op); | ||
109 | op = NULL; | ||
110 | |||
105 | if (NULL != emsg) | 111 | if (NULL != emsg) |
106 | { | 112 | { |
107 | GNUNET_SCHEDULER_shutdown (); | 113 | GNUNET_SCHEDULER_shutdown (); |
@@ -130,9 +136,9 @@ do_connect (void *cls, | |||
130 | daemons[i] = peers[i]; | 136 | daemons[i] = peers[i]; |
131 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 137 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
132 | "Daemons started, will now try to connect them\n"); | 138 | "Daemons started, will now try to connect them\n"); |
133 | GNUNET_TESTBED_overlay_connect (NULL, | 139 | op = GNUNET_TESTBED_overlay_connect (NULL, |
134 | &do_publish, NULL, | 140 | &do_publish, NULL, |
135 | daemons[0], daemons[1]); | 141 | daemons[0], daemons[1]); |
136 | } | 142 | } |
137 | 143 | ||
138 | 144 | ||