Changeset 988 for vendor/current/source3/libsmb/clioplock.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/libsmb/clioplock.c (modified) (3 diffs)

vendor/current/source3/libsmb/clioplock.c

@@ -1 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    SMB client oplock functions
    Copyright (C) Andrew Tridgell 2001
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -22 +22 @@
 #include "async_smb.h"
 #include "libsmb/libsmb.h"
+#include "../libcli/smb/smbXcli_base.h"
+
+struct cli_smb_oplock_break_waiter_state {
+        uint16_t fnum;
+        uint8_t level;
+};
+
+static void cli_smb_oplock_break_waiter_done(struct tevent_req *subreq);
+
+struct tevent_req *cli_smb_oplock_break_waiter_send(TALLOC_CTX *mem_ctx,
+                                                    struct tevent_context *ev,
+                                                    struct cli_state *cli)
+{
+        struct tevent_req *req, *subreq;
+        struct cli_smb_oplock_break_waiter_state *state;
+
+        req = tevent_req_create(mem_ctx, &state,
+                                struct cli_smb_oplock_break_waiter_state);
+        if (req == NULL) {
+                return NULL;
+        }
+
+        /*
+         * Create a fake SMB request that we will never send out. This is only
+         * used to be set into the pending queue with the right mid.
+         */
+        subreq = smb1cli_req_create(mem_ctx, ev, cli->conn, 0, 0, 0, 0, 0, 0,
+                                    0, NULL, NULL, 0, NULL, 0, NULL);
+        if (tevent_req_nomem(subreq, req)) {
+                return tevent_req_post(req, ev);
+        }
+        smb1cli_req_set_mid(subreq, 0xffff);
+
+        if (!smbXcli_req_set_pending(subreq)) {
+                tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
+                return tevent_req_post(req, ev);
+        }
+        tevent_req_set_callback(subreq, cli_smb_oplock_break_waiter_done, req);
+        return req;
+}
+
+static void cli_smb_oplock_break_waiter_done(struct tevent_req *subreq)
+{
+        struct tevent_req *req = tevent_req_callback_data(
+                subreq, struct tevent_req);
+        struct cli_smb_oplock_break_waiter_state *state = tevent_req_data(
+                req, struct cli_smb_oplock_break_waiter_state);
+        struct iovec *iov;
+        uint8_t wct;
+        uint16_t *vwv;
+        NTSTATUS status;
+
+        status = smb1cli_req_recv(subreq, state,
+                                  &iov, /* piov */
+                                  NULL, /* phdr */
+                                  &wct,
+                                  &vwv,
+                                  NULL, /* pvwv_offset */
+                                  NULL, /* pnum_bytes */
+                                  NULL, /* pbytes */
+                                  NULL, /* pbytes_offset */
+                                  NULL, /* pinbuf */
+                                  NULL, 0); /* expected */
+        TALLOC_FREE(subreq);
+        if (!NT_STATUS_IS_OK(status)) {
+                tevent_req_nterror(req, status);
+                return;
+        }
+        if (wct < 8) {
+                tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                return;
+        }
+        state->fnum = SVAL(vwv+2, 0);
+        state->level = CVAL(vwv+3, 1);
+        tevent_req_done(req);
+}
+
+NTSTATUS cli_smb_oplock_break_waiter_recv(struct tevent_req *req,
+                                          uint16_t *pfnum,
+                                          uint8_t *plevel)
+{
+        struct cli_smb_oplock_break_waiter_state *state = tevent_req_data(
+                req, struct cli_smb_oplock_break_waiter_state);
+        NTSTATUS status;
+
+        if (tevent_req_is_nterror(req, &status)) {
+                return status;
+        }
+        *pfnum = state->fnum;
+        *plevel = state->level;
+        return NT_STATUS_OK;
+}
 
 /****************************************************************************
@@ -84 +176 @@
 }
 
-NTSTATUS cli_oplock_ack(struct cli_state *cli, uint16_t fnum, unsigned char level)
-{
-        TALLOC_CTX *frame = talloc_stackframe();
-        struct event_context *ev;
-        struct tevent_req *req;
-        NTSTATUS status = NT_STATUS_OK;
-
-        if (cli_has_async_calls(cli)) {
-                /*
-                 * Can't use sync call while an async call is in flight
-                 */
-                status = NT_STATUS_INVALID_PARAMETER;
-                goto fail;
-        }
-
-        ev = event_context_init(frame);
-        if (ev == NULL) {
-                status = NT_STATUS_NO_MEMORY;
-                goto fail;
-        }
-
-        req = cli_oplock_ack_send(frame, ev, cli, fnum, level);
-        if (req == NULL) {
-                status = NT_STATUS_NO_MEMORY;
-                goto fail;
-        }
-
-        if (!tevent_req_poll(req, ev)) {
-                status = map_nt_error_from_unix(errno);
-                goto fail;
-        }
-
-        status = cli_oplock_ack_recv(req);
- fail:
-        TALLOC_FREE(frame);
-        return status;
-}
-
-/****************************************************************************
-set the oplock handler for a connection
-****************************************************************************/
-
-void cli_oplock_handler(struct cli_state *cli, 
-                        NTSTATUS (*handler)(struct cli_state *, uint16_t, unsigned char))
-{
-        cli->oplock_handler = handler;
-}