From b48e462f0f542f82db95d9b8613339a9b748808e Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sun, 4 Aug 2019 09:36:49 +0100 Subject: content, hlcache: Propagate query events upward Signed-off-by: Daniel Silverstone --- content/hlcache.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'content/hlcache.c') diff --git a/content/hlcache.c b/content/hlcache.c index c07c5a1a1..92bf690ed 100644 --- a/content/hlcache.c +++ b/content/hlcache.c @@ -519,18 +519,26 @@ static nserror hlcache_llcache_callback(llcache_handle *handle, } break; case LLCACHE_EVENT_QUERY: - if (hlcache->params.llcache.cb != NULL) { - return hlcache->params.llcache.cb( - event->data.query.query, - hlcache->params.llcache.cb_ctx, - event->data.query.cb, - event->data.query.cb_pw); + if (ctx->handle->cb != NULL) { + hlcache_event hlevent; + + hlevent.type = CONTENT_MSG_QUERY; + hlevent.data.query_msg = &event->data.query; + + ctx->handle->cb(ctx->handle, &hlevent, ctx->handle->pw); } else { return NSERROR_NOT_IMPLEMENTED; } break; case LLCACHE_EVENT_QUERY_FINISHED: - /* Currently nothing to do */ + if (ctx->handle->cb != NULL) { + hlcache_event hlevent; + + hlevent.type = CONTENT_MSG_QUERY_FINISHED; + hlevent.data.query_finished_pw = event->data.query.cb_pw; + + ctx->handle->cb(ctx->handle, &hlevent, ctx->handle->pw); + } break; } -- cgit v1.2.3