diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-03-25 08:49:47 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-03-25 08:49:47 +0000 |
commit | 390a68296dd89f61461bdca02060d36e2e02af2b (patch) | |
tree | 9aa86841d2052cdd4080f6a4e2003313bf9670bf /src/fs/gnunet-service-fs_lc.c | |
parent | 78469082de0b7fa49724504b7e21bb2e9b4bef05 (diff) | |
download | gnunet-390a68296dd89f61461bdca02060d36e2e02af2b.tar.gz gnunet-390a68296dd89f61461bdca02060d36e2e02af2b.zip |
adapt to new API
Diffstat (limited to 'src/fs/gnunet-service-fs_lc.c')
-rw-r--r-- | src/fs/gnunet-service-fs_lc.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/fs/gnunet-service-fs_lc.c b/src/fs/gnunet-service-fs_lc.c index 8727670e8..5ceb7c2a5 100644 --- a/src/fs/gnunet-service-fs_lc.c +++ b/src/fs/gnunet-service-fs_lc.c | |||
@@ -192,17 +192,13 @@ GSF_local_client_lookup_ (struct GNUNET_SERVER_Client *client) | |||
192 | * @param expiration when does 'data' expire? | 192 | * @param expiration when does 'data' expire? |
193 | * @param data response data, NULL on request expiration | 193 | * @param data response data, NULL on request expiration |
194 | * @param data_len number of bytes in data | 194 | * @param data_len number of bytes in data |
195 | * @param more GNUNET_YES if the request remains active (may call | ||
196 | * this function again), GNUNET_NO if the request is | ||
197 | * finished (client must not call GSF_pending_request_cancel_) | ||
198 | */ | 195 | */ |
199 | static void | 196 | static void |
200 | client_response_handler (void *cls, | 197 | client_response_handler (void *cls, |
201 | struct GSF_PendingRequest *pr, | 198 | struct GSF_PendingRequest *pr, |
202 | struct GNUNET_TIME_Absolute expiration, | 199 | struct GNUNET_TIME_Absolute expiration, |
203 | const void *data, | 200 | const void *data, |
204 | size_t data_len, | 201 | size_t data_len) |
205 | int more) | ||
206 | { | 202 | { |
207 | struct ClientRequest *cr = cls; | 203 | struct ClientRequest *cr = cls; |
208 | struct GSF_LocalClient *lc; | 204 | struct GSF_LocalClient *lc; |
@@ -214,7 +210,6 @@ client_response_handler (void *cls, | |||
214 | { | 210 | { |
215 | /* ugh, request 'timed out' -- how can this be? */ | 211 | /* ugh, request 'timed out' -- how can this be? */ |
216 | GNUNET_break (0); | 212 | GNUNET_break (0); |
217 | GNUNET_assert (GNUNET_NO == more); | ||
218 | return; | 213 | return; |
219 | } | 214 | } |
220 | GNUNET_STATISTICS_update (GSF_stats, | 215 | GNUNET_STATISTICS_update (GSF_stats, |
@@ -238,19 +233,6 @@ client_response_handler (void *cls, | |||
238 | GNUNET_h2s (&prd->query), | 233 | GNUNET_h2s (&prd->query), |
239 | (unsigned int) prd->type); | 234 | (unsigned int) prd->type); |
240 | #endif | 235 | #endif |
241 | if (GNUNET_NO == more) | ||
242 | { | ||
243 | GNUNET_CONTAINER_DLL_remove (lc->cr_head, | ||
244 | lc->cr_tail, | ||
245 | cr); | ||
246 | GNUNET_SERVER_receive_done (lc->client, | ||
247 | GNUNET_OK); | ||
248 | GNUNET_STATISTICS_update (GSF_stats, | ||
249 | gettext_noop ("# client searches active"), | ||
250 | - 1, | ||
251 | GNUNET_NO); | ||
252 | GNUNET_free (cr); | ||
253 | } | ||
254 | } | 236 | } |
255 | 237 | ||
256 | 238 | ||