From 6ab3f8cedbd79776169b1f84d8775b9887d9c82d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 7 Sep 2011 18:44:21 +0200 Subject: s3:smb2cli: pass struct smbXcli_conn directly to smb2cli_req_create/_send() metze --- source3/libsmb/smb2cli_base.h | 60 -------------------------------- source3/libsmb/smb2cli_close.c | 4 +-- source3/libsmb/smb2cli_create.c | 4 +-- source3/libsmb/smb2cli_flush.c | 4 +-- source3/libsmb/smb2cli_query_directory.c | 4 +-- source3/libsmb/smb2cli_read.c | 4 +-- source3/libsmb/smb2cli_tcon.c | 6 ++-- source3/libsmb/smb2cli_write.c | 4 +-- 8 files changed, 15 insertions(+), 75 deletions(-) delete mode 100644 source3/libsmb/smb2cli_base.h (limited to 'source3/libsmb') diff --git a/source3/libsmb/smb2cli_base.h b/source3/libsmb/smb2cli_base.h deleted file mode 100644 index d68d65a304..0000000000 --- a/source3/libsmb/smb2cli_base.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - Unix SMB/CIFS implementation. - smb2 client routines - Copyright (C) Volker Lendecke 2011 - - 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 . -*/ - -#ifndef __SMB2CLI_BASE_H__ -#define __SMB2CLI_BASE_H__ - -#include "../libcli/smb/smbXcli_base.h" - -static inline struct tevent_req *cli_state_smb2cli_req_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - struct cli_state *cli, - uint16_t cmd, - uint32_t additional_flags, - uint32_t clear_flags, - uint32_t timeout_msec, - uint32_t pid, - uint32_t tid, - struct smbXcli_session *session, - const uint8_t *fixed, - uint16_t fixed_len, - const uint8_t *dyn, - uint32_t dyn_len) -{ - return smb2cli_req_send(mem_ctx, ev, - cli->conn, cmd, - additional_flags, clear_flags, - timeout_msec, - pid, tid, session, - fixed, fixed_len, - dyn, dyn_len); -} - -#define smb2cli_req_send(mem_ctx, ev, cli, cmd, \ - additional_flags, clear_flags, \ - timeout_msec, \ - pid, tid, session, \ - fixed, fixed_len, dyn, dyn_len) \ - cli_state_smb2cli_req_send(mem_ctx, ev, cli, cmd, \ - additional_flags, clear_flags, \ - timeout_msec, \ - pid, tid, session, \ - fixed, fixed_len, dyn, dyn_len) - -#endif diff --git a/source3/libsmb/smb2cli_close.c b/source3/libsmb/smb2cli_close.c index 7af35fe0e4..e6b907377f 100644 --- a/source3/libsmb/smb2cli_close.c +++ b/source3/libsmb/smb2cli_close.c @@ -20,7 +20,7 @@ #include "includes.h" #include "client.h" #include "async_smb.h" -#include "smb2cli_base.h" +#include "../libcli/smb/smbXcli_base.h" #include "smb2cli.h" #include "libsmb/proto.h" #include "lib/util/tevent_ntstatus.h" @@ -53,7 +53,7 @@ struct tevent_req *smb2cli_close_send(TALLOC_CTX *mem_ctx, SBVAL(fixed, 8, fid_persistent); SBVAL(fixed, 16, fid_volatile); - subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_CLOSE, + subreq = smb2cli_req_send(state, ev, cli->conn, SMB2_OP_CLOSE, 0, 0, /* flags */ cli->timeout, cli->smb2.pid, diff --git a/source3/libsmb/smb2cli_create.c b/source3/libsmb/smb2cli_create.c index 327b0a13ea..79a72142ae 100644 --- a/source3/libsmb/smb2cli_create.c +++ b/source3/libsmb/smb2cli_create.c @@ -20,7 +20,7 @@ #include "includes.h" #include "client.h" #include "async_smb.h" -#include "smb2cli_base.h" +#include "../libcli/smb/smbXcli_base.h" #include "smb2cli.h" #include "libsmb/proto.h" #include "lib/util/tevent_ntstatus.h" @@ -136,7 +136,7 @@ struct tevent_req *smb2cli_create_send( data_blob_free(&blob); } - subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_CREATE, + subreq = smb2cli_req_send(state, ev, cli->conn, SMB2_OP_CREATE, 0, 0, /* flags */ cli->timeout, cli->smb2.pid, diff --git a/source3/libsmb/smb2cli_flush.c b/source3/libsmb/smb2cli_flush.c index 85e34ad508..d46eeedbf5 100644 --- a/source3/libsmb/smb2cli_flush.c +++ b/source3/libsmb/smb2cli_flush.c @@ -20,7 +20,7 @@ #include "includes.h" #include "client.h" #include "async_smb.h" -#include "smb2cli_base.h" +#include "../libcli/smb/smbXcli_base.h" #include "smb2cli.h" #include "libsmb/proto.h" #include "lib/util/tevent_ntstatus.h" @@ -51,7 +51,7 @@ struct tevent_req *smb2cli_flush_send(TALLOC_CTX *mem_ctx, SBVAL(fixed, 8, fid_persistent); SBVAL(fixed, 16, fid_volatile); - subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_FLUSH, + subreq = smb2cli_req_send(state, ev, cli->conn, SMB2_OP_FLUSH, 0, 0, /* flags */ cli->timeout, cli->smb2.pid, diff --git a/source3/libsmb/smb2cli_query_directory.c b/source3/libsmb/smb2cli_query_directory.c index bff5463829..f0c857e41b 100644 --- a/source3/libsmb/smb2cli_query_directory.c +++ b/source3/libsmb/smb2cli_query_directory.c @@ -20,7 +20,7 @@ #include "includes.h" #include "client.h" #include "async_smb.h" -#include "smb2cli_base.h" +#include "../libcli/smb/smbXcli_base.h" #include "smb2cli.h" #include "libsmb/proto.h" #include "lib/util/tevent_ntstatus.h" @@ -86,7 +86,7 @@ struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx, dyn_len = sizeof(state->dyn_pad); } - subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_FIND, + subreq = smb2cli_req_send(state, ev, cli->conn, SMB2_OP_FIND, 0, 0, /* flags */ cli->timeout, cli->smb2.pid, diff --git a/source3/libsmb/smb2cli_read.c b/source3/libsmb/smb2cli_read.c index 9b625f939b..d01e33f42d 100644 --- a/source3/libsmb/smb2cli_read.c +++ b/source3/libsmb/smb2cli_read.c @@ -20,7 +20,7 @@ #include "includes.h" #include "client.h" #include "async_smb.h" -#include "smb2cli_base.h" +#include "../libcli/smb/smbXcli_base.h" #include "smb2cli.h" #include "libsmb/proto.h" #include "lib/util/tevent_ntstatus.h" @@ -65,7 +65,7 @@ struct tevent_req *smb2cli_read_send(TALLOC_CTX *mem_ctx, SBVAL(fixed, 32, minimum_count); SBVAL(fixed, 40, remaining_bytes); - subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_READ, + subreq = smb2cli_req_send(state, ev, cli->conn, SMB2_OP_READ, 0, 0, /* flags */ cli->timeout, cli->smb2.pid, diff --git a/source3/libsmb/smb2cli_tcon.c b/source3/libsmb/smb2cli_tcon.c index bcb2fc7b46..4e92333499 100644 --- a/source3/libsmb/smb2cli_tcon.c +++ b/source3/libsmb/smb2cli_tcon.c @@ -20,7 +20,7 @@ #include "includes.h" #include "client.h" #include "async_smb.h" -#include "smb2cli_base.h" +#include "../libcli/smb/smbXcli_base.h" #include "smb2cli.h" #include "libsmb/proto.h" #include "lib/util/tevent_ntstatus.h" @@ -81,7 +81,7 @@ struct tevent_req *smb2cli_tcon_send(TALLOC_CTX *mem_ctx, dyn_len = sizeof(state->dyn_pad); } - subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_TCON, + subreq = smb2cli_req_send(state, ev, cli->conn, SMB2_OP_TCON, 0, 0, /* flags */ cli->timeout, cli->smb2.pid, @@ -189,7 +189,7 @@ struct tevent_req *smb2cli_tdis_send(TALLOC_CTX *mem_ctx, } SSVAL(state->fixed, 0, 4); - subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_TDIS, + subreq = smb2cli_req_send(state, ev, cli->conn, SMB2_OP_TDIS, 0, 0, /* flags */ cli->timeout, cli->smb2.pid, diff --git a/source3/libsmb/smb2cli_write.c b/source3/libsmb/smb2cli_write.c index 3597c49c55..e4da6c8159 100644 --- a/source3/libsmb/smb2cli_write.c +++ b/source3/libsmb/smb2cli_write.c @@ -20,7 +20,7 @@ #include "includes.h" #include "client.h" #include "async_smb.h" -#include "smb2cli_base.h" +#include "../libcli/smb/smbXcli_base.h" #include "smb2cli.h" #include "libsmb/proto.h" #include "lib/util/tevent_ntstatus.h" @@ -74,7 +74,7 @@ struct tevent_req *smb2cli_write_send(TALLOC_CTX *mem_ctx, dyn_len = sizeof(state->dyn_pad); } - subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_WRITE, + subreq = smb2cli_req_send(state, ev, cli->conn, SMB2_OP_WRITE, 0, 0, /* flags */ cli->timeout, cli->smb2.pid, -- cgit