s3:libsmb: add smb2cli_tcon*() and smb2cli_tdis*()

Based on the initial patch from Volker Lendecke <vl@samba.org>.

metze

source3/Makefile.in

@@ -603,6 +603,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
 	     libsmb/smb2cli_base.o \
 	     libsmb/smb2cli_negprot.o \
 	     libsmb/smb2cli_session.o \
+	     libsmb/smb2cli_tcon.o \
 	     libsmb/cli_np_tstream.o \
 	     libsmb/smbsock_connect.o \
 	     $(LIBSAMBA_OBJ) \

source3/include/client.h

@@ -156,6 +156,11 @@ struct cli_state {
 		uint32_t max_write_size;
 		struct timespec system_time;
 		struct timespec server_start_time;
+
+		/* SMB2 tcon */
+		uint8_t share_type;
+		uint32_t share_flags;
+		uint32_t maximal_access;
 	} smb2;
 };
 

source3/libsmb/smb2cli.h

@@ -42,4 +42,17 @@ struct tevent_req *smb2cli_logoff_send(TALLOC_CTX *mem_ctx,
 NTSTATUS smb2cli_logoff_recv(struct tevent_req *req);
 NTSTATUS smb2cli_logoff(struct cli_state *cli);
 
+struct tevent_req *smb2cli_tcon_send(TALLOC_CTX *mem_ctx,
+				     struct tevent_context *ev,
+				     struct cli_state *cli,
+				     const char *share);
+NTSTATUS smb2cli_tcon_recv(struct tevent_req *req);
+NTSTATUS smb2cli_tcon(struct cli_state *cli, const char *share);
+
+struct tevent_req *smb2cli_tdis_send(TALLOC_CTX *mem_ctx,
+				     struct tevent_context *ev,
+				     struct cli_state *cli);
+NTSTATUS smb2cli_tdis_recv(struct tevent_req *req);
+NTSTATUS smb2cli_tdis(struct cli_state *cli);
+
 #endif /* __SMB2CLI_H__ */

source3/libsmb/smb2cli_tcon.c

@@ -0,0 +1,229 @@
+/*
+   Unix SMB/CIFS implementation.
+   smb2 lib
+   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 <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "client.h"
+#include "async_smb.h"
+#include "smb2cli_base.h"
+#include "smb2cli.h"
+#include "libsmb/proto.h"
+#include "lib/util/tevent_ntstatus.h"
+
+struct smb2cli_tcon_state {
+	struct cli_state *cli;
+	uint8_t fixed[8];
+};
+
+static void smb2cli_tcon_done(struct tevent_req *subreq);
+
+struct tevent_req *smb2cli_tcon_send(TALLOC_CTX *mem_ctx,
+				     struct tevent_context *ev,
+				     struct cli_state *cli,
+				     const char *share)
+{
+	struct tevent_req *req, *subreq;
+	struct smb2cli_tcon_state *state;
+	uint8_t *fixed;
+	char srv_ip[INET6_ADDRSTRLEN];
+	const char *tcon_share;
+	uint8_t *dyn;
+	size_t dyn_len;
+
+	req = tevent_req_create(mem_ctx, &state, struct smb2cli_tcon_state);
+	if (req == NULL) {
+		return NULL;
+	}
+	state->cli = cli;
+
+	print_sockaddr(srv_ip, sizeof(srv_ip), &cli->dest_ss);
+
+	tcon_share = talloc_asprintf(talloc_tos(), "\\\\%s\\%s",
+				     srv_ip, share);
+	if (tevent_req_nomem(tcon_share, req)) {
+		return tevent_req_post(req, ev);
+	}
+	if (!convert_string_talloc(state, CH_UNIX, CH_UTF16,
+				   tcon_share, talloc_get_size(tcon_share),
+				   &dyn, &dyn_len)) {
+		tevent_req_nomem(NULL, req);
+		return tevent_req_post(req, ev);
+	}
+
+	fixed = state->fixed;
+	SSVAL(fixed, 0, 9);
+	SSVAL(fixed, 4, SMB2_HDR_BODY + 8);
+	SSVAL(fixed, 6, dyn_len);
+
+	subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_TCON, 0,
+				  state->fixed, sizeof(state->fixed),
+				  dyn, dyn_len);
+	if (tevent_req_nomem(subreq, req)) {
+		return tevent_req_post(req, ev);
+	}
+	tevent_req_set_callback(subreq, smb2cli_tcon_done, req);
+	return req;
+}
+
+static void smb2cli_tcon_done(struct tevent_req *subreq)
+{
+	struct tevent_req *req = tevent_req_callback_data(
+		subreq, struct tevent_req);
+	struct smb2cli_tcon_state *state = tevent_req_data(
+		req, struct smb2cli_tcon_state);
+	struct cli_state *cli = state->cli;
+	NTSTATUS status;
+	struct iovec *iov;
+	uint8_t *body;
+
+	status = smb2cli_req_recv(subreq, talloc_tos(), &iov, 16);
+	if (!NT_STATUS_IS_OK(status)) {
+		TALLOC_FREE(subreq);
+		tevent_req_nterror(req, status);
+		return;
+	}
+
+	cli->smb2.tid = IVAL(iov[0].iov_base, SMB2_HDR_TID);
+
+	body = (uint8_t *)iov[1].iov_base;
+	cli->smb2.share_type		= CVAL(body, 2);
+	cli->smb2.share_flags		= IVAL(body, 4);
+	cli->capabilities		= IVAL(body, 8);
+	cli->smb2.maximal_access	= IVAL(body, 12);
+
+	TALLOC_FREE(subreq);
+	tevent_req_done(req);
+}
+
+NTSTATUS smb2cli_tcon_recv(struct tevent_req *req)
+{
+	return tevent_req_simple_recv_ntstatus(req);
+}
+
+NTSTATUS smb2cli_tcon(struct cli_state *cli, const char *share)
+{
+	TALLOC_CTX *frame = talloc_stackframe();
+	struct event_context *ev;
+	struct tevent_req *req;
+	NTSTATUS status = NT_STATUS_NO_MEMORY;
+
+	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) {
+		goto fail;
+	}
+	req = smb2cli_tcon_send(frame, ev, cli, share);
+	if (req == NULL) {
+		goto fail;
+	}
+	if (!tevent_req_poll_ntstatus(req, ev, &status)) {
+		goto fail;
+	}
+	status = smb2cli_tcon_recv(req);
+ fail:
+	TALLOC_FREE(frame);
+	return status;
+}
+
+struct smb2cli_tdis_state {
+	uint8_t fixed[4];
+};
+
+static void smb2cli_tdis_done(struct tevent_req *subreq);
+
+struct tevent_req *smb2cli_tdis_send(TALLOC_CTX *mem_ctx,
+				      struct tevent_context *ev,
+				      struct cli_state *cli)
+{
+	struct tevent_req *req, *subreq;
+	struct smb2cli_tdis_state *state;
+
+	req = tevent_req_create(mem_ctx, &state,
+				struct smb2cli_tdis_state);
+	if (req == NULL) {
+		return NULL;
+	}
+	SSVAL(state->fixed, 0, 4);
+
+	subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_TDIS, 0,
+				  state->fixed, sizeof(state->fixed),
+				  NULL, 0);
+	if (tevent_req_nomem(subreq, req)) {
+		return tevent_req_post(req, ev);
+	}
+	tevent_req_set_callback(subreq, smb2cli_tdis_done, req);
+	return req;
+}
+
+static void smb2cli_tdis_done(struct tevent_req *subreq)
+{
+	struct tevent_req *req =
+		tevent_req_callback_data(subreq,
+		struct tevent_req);
+	NTSTATUS status;
+	struct iovec *iov;
+
+	status = smb2cli_req_recv(subreq, talloc_tos(), &iov, 4);
+	TALLOC_FREE(subreq);
+	if (tevent_req_nterror(req, status)) {
+		return;
+	}
+	tevent_req_done(req);
+}
+
+NTSTATUS smb2cli_tdis_recv(struct tevent_req *req)
+{
+	return tevent_req_simple_recv_ntstatus(req);
+}
+
+NTSTATUS smb2cli_tdis(struct cli_state *cli)
+{
+	TALLOC_CTX *frame = talloc_stackframe();
+	struct event_context *ev;
+	struct tevent_req *req;
+	NTSTATUS status = NT_STATUS_NO_MEMORY;
+
+	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) {
+		goto fail;
+	}
+	req = smb2cli_tdis_send(frame, ev, cli);
+	if (req == NULL) {
+		goto fail;
+	}
+	if (!tevent_req_poll_ntstatus(req, ev, &status)) {
+		goto fail;
+	}
+	status = smb2cli_tdis_recv(req);
+ fail:
+	TALLOC_FREE(frame);
+	return status;
+}

source3/wscript_build

@@ -139,6 +139,7 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/smb2cli_base.c
              libsmb/smb2cli_negprot.c
              libsmb/smb2cli_session.c
+             libsmb/smb2cli_tcon.c
              libsmb/cli_np_tstream.c
              libsmb/reparse_symlink.c
              libsmb/clisymlink.c