sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

Re-added readbraw call to test with smbtorture. This code not yet

Browse Source 
tested...
Jeremy.
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent cb8b21f71d
commit fe85a19b4b
1 changed files with 88 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
source/libsmb/clireadwrite.c
View File

@ -24,7 +24,7 @@
#include "includes.h"
/****************************************************************************
issue a single SMBread and don't wait for a reply
Issue a single SMBread and don't wait for a reply.
****************************************************************************/
static BOOL cli_issue_read(struct cli_state *cli, int fnum, off_t offset,
@ -49,6 +49,31 @@ static BOOL cli_issue_read(struct cli_state *cli, int fnum, off_t offset,
return cli_send_smb(cli);
}
/****************************************************************************
Issue a single SMBreadraw and don't wait for a reply.
****************************************************************************/
static BOOL cli_issue_readraw(struct cli_state *cli, int fnum, off_t offset,
size_t size, int i)
{
memset(cli->outbuf,'\0',smb_size);
memset(cli->inbuf,'\0',smb_size);
set_message(cli->outbuf,10,0,True);
CVAL(cli->outbuf,smb_com) = SMBreadbraw;
SSVAL(cli->outbuf,smb_tid,cli->cnum);
cli_setup_packet(cli);
SSVAL(cli->outbuf,smb_vwv0,fnum);
SIVAL(cli->outbuf,smb_vwv1,offset);
SSVAL(cli->outbuf,smb_vwv2,size);
SSVAL(cli->outbuf,smb_vwv3,size);
SSVAL(cli->outbuf,smb_mid,cli->mid + i);
return cli_send_smb(cli);
}
/****************************************************************************
Read size bytes at offset offset using SMBreadX.
****************************************************************************/
@ -127,6 +152,68 @@ ssize_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_
return total;
}
/****************************************************************************
Tester for the readraw call.
****************************************************************************/
ssize_t cli_readraw(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size)
{
char *p;
int size2;
size_t readsize;
ssize_t total = 0;
if (size == 0)
return 0;
/*
* Set readsize to the maximum size we can handle in one readraw.
*/
readsize = 0xFFFF;
while (total < size) {
readsize = MIN(readsize, size-total);
/* Issue a read and receive a reply */
if (!cli_issue_readraw(cli, fnum, offset, readsize, 0))
return -1;
if (!client_receive_smb(cli->fd, cli->inbuf, cli->timeout))
return -1;
size2 = smb_len(cli->inbuf);
if (size2 > readsize) {
DEBUG(5,("server returned more than we wanted!\n"));
return -1;
} else if (size2 < 0) {
DEBUG(5,("read return < 0!\n"));
return -1;
}
/* Copy data into buffer */
if (size2) {
p = cli->inbuf + 4;
memcpy(buf + total, p, size2);
}
total += size2;
offset += size2;
/*
* If the server returned less than we asked for we're at EOF.
*/
if (size2 < readsize)
break;
}
return total;
}
/****************************************************************************
issue a single SMBwrite and don't wait for a reply
****************************************************************************/