sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

libcli: Make smb2cli_notify_send cancellable

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2018-11-16 19:01:57 +01:00
parent 9c9ccf2349
commit 499d97b38c
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libcli/smb/smb2cli_notify.c
View File

@ -32,10 +32,12 @@ struct smb2cli_notify_state {
uint32_t data_length; uint32_t data_length;
struct tevent_req *subreq; struct tevent_req *subreq;
struct tevent_req *timeout_subreq;
}; };
static void smb2cli_notify_done(struct tevent_req *subreq); static void smb2cli_notify_done(struct tevent_req *subreq);
static void smb2cli_notify_timedout(struct tevent_req *subreq); static void smb2cli_notify_timedout(struct tevent_req *subreq);
static bool smb2cli_notify_cancel(struct tevent_req *req);
struct tevent_req *smb2cli_notify_send(TALLOC_CTX *mem_ctx, struct tevent_req *smb2cli_notify_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev, struct tevent_context *ev,
@ -49,7 +51,7 @@ struct tevent_req *smb2cli_notify_send(TALLOC_CTX *mem_ctx,
uint32_t completion_filter, uint32_t completion_filter,
bool recursive) bool recursive)
{ {
struct tevent_req *req, *subreq; struct tevent_req *req;
struct smb2cli_notify_state *state; struct smb2cli_notify_state *state;
uint8_t *fixed; uint8_t *fixed;
uint16_t watch_tree; uint16_t watch_tree;
@ -83,16 +85,33 @@ struct tevent_req *smb2cli_notify_send(TALLOC_CTX *mem_ctx,
} }
tevent_req_set_callback(state->subreq, smb2cli_notify_done, req); tevent_req_set_callback(state->subreq, smb2cli_notify_done, req);
subreq = tevent_wakeup_send(state, ev, if (timeout_msec != 0) {
timeval_current_ofs_msec(timeout_msec)); state->timeout_subreq = tevent_wakeup_send(
if (tevent_req_nomem(subreq, req)) { state, ev, timeval_current_ofs_msec(timeout_msec));
return tevent_req_post(req, ev); if (tevent_req_nomem(state->timeout_subreq, req)) {
return tevent_req_post(req, ev);
}
tevent_req_set_callback(
state->timeout_subreq, smb2cli_notify_timedout, req);
} }
tevent_req_set_callback(subreq, smb2cli_notify_timedout, req);
tevent_req_set_cancel_fn(req, smb2cli_notify_cancel);
return req; return req;
} }
static bool smb2cli_notify_cancel(struct tevent_req *req)
{
struct smb2cli_notify_state *state = tevent_req_data(
req, struct smb2cli_notify_state);
bool ok;
TALLOC_FREE(state->timeout_subreq);
ok = tevent_req_cancel(state->subreq);
return ok;
}
static void smb2cli_notify_timedout(struct tevent_req *subreq) static void smb2cli_notify_timedout(struct tevent_req *subreq)
{ {
struct tevent_req *req = tevent_req_callback_data( struct tevent_req *req = tevent_req_callback_data(