s3:libsmb: move cli_smb_oplock_break_waiter*() to clioplock.c

metze

diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h
index 49a8b9e322a7a013ca9b94d93eafefe6683f2dd3..b8e2a34cbf71caffe088db9e33fa08b6b8e90169 100644 (file)
--- a/source3/include/async_smb.h
+++ b/source3/include/async_smb.h
@@ -51,13 +51,6 @@ NTSTATUS cli_smb_recv(struct tevent_req *req,
                      uint8_t min_wct, uint8_t *pwct, uint16_t **pvwv,
                      uint32_t *pnum_bytes, uint8_t **pbytes);
 
-struct tevent_req *cli_smb_oplock_break_waiter_send(TALLOC_CTX *mem_ctx,
-                                                   struct event_context *ev,
-                                                   struct cli_state *cli);
-NTSTATUS cli_smb_oplock_break_waiter_recv(struct tevent_req *req,
-                                         uint16_t *pfnum,
-                                         uint8_t *plevel);
-
 struct tevent_req *cli_session_request_send(TALLOC_CTX *mem_ctx,
                                            struct tevent_context *ev,
                                            int sock,

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 06b9fff407e67c4d0aa6fa1925127d2bf0e09176..f4e2c2f56d5529afbe494043fc10c5663673af0a 100644 (file)
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -1078,85 +1078,6 @@ bool cli_has_async_calls(struct cli_state *cli)
                || (talloc_array_length(cli->conn.pending) != 0));
 }
 
-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 event_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 = cli_smb_req_create(mem_ctx, ev, cli, 0, 0, 0, NULL, 0, NULL);
-       if (tevent_req_nomem(subreq, req)) {
-               return tevent_req_post(req, ev);
-       }
-       cli_smb_req_set_mid(subreq, 0xffff);
-
-       if (!cli_smb_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);
-       uint8_t wct;
-       uint16_t *vwv;
-       uint32_t num_bytes;
-       uint8_t *bytes;
-       uint8_t *inbuf;
-       NTSTATUS status;
-
-       status = cli_smb_recv(subreq, state, &inbuf, 8, &wct, &vwv,
-                             &num_bytes, &bytes);
-       TALLOC_FREE(subreq);
-       if (!NT_STATUS_IS_OK(status)) {
-               tevent_req_nterror(req, status);
-               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;
-}
-
 
 struct cli_session_request_state {
        struct tevent_context *ev;

diff --git a/source3/libsmb/clioplock.c b/source3/libsmb/clioplock.c
index f164ed522196649a11c43027fc89c3dc663d5dba..a708453877cb7b116eda0563677bae0adc902e5c 100644 (file)
--- a/source3/libsmb/clioplock.c
+++ b/source3/libsmb/clioplock.c
@@ -22,6 +22,85 @@
 #include "async_smb.h"
 #include "libsmb/libsmb.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 event_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 = cli_smb_req_create(mem_ctx, ev, cli, 0, 0, 0, NULL, 0, NULL);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       cli_smb_req_set_mid(subreq, 0xffff);
+
+       if (!cli_smb_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);
+       uint8_t wct;
+       uint16_t *vwv;
+       uint32_t num_bytes;
+       uint8_t *bytes;
+       uint8_t *inbuf;
+       NTSTATUS status;
+
+       status = cli_smb_recv(subreq, state, &inbuf, 8, &wct, &vwv,
+                             &num_bytes, &bytes);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               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;
+}
+
 /****************************************************************************
 send an ack for an oplock break request
 ****************************************************************************/

diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 1c7be955c9da7c2147b8019b0bcca318a898f8ff..f9329241c7fb0b68886c72e2edb1970fb2e71865 100644 (file)
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -693,6 +693,13 @@ NTSTATUS cli_message(struct cli_state *cli, const char *host,
 
 /* The following definitions come from libsmb/clioplock.c  */
 
+struct tevent_req *cli_smb_oplock_break_waiter_send(TALLOC_CTX *mem_ctx,
+                                                   struct event_context *ev,
+                                                   struct cli_state *cli);
+NTSTATUS cli_smb_oplock_break_waiter_recv(struct tevent_req *req,
+                                         uint16_t *pfnum,
+                                         uint8_t *plevel);
+
 struct tevent_req *cli_oplock_ack_send(TALLOC_CTX *mem_ctx,
                                       struct tevent_context *ev,
                                       struct cli_state *cli,