r15757: - add RAW_WRITE_SMB2 => generic mapping

- implement SMB2 Write

metze
(This used to be commit 5ab6f304f8b91c0362fd57429cc24126b241bd51)

diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 89481e50386cfaac00e04169ad981d0f3e72ab58..119fef2c6ddfea93a29ca008b8d46169de72afd1 100644 (file)
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -1056,6 +1056,14 @@ static NTSTATUS ntvfs_map_write_finish(struct ntvfs_module_context *ntvfs,
 
        case RAW_WRITE_SPLWRITE:
                break;
+
+       case RAW_WRITE_SMB2:
+               wr->smb2.out._pad       = 0;
+               wr->smb2.out.nwritten   = wr2->generic.out.nwritten;
+               wr->smb2.out.unknown1   = 0;
+               wr->smb2.out._bug       = 0;
+               break;
+
        default:
                return NT_STATUS_INVALID_LEVEL;
        }
@@ -1131,6 +1139,15 @@ _PUBLIC_ NTSTATUS ntvfs_map_write(struct ntvfs_module_context *ntvfs,
                wr2->writex.in.data      = wr->splwrite.in.data;
                status = ntvfs->ops->write(ntvfs, req, wr2);
                break;
+
+       case RAW_WRITE_SMB2:
+               wr2->writex.in.file.ntvfs= wr->smb2.in.file.ntvfs;
+               wr2->writex.in.offset    = wr->smb2.in.offset;
+               wr2->writex.in.wmode     = 0;
+               wr2->writex.in.remaining = 0;
+               wr2->writex.in.count     = wr->smb2.in.data.length;
+               wr2->writex.in.data      = wr->smb2.in.data.data;
+               status = ntvfs->ops->write(ntvfs, req, wr2);
        }
 
        return ntvfs_map_async_finish(req, status);

diff --git a/source4/smb_server/smb2/fileio.c b/source4/smb_server/smb2/fileio.c
index 946f52e90ef788e7bd20a3b773b25ee59bf28435..2b25cf0af1b46130732f4fdb9e8e22a5b9a6d062 100644 (file)
--- a/source4/smb_server/smb2/fileio.c
+++ b/source4/smb_server/smb2/fileio.c
@@ -127,9 +127,40 @@ void smb2srv_read_recv(struct smb2srv_request *req)
        smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED);
 }
 
+static void smb2srv_write_send(struct ntvfs_request *ntvfs)
+{
+       struct smb2srv_request *req;
+       union smb_write *io;
+
+       SMB2SRV_CHECK_ASYNC_STATUS(io, union smb_write);
+       SMB2SRV_CHECK(smb2srv_setup_reply(req, 0x10, True, 0));
+
+       SSVAL(req->out.body,    0x02,   io->smb2.out._pad);
+       SIVAL(req->out.body,    0x04,   io->smb2.out.nwritten);
+       SBVAL(req->out.body,    0x08,   io->smb2.out.unknown1);
+       SCVAL(req->out.body,    0x10,   io->smb2.out._bug);
+
+       smb2srv_send_reply(req);
+}
+
 void smb2srv_write_recv(struct smb2srv_request *req)
 {
-       smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED);
+       union smb_write *io;
+
+       SMB2SRV_CHECK_BODY_SIZE(req, 0x30, True);
+       SMB2SRV_TALLOC_IO_PTR(io, union smb_write);
+       SMB2SRV_SETUP_NTVFS_REQUEST(smb2srv_write_send, NTVFS_ASYNC_STATE_MAY_ASYNC);
+
+       /* TODO: avoid the memcpy */
+       io->smb2.level                  = RAW_WRITE_SMB2;
+       SMB2SRV_CHECK(smb2_pull_o16s32_blob(&req->in, io, req->in.body+0x02, &io->smb2.in.data));
+       io->smb2.in.offset              = BVAL(req->in.body, 0x08);
+       io->smb2.in.file.ntvfs          = smb2srv_pull_handle(req, req->in.body, 0x10);
+       io->smb2.in.unknown1            = BVAL(req->in.body, 0x20);
+       io->smb2.in.unknown2            = BVAL(req->in.body, 0x28);
+
+       SMB2SRV_CHECK_FILE_HANDLE(io->smb2.in.file.ntvfs);
+       SMB2SRV_CALL_NTVFS_BACKEND(ntvfs_write(req->ntvfs, io));
 }
 
 void smb2srv_lock_recv(struct smb2srv_request *req)