libsmb: Remove sync smb1cli_trans and _echo wrappers

Unused. If someone wants them back, they're easy to recreate

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>

diff --git a/libcli/smb/smb1cli_echo.c b/libcli/smb/smb1cli_echo.c
index a9f6e7f9ae8fe8e5fe078f55aa6ba3ea76ffcb05..de633e7721a966616a067dc28f2d4f3e721ea023 100644 (file)
--- a/libcli/smb/smb1cli_echo.c
+++ b/libcli/smb/smb1cli_echo.c
@@ -134,35 +134,3 @@ NTSTATUS smb1cli_echo_recv(struct tevent_req *req)
 {
        return tevent_req_simple_recv_ntstatus(req);
 }
-
-NTSTATUS smb1cli_echo(struct smbXcli_conn *conn, uint32_t timeout_msec,
-                     uint16_t num_echos, DATA_BLOB data)
-{
-       TALLOC_CTX *frame = talloc_stackframe();
-       struct tevent_context *ev;
-       struct tevent_req *req;
-       NTSTATUS status = NT_STATUS_NO_MEMORY;
-
-       if (smbXcli_conn_has_async_calls(conn)) {
-               /*
-                * Can't use sync call while an async call is in flight
-                */
-               status = NT_STATUS_INVALID_PARAMETER;
-               goto fail;
-       }
-       ev = samba_tevent_context_init(frame);
-       if (ev == NULL) {
-               goto fail;
-       }
-       req = smb1cli_echo_send(frame, ev, conn, timeout_msec, num_echos, data);
-       if (req == NULL) {
-               goto fail;
-       }
-       if (!tevent_req_poll_ntstatus(req, ev, &status)) {
-               goto fail;
-       }
-       status = smb1cli_echo_recv(req);
- fail:
-       TALLOC_FREE(frame);
-       return status;
-}

diff --git a/libcli/smb/smb1cli_trans.c b/libcli/smb/smb1cli_trans.c
index 02b2b2efb08235d82647650a512cbdb716ed33d9..cb355c80ef208674014b96700df1552fc9a0b7e3 100644 (file)
--- a/libcli/smb/smb1cli_trans.c
+++ b/libcli/smb/smb1cli_trans.c
@@ -838,65 +838,3 @@ NTSTATUS smb1cli_trans_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
        tevent_req_received(req);
        return status;
 }
-
-NTSTATUS smb1cli_trans(TALLOC_CTX *mem_ctx, struct smbXcli_conn *conn,
-               uint8_t trans_cmd,
-               uint8_t additional_flags, uint8_t clear_flags,
-               uint16_t additional_flags2, uint16_t clear_flags2,
-               uint32_t timeout_msec,
-               uint32_t pid,
-               struct smbXcli_tcon *tcon,
-               struct smbXcli_session *session,
-               const char *pipe_name, uint16_t fid, uint16_t function,
-               int flags,
-               uint16_t *setup, uint8_t num_setup, uint8_t max_setup,
-               uint8_t *param, uint32_t num_param, uint32_t max_param,
-               uint8_t *data, uint32_t num_data, uint32_t max_data,
-               uint16_t *recv_flags2,
-               uint16_t **rsetup, uint8_t min_rsetup, uint8_t *num_rsetup,
-               uint8_t **rparam, uint32_t min_rparam, uint32_t *num_rparam,
-               uint8_t **rdata, uint32_t min_rdata, uint32_t *num_rdata)
-{
-       TALLOC_CTX *frame = talloc_stackframe();
-       struct tevent_context *ev;
-       struct tevent_req *req;
-       NTSTATUS status = NT_STATUS_NO_MEMORY;
-
-       if (smbXcli_conn_has_async_calls(conn)) {
-               /*
-                * Can't use sync call while an async call is in flight
-                */
-               status = NT_STATUS_INVALID_PARAMETER_MIX;
-               goto fail;
-       }
-
-       ev = samba_tevent_context_init(frame);
-       if (ev == NULL) {
-               goto fail;
-       }
-
-       req = smb1cli_trans_send(frame, ev, conn, trans_cmd,
-                                additional_flags, clear_flags,
-                                additional_flags2, clear_flags2,
-                                timeout_msec,
-                                pid, tcon, session,
-                                pipe_name, fid, function, flags,
-                                setup, num_setup, max_setup,
-                                param, num_param, max_param,
-                                data, num_data, max_data);
-       if (req == NULL) {
-               goto fail;
-       }
-
-       if (!tevent_req_poll_ntstatus(req, ev, &status)) {
-               goto fail;
-       }
-
-       status = smb1cli_trans_recv(req, mem_ctx, recv_flags2,
-                                   rsetup, min_rsetup, num_rsetup,
-                                   rparam, min_rparam, num_rparam,
-                                   rdata, min_rdata, num_rdata);
- fail:
-       TALLOC_FREE(frame);
-       return status;
-}

diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index e4e7ab180eb556d5acd0a47fbc8538538c7afea7..e88a866c6ac931a2dd4630122082b5be2b76012e 100644 (file)
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -229,23 +229,6 @@ NTSTATUS smb1cli_trans_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
                            uint32_t *num_param,
                            uint8_t **data, uint32_t min_data,
                            uint32_t *num_data);
-NTSTATUS smb1cli_trans(TALLOC_CTX *mem_ctx, struct smbXcli_conn *conn,
-               uint8_t trans_cmd,
-               uint8_t additional_flags, uint8_t clear_flags,
-               uint16_t additional_flags2, uint16_t clear_flags2,
-               uint32_t timeout_msec,
-               uint32_t pid,
-               struct smbXcli_tcon *tcon,
-               struct smbXcli_session *session,
-               const char *pipe_name, uint16_t fid, uint16_t function,
-               int flags,
-               uint16_t *setup, uint8_t num_setup, uint8_t max_setup,
-               uint8_t *param, uint32_t num_param, uint32_t max_param,
-               uint8_t *data, uint32_t num_data, uint32_t max_data,
-               uint16_t *recv_flags2,
-               uint16_t **rsetup, uint8_t min_rsetup, uint8_t *num_rsetup,
-               uint8_t **rparam, uint32_t min_rparam, uint32_t *num_rparam,
-               uint8_t **rdata, uint32_t min_rdata, uint32_t *num_rdata);
 
 struct tevent_req *smb1cli_echo_send(TALLOC_CTX *mem_ctx,
                                     struct tevent_context *ev,
@@ -254,8 +237,6 @@ struct tevent_req *smb1cli_echo_send(TALLOC_CTX *mem_ctx,
                                     uint16_t num_echos,
                                     DATA_BLOB data);
 NTSTATUS smb1cli_echo_recv(struct tevent_req *req);
-NTSTATUS smb1cli_echo(struct smbXcli_conn *conn, uint32_t timeout_msec,
-                     uint16_t num_echos, DATA_BLOB data);
 
 struct tevent_req *smb1cli_session_setup_lm21_send(TALLOC_CTX *mem_ctx,
                                struct tevent_context *ev,