svn commit: samba r11888 - in branches/SAMBA_4_0/source: include
libcli/smb2
tridge at samba.org
tridge at samba.org
Fri Nov 25 05:23:55 GMT 2005
Author: tridge
Date: 2005-11-25 05:23:55 +0000 (Fri, 25 Nov 2005)
New Revision: 11888
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11888
Log:
- added SMB2 trans support
- added session key to SMB2
- renamed 'unknown2' in create to 'impersonation'
Added:
branches/SAMBA_4_0/source/libcli/smb2/trans.c
Modified:
branches/SAMBA_4_0/source/include/structs.h
branches/SAMBA_4_0/source/libcli/smb2/config.mk
branches/SAMBA_4_0/source/libcli/smb2/create.c
branches/SAMBA_4_0/source/libcli/smb2/session.c
branches/SAMBA_4_0/source/libcli/smb2/smb2.h
branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h
Changeset:
Modified: branches/SAMBA_4_0/source/include/structs.h
===================================================================
--- branches/SAMBA_4_0/source/include/structs.h 2005-11-24 09:22:38 UTC (rev 11887)
+++ branches/SAMBA_4_0/source/include/structs.h 2005-11-25 05:23:55 UTC (rev 11888)
@@ -356,4 +356,5 @@
struct smb2_read;
struct smb2_write;
struct smb2_find;
+struct smb2_trans;
struct smb2_handle;
Modified: branches/SAMBA_4_0/source/libcli/smb2/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/config.mk 2005-11-24 09:22:38 UTC (rev 11887)
+++ branches/SAMBA_4_0/source/libcli/smb2/config.mk 2005-11-25 05:23:55 UTC (rev 11888)
@@ -12,5 +12,6 @@
write.o \
read.o \
setinfo.o \
- find.o
+ find.o \
+ trans.o
REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBPACKET
Modified: branches/SAMBA_4_0/source/libcli/smb2/create.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/create.c 2005-11-24 09:22:38 UTC (rev 11887)
+++ branches/SAMBA_4_0/source/libcli/smb2/create.c 2005-11-25 05:23:55 UTC (rev 11888)
@@ -71,7 +71,7 @@
if (req == NULL) return NULL;
SSVAL(req->out.body, 0x02, io->in.oplock_flags);
- SIVAL(req->out.body, 0x04, io->in.unknown2);
+ SIVAL(req->out.body, 0x04, io->in.impersonation);
SIVAL(req->out.body, 0x08, io->in.unknown3[0]);
SIVAL(req->out.body, 0x0C, io->in.unknown3[1]);
SIVAL(req->out.body, 0x10, io->in.unknown3[2]);
Modified: branches/SAMBA_4_0/source/libcli/smb2/session.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/session.c 2005-11-24 09:22:38 UTC (rev 11887)
+++ branches/SAMBA_4_0/source/libcli/smb2/session.c 2005-11-25 05:23:55 UTC (rev 11888)
@@ -149,10 +149,17 @@
if (NT_STATUS_EQUAL(c->status, NT_STATUS_MORE_PROCESSING_REQUIRED) ||
(NT_STATUS_IS_OK(c->status) &&
NT_STATUS_EQUAL(state->gensec_status, NT_STATUS_MORE_PROCESSING_REQUIRED))) {
+ NTSTATUS session_key_err;
+ DATA_BLOB session_key;
c->status = gensec_update(session->gensec, c,
state->io.out.secblob,
&state->io.in.secblob);
state->gensec_status = c->status;
+
+ session_key_err = gensec_session_key(session->gensec, &session_key);
+ if (NT_STATUS_IS_OK(session_key_err)) {
+ session->session_key = session_key;
+ }
}
session->uid = state->io.out.uid;
Modified: branches/SAMBA_4_0/source/libcli/smb2/smb2.h
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/smb2.h 2005-11-24 09:22:38 UTC (rev 11887)
+++ branches/SAMBA_4_0/source/libcli/smb2/smb2.h 2005-11-25 05:23:55 UTC (rev 11888)
@@ -66,6 +66,7 @@
struct smb2_transport *transport;
struct gensec_security *gensec;
uint64_t uid;
+ DATA_BLOB session_key;
};
@@ -164,6 +165,7 @@
#define SMB2_OP_CLOSE 0x06
#define SMB2_OP_READ 0x08
#define SMB2_OP_WRITE 0x09
+#define SMB2_OP_TRANS 0x0b
#define SMB2_OP_CANCEL 0x0c
#define SMB2_OP_FIND 0x0e
#define SMB2_OP_NOTIFY 0x0f
Modified: branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h 2005-11-24 09:22:38 UTC (rev 11887)
+++ branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h 2005-11-25 05:23:55 UTC (rev 11888)
@@ -113,7 +113,7 @@
/* static body buffer 56 (0x38) bytes */
/* uint16_t buffer_code; 0x39 = 0x38 + 1 */
uint16_t oplock_flags; /* SMB2_CREATE_FLAG_* */
- uint32_t unknown2;
+ uint32_t impersonation;
uint32_t unknown3[4];
uint32_t access_mask;
@@ -303,3 +303,24 @@
DATA_BLOB blob;
} out;
};
+
+struct smb2_trans {
+ struct {
+ uint32_t unknown1;
+ struct smb2_handle handle;
+ uint32_t unknown2;
+ uint32_t max_response_size;
+ uint64_t flags;
+ DATA_BLOB in;
+ DATA_BLOB out;
+ } in;
+
+ struct {
+ uint32_t unknown1;
+ struct smb2_handle handle;
+ uint32_t unknown2;
+ uint32_t unknown3;
+ DATA_BLOB in;
+ DATA_BLOB out;
+ } out;
+};
Added: branches/SAMBA_4_0/source/libcli/smb2/trans.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/trans.c 2005-11-24 09:22:38 UTC (rev 11887)
+++ branches/SAMBA_4_0/source/libcli/smb2/trans.c 2005-11-25 05:23:55 UTC (rev 11888)
@@ -0,0 +1,108 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ SMB2 client trans call
+
+ Copyright (C) Andrew Tridgell 2005
+
+ 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 2 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "libcli/raw/libcliraw.h"
+#include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
+
+/*
+ send a trans request
+*/
+struct smb2_request *smb2_trans_send(struct smb2_tree *tree, struct smb2_trans *io)
+{
+ NTSTATUS status;
+ struct smb2_request *req;
+
+ req = smb2_request_init_tree(tree, SMB2_OP_TRANS, 0x38,
+ io->in.in.length+io->in.out.length);
+ if (req == NULL) return NULL;
+
+ SSVAL(req->out.body, 0x02, 0); /* pad */
+ SIVAL(req->out.body, 0x04, io->in.unknown1);
+ smb2_push_handle(req->out.body+0x08, &io->in.handle);
+ SIVAL(req->out.body, 0x20, io->in.unknown2);
+ SIVAL(req->out.body, 0x2C, io->in.max_response_size);
+ SBVAL(req->out.body, 0x30, io->in.flags);
+
+ status = smb2_push_o32s32_blob(&req->out, 0x18, io->in.out);
+ if (!NT_STATUS_IS_OK(status)) {
+ talloc_free(req);
+ return NULL;
+ }
+
+ status = smb2_push_o32s32_blob(&req->out, 0x24, io->in.in);
+ if (!NT_STATUS_IS_OK(status)) {
+ talloc_free(req);
+ return NULL;
+ }
+
+ smb2_transport_send(req);
+
+ return req;
+}
+
+
+/*
+ recv a trans reply
+*/
+NTSTATUS smb2_trans_recv(struct smb2_request *req,
+ TALLOC_CTX *mem_ctx, struct smb2_trans *io)
+{
+ NTSTATUS status;
+
+ if (!smb2_request_receive(req) ||
+ smb2_request_is_error(req)) {
+ return smb2_request_destroy(req);
+ }
+
+ SMB2_CHECK_PACKET_RECV(req, 0x30, True);
+
+ io->out.unknown1 = IVAL(req->in.body, 0x04);
+ smb2_pull_handle(req->in.body+0x08, &io->out.handle);
+ status = smb2_pull_o32s32_blob(&req->in, mem_ctx, req->in.body+0x18, &io->out.in);
+ if (!NT_STATUS_IS_OK(status)) {
+ smb2_request_destroy(req);
+ return status;
+ }
+
+ status = smb2_pull_o32s32_blob(&req->in, mem_ctx, req->in.body+0x20, &io->out.out);
+ if (!NT_STATUS_IS_OK(status)) {
+ smb2_request_destroy(req);
+ return status;
+ }
+
+
+ io->out.unknown2 = IVAL(req->in.body, 0x28);
+ io->out.unknown3 = IVAL(req->in.body, 0x2C);
+
+ return smb2_request_destroy(req);
+}
+
+/*
+ sync trans request
+*/
+NTSTATUS smb2_trans(struct smb2_tree *tree, TALLOC_CTX *mem_ctx, struct smb2_trans *io)
+{
+ struct smb2_request *req = smb2_trans_send(tree, io);
+ return smb2_trans_recv(req, mem_ctx, io);
+}
More information about the samba-cvs
mailing list