sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

r15754: - implement SMB2 Close

Browse Source 
- add RAW_CLOSE_SMB2 generic mapping

metze
(This used to be commit 41bc3cfc822bfc2fe4413f93a180fc4507005282)
This commit is contained in:
Stefan Metzmacher 2006-05-20 17:20:34 +00:00 committed by Gerald (Jerry) Carter
parent c2c5f78f11
commit 183fb2bd4b
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source4/ntvfs/ntvfs_generic.c
View File

@ -1268,8 +1268,15 @@ _PUBLIC_ NTSTATUS ntvfs_map_close(struct ntvfs_module_context *ntvfs,
return NT_STATUS_INVALID_LEVEL; return NT_STATUS_INVALID_LEVEL;
case RAW_CLOSE_SPLCLOSE: case RAW_CLOSE_SPLCLOSE:
cl2->close.level = RAW_CLOSE_CLOSE; cl2->generic.level = RAW_CLOSE_CLOSE;
cl2->close.in.file.ntvfs= cl->splclose.in.file.ntvfs; cl2->generic.in.file.ntvfs = cl->splclose.in.file.ntvfs;
break;
case RAW_CLOSE_SMB2:
cl2->generic.level = RAW_CLOSE_CLOSE;
cl2->generic.in.file.ntvfs = cl->smb2.in.file.ntvfs;
/* SMB2 Close has output parameter, but we just zero them */
ZERO_STRUCT(cl->smb2.out);
break; break;
} }

35
source4/smb_server/smb2/fileio.c
View File

@ -79,9 +79,42 @@ void smb2srv_create_recv(struct smb2srv_request *req)
SMB2SRV_CALL_NTVFS_BACKEND(ntvfs_open(req->ntvfs, io)); SMB2SRV_CALL_NTVFS_BACKEND(ntvfs_open(req->ntvfs, io));
} }
static void smb2srv_close_send(struct ntvfs_request *ntvfs)
{
struct smb2srv_request *req;
union smb_close *io;
SMB2SRV_CHECK_ASYNC_STATUS(io, union smb_close);
SMB2SRV_CHECK(smb2srv_setup_reply(req, 0x3C, False, 0));
SSVAL(req->out.body, 0x02, io->smb2.out.flags);
SIVAL(req->out.body, 0x04, io->smb2.out._pad);
SBVAL(req->out.body, 0x08, io->smb2.out.create_time);
SBVAL(req->out.body, 0x10, io->smb2.out.access_time);
SBVAL(req->out.body, 0x18, io->smb2.out.write_time);
SBVAL(req->out.body, 0x20, io->smb2.out.change_time);
SBVAL(req->out.body, 0x28, io->smb2.out.alloc_size);
SBVAL(req->out.body, 0x30, io->smb2.out.size);
SIVAL(req->out.body, 0x38, io->smb2.out.file_attr);
smb2srv_send_reply(req);
}
void smb2srv_close_recv(struct smb2srv_request *req) void smb2srv_close_recv(struct smb2srv_request *req)
{ {
smb2srv_send_error(req, NT_STATUS_NOT_IMPLEMENTED); union smb_close *io;
SMB2SRV_CHECK_BODY_SIZE(req, 0x18, False);
SMB2SRV_TALLOC_IO_PTR(io, union smb_close);
SMB2SRV_SETUP_NTVFS_REQUEST(smb2srv_close_send, NTVFS_ASYNC_STATE_MAY_ASYNC);
io->smb2.level = RAW_CLOSE_SMB2;
io->smb2.in.flags = SVAL(req->in.body, 0x02);
io->smb2.in._pad = IVAL(req->in.body, 0x04);
io->smb2.in.file.ntvfs = smb2srv_pull_handle(req, req->in.body, 0x08);
SMB2SRV_CHECK_FILE_HANDLE(io->smb2.in.file.ntvfs);
SMB2SRV_CALL_NTVFS_BACKEND(ntvfs_close(req->ntvfs, io));
} }
void smb2srv_flush_recv(struct smb2srv_request *req) void smb2srv_flush_recv(struct smb2srv_request *req)