sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

fixed two writex client bugs

Browse Source 
- always use the 14 word writex varient even for small transfers as
   long as large offsets are negotiated (this matches windows
   behaviour)

 - make sure we fill in the top 16 bits of the count for large writex
   calls
(This used to be commit 9ea20d0c9a)
This commit is contained in:
Andrew Tridgell
2004-03-08 07:11:13 +00:00
parent 2622eaeca6
commit 14591dc0ea
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source4/libcli/raw/rawreadwrite.c
View File

@ -40,7 +40,7 @@ struct cli_request *smb_raw_read_send(struct cli_tree *tree, union smb_read *par
return NULL; return NULL;
case RAW_READ_READBRAW: case RAW_READ_READBRAW:
if (parms->readbraw.in.offset >= 0x80000000) { if (tree->session->transport->negotiate.capabilities & CAP_LARGE_FILES) {
bigoffset = True; bigoffset = True;
} }
SETUP_REQUEST(SMBreadbraw, bigoffset? 10:8, 0); SETUP_REQUEST(SMBreadbraw, bigoffset? 10:8, 0);
@ -72,7 +72,7 @@ struct cli_request *smb_raw_read_send(struct cli_tree *tree, union smb_read *par
break; break;
case RAW_READ_READX: case RAW_READ_READX:
if (parms->readx.in.offset >= 0x80000000) { if (tree->session->transport->negotiate.capabilities & CAP_LARGE_FILES) {
bigoffset = True; bigoffset = True;
} }
SETUP_REQUEST(SMBreadX, bigoffset ? 12 : 10, 0); SETUP_REQUEST(SMBreadX, bigoffset ? 12 : 10, 0);
@ -232,7 +232,7 @@ struct cli_request *smb_raw_write_send(struct cli_tree *tree, union smb_write *p
break; break;
case RAW_WRITE_WRITEX: case RAW_WRITE_WRITEX:
if (parms->writex.in.offset >= 0x80000000) { if (tree->session->transport->negotiate.capabilities & CAP_LARGE_FILES) {
bigoffset = True; bigoffset = True;
} }
SETUP_REQUEST(SMBwriteX, bigoffset ? 14 : 12, parms->writex.in.count); SETUP_REQUEST(SMBwriteX, bigoffset ? 14 : 12, parms->writex.in.count);
@ -243,7 +243,7 @@ struct cli_request *smb_raw_write_send(struct cli_tree *tree, union smb_write *p
SIVAL(req->out.vwv, VWV(5), 0); /* reserved */ SIVAL(req->out.vwv, VWV(5), 0); /* reserved */
SSVAL(req->out.vwv, VWV(7), parms->writex.in.wmode); SSVAL(req->out.vwv, VWV(7), parms->writex.in.wmode);
SSVAL(req->out.vwv, VWV(8), parms->writex.in.remaining); SSVAL(req->out.vwv, VWV(8), parms->writex.in.remaining);
SSVAL(req->out.vwv, VWV(9), 0); /* reserved */ SSVAL(req->out.vwv, VWV(9), parms->writex.in.count>>16);
SSVAL(req->out.vwv, VWV(10), parms->writex.in.count); SSVAL(req->out.vwv, VWV(10), parms->writex.in.count);
SSVAL(req->out.vwv, VWV(11), PTR_DIFF(req->out.data, req->out.hdr)); SSVAL(req->out.vwv, VWV(11), PTR_DIFF(req->out.data, req->out.hdr));
if (bigoffset) { if (bigoffset) {