Author: tridge Date: 2005-11-25 11:33:57 +0000 (Fri, 25 Nov 2005) New Revision: 11905
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11905 Log: added SMB2_FLUSH as opcode 7. Thanks to metze and volker for help brainstorming this one. Added: branches/SAMBA_4_0/source/libcli/smb2/flush.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/smb2.h branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h branches/SAMBA_4_0/source/torture/smb2/connect.c Changeset: Modified: branches/SAMBA_4_0/source/include/structs.h =================================================================== --- branches/SAMBA_4_0/source/include/structs.h 2005-11-25 11:12:08 UTC (rev 11904) +++ branches/SAMBA_4_0/source/include/structs.h 2005-11-25 11:33:57 UTC (rev 11905) @@ -357,4 +357,5 @@ struct smb2_write; struct smb2_find; struct smb2_trans; +struct smb2_flush; struct smb2_handle; Modified: branches/SAMBA_4_0/source/libcli/smb2/config.mk =================================================================== --- branches/SAMBA_4_0/source/libcli/smb2/config.mk 2005-11-25 11:12:08 UTC (rev 11904) +++ branches/SAMBA_4_0/source/libcli/smb2/config.mk 2005-11-25 11:33:57 UTC (rev 11905) @@ -15,5 +15,6 @@ find.o \ trans.o \ logoff.o \ - tdis.o + tdis.o \ + flush.o REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBPACKET Added: branches/SAMBA_4_0/source/libcli/smb2/flush.c =================================================================== --- branches/SAMBA_4_0/source/libcli/smb2/flush.c 2005-11-25 11:12:08 UTC (rev 11904) +++ branches/SAMBA_4_0/source/libcli/smb2/flush.c 2005-11-25 11:33:57 UTC (rev 11905) @@ -0,0 +1,70 @@ +/* + Unix SMB/CIFS implementation. + + SMB2 client flush handling + + 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 flush request +*/ +struct smb2_request *smb2_flush_send(struct smb2_tree *tree, struct smb2_flush *io) +{ + struct smb2_request *req; + + req = smb2_request_init_tree(tree, SMB2_OP_FLUSH, 0x18, 0); + if (req == NULL) return NULL; + + SSVAL(req->out.body, 0x02, 0); /* pad? */ + SIVAL(req->out.body, 0x04, io->in.unknown); + smb2_push_handle(req->out.body+0x08, &io->in.handle); + + smb2_transport_send(req); + + return req; +} + + +/* + recv a flush reply +*/ +NTSTATUS smb2_flush_recv(struct smb2_request *req, struct smb2_flush *io) +{ + if (!smb2_request_receive(req) || + smb2_request_is_error(req)) { + return smb2_request_destroy(req); + } + + SMB2_CHECK_PACKET_RECV(req, 0x04, False); + + return smb2_request_destroy(req); +} + +/* + sync flush request +*/ +NTSTATUS smb2_flush(struct smb2_tree *tree, struct smb2_flush *io) +{ + struct smb2_request *req = smb2_flush_send(tree, io); + return smb2_flush_recv(req, io); +} Modified: branches/SAMBA_4_0/source/libcli/smb2/smb2.h =================================================================== --- branches/SAMBA_4_0/source/libcli/smb2/smb2.h 2005-11-25 11:12:08 UTC (rev 11904) +++ branches/SAMBA_4_0/source/libcli/smb2/smb2.h 2005-11-25 11:33:57 UTC (rev 11905) @@ -164,6 +164,7 @@ #define SMB2_OP_TDIS 0x04 #define SMB2_OP_CREATE 0x05 #define SMB2_OP_CLOSE 0x06 +#define SMB2_OP_FLUSH 0x07 #define SMB2_OP_READ 0x08 #define SMB2_OP_WRITE 0x09 #define SMB2_OP_TRANS 0x0b Modified: branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h =================================================================== --- branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h 2005-11-25 11:12:08 UTC (rev 11904) +++ branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h 2005-11-25 11:33:57 UTC (rev 11905) @@ -356,3 +356,10 @@ DATA_BLOB out; } out; }; + +struct smb2_flush { + struct { + uint32_t unknown; + struct smb2_handle handle; + } in; +}; Modified: branches/SAMBA_4_0/source/torture/smb2/connect.c =================================================================== --- branches/SAMBA_4_0/source/torture/smb2/connect.c 2005-11-25 11:12:08 UTC (rev 11904) +++ branches/SAMBA_4_0/source/torture/smb2/connect.c 2005-11-25 11:33:57 UTC (rev 11905) @@ -69,6 +69,7 @@ { struct smb2_write w; struct smb2_read r; + struct smb2_flush f; NTSTATUS status; DATA_BLOB data; int i; @@ -103,6 +104,15 @@ torture_smb2_all_info(tree, handle); + ZERO_STRUCT(f); + f.in.handle = handle; + + status = smb2_flush(tree, &f); + if (!NT_STATUS_IS_OK(status)) { + printf("flush failed - %s\n", nt_errstr(status)); + return status; + } + ZERO_STRUCT(r); r.in.length = data.length; r.in.offset = 0;
