diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-14 13:51:27 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-14 13:51:27 +0000 |
commit | c2882d0223530d1f2ac84f9675f23bda11270d08 (patch) | |
tree | 77c5a7973735a93e58e482d1a21ecd62bf6d08bf /src/fs/test_fs_publish_persistence.c | |
parent | e5ba359af49fac05185f5ec0b4dbb47c7060167a (diff) | |
download | gnunet-c2882d0223530d1f2ac84f9675f23bda11270d08.tar.gz gnunet-c2882d0223530d1f2ac84f9675f23bda11270d08.zip |
-fixing #3034
Diffstat (limited to 'src/fs/test_fs_publish_persistence.c')
-rw-r--r-- | src/fs/test_fs_publish_persistence.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c index 1dc8c43aa..e3bbc77a1 100644 --- a/src/fs/test_fs_publish_persistence.c +++ b/src/fs/test_fs_publish_persistence.c | |||
@@ -93,8 +93,10 @@ restart_fs_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
93 | { | 93 | { |
94 | rtask = GNUNET_SCHEDULER_NO_TASK; | 94 | rtask = GNUNET_SCHEDULER_NO_TASK; |
95 | GNUNET_FS_stop (fs); | 95 | GNUNET_FS_stop (fs); |
96 | fs = GNUNET_FS_start (cfg, "test-fs-publish-persistence", &progress_cb, NULL, | 96 | fs = GNUNET_FS_start (cfg, "test-fs-publish-persistence", |
97 | GNUNET_FS_FLAGS_PERSISTENCE, GNUNET_FS_OPTIONS_END); | 97 | &progress_cb, NULL, |
98 | GNUNET_FS_FLAGS_PERSISTENCE, | ||
99 | GNUNET_FS_OPTIONS_END); | ||
98 | } | 100 | } |
99 | 101 | ||
100 | 102 | ||
@@ -123,7 +125,8 @@ consider_restart (int ev) | |||
123 | 125 | ||
124 | 126 | ||
125 | static void * | 127 | static void * |
126 | progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | 128 | progress_cb (void *cls, |
129 | const struct GNUNET_FS_ProgressInfo *event) | ||
127 | { | 130 | { |
128 | void *ret; | 131 | void *ret; |
129 | 132 | ||
@@ -138,7 +141,8 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
138 | (1 + | 141 | (1 + |
139 | GNUNET_TIME_absolute_get_duration | 142 | GNUNET_TIME_absolute_get_duration |
140 | (start).rel_value_us) / 1024)); | 143 | (start).rel_value_us) / 1024)); |
141 | if (0 == strcmp ("publish-context-dir", event->value.publish.cctx)) | 144 | if ( (NULL != event->value.publish.cctx) && |
145 | (0 == strcmp ("publish-context-dir", event->value.publish.cctx)) ) | ||
142 | GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL); | 146 | GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL); |
143 | break; | 147 | break; |
144 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: | 148 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: |
@@ -206,7 +210,8 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
206 | break; | 210 | break; |
207 | case GNUNET_FS_STATUS_PUBLISH_STOPPED: | 211 | case GNUNET_FS_STATUS_PUBLISH_STOPPED: |
208 | consider_restart (event->status); | 212 | consider_restart (event->status); |
209 | if (0 == strcmp ("publish-context-dir", event->value.publish.cctx)) | 213 | if ( (NULL != event->value.publish.cctx) && |
214 | (0 == strcmp ("publish-context-dir", event->value.publish.cctx)) ) | ||
210 | GNUNET_assert (publish == event->value.publish.pc); | 215 | GNUNET_assert (publish == event->value.publish.pc); |
211 | break; | 216 | break; |
212 | default: | 217 | default: |