Imported Upstream version 4.0.0+dfsg1

[abartlet/samba-debian.git] / source4 / libcli / smb2 / cancel.c

diff --git a/source4/libcli/smb2/cancel.c b/source4/libcli/smb2/cancel.c
index 28ef3099f3028a201b8e85ab7803f48d97b33162..cc40b34a12d9c28df2fa826b56be666d9e61e953 100644 (file)
--- a/source4/libcli/smb2/cancel.c
+++ b/source4/libcli/smb2/cancel.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include <tevent.h>
 #include "libcli/raw/libcliraw.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
@@ -29,49 +30,16 @@
 */
 NTSTATUS smb2_cancel(struct smb2_request *r)
 {
-       NTSTATUS status;
-       struct smb2_request *c;
-       uint32_t old_timeout;
-       uint64_t old_seqnum;
+       bool ok;
 
-       /* 
-        * if we don't get a pending id yet, we just
-        * mark the request for pending, so that we directly
-        * send the cancel after getting the pending id
-        */
-       if (!r->cancel.can_cancel) {
-               r->cancel.do_cancel++;
+       if (r->subreq == NULL) {
                return NT_STATUS_OK;
        }
 
-       /* we don't want a seqmun for a SMB2 Cancel */
-       old_seqnum = r->transport->seqnum;
-       c = smb2_request_init(r->transport, SMB2_OP_CANCEL, 0x04, false, 0);
-       r->transport->seqnum = old_seqnum;
-       NT_STATUS_HAVE_NO_MEMORY(c);
-       c->seqnum = 0;
-
-       SIVAL(c->out.hdr, SMB2_HDR_FLAGS,       0x00000002);
-       SSVAL(c->out.hdr, SMB2_HDR_CREDIT,      0x0030);
-       SBVAL(c->out.hdr, SMB2_HDR_ASYNC_ID,    r->cancel.async_id);
-       SBVAL(c->out.hdr, SMB2_HDR_MESSAGE_ID,  c->seqnum);
-       if (r->session) {
-               SBVAL(c->out.hdr, SMB2_HDR_SESSION_ID,  r->session->uid);
-       }
-
-       SSVAL(c->out.body, 0x02, 0);
-
-       old_timeout = c->transport->options.request_timeout;
-       c->transport->options.request_timeout = 0;
-       smb2_transport_send(c);
-       c->transport->options.request_timeout = old_timeout;
-
-       if (c->state == SMB2_REQUEST_ERROR) {
-               status = c->status;
-       } else {
-               status = NT_STATUS_OK;
+       ok = tevent_req_cancel(r->subreq);
+       if (!ok) {
+               return NT_STATUS_INTERNAL_ERROR;
        }
 
-       talloc_free(c);
-       return status;
+       return NT_STATUS_OK;
 }