sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-21 12:23:50 +03:00
Code Activity

Get rid of read_socket_with_timeout

Browse Source
This commit is contained in:
Volker Lendecke
2008-01-25 23:41:48 +01:00
parent ddbdd11a49
commit f9c8ac83ff
3 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source/lib/util_sock.c
View File

@@ -1042,21 +1042,20 @@ NTSTATUS read_socket_with_timeout_ntstatus(int fd, char *buf,
return NT_STATUS_OK;
}
ssize_t read_socket_with_timeout(int fd, char *buf,
size_t mincnt, size_t maxcnt,
unsigned int time_out,
enum smb_read_errors *pre)
/****************************************************************************
Read data from the client, reading exactly N bytes.
****************************************************************************/
ssize_t read_data(int fd,char *buffer,size_t N, enum smb_read_errors *pre)
{
NTSTATUS status;
size_t size_ret;
set_smb_read_error(pre, SMB_READ_OK);
status = read_socket_with_timeout_ntstatus(fd, buf, mincnt, maxcnt,
time_out, &size_ret);
status = read_socket_with_timeout_ntstatus(fd, buffer, N, N, 0, NULL);
if (NT_STATUS_IS_OK(status)) {
return size_ret;
return N;
}
if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
@@ -1073,15 +1072,6 @@ ssize_t read_socket_with_timeout(int fd, char *buf,
return -1;
}
/****************************************************************************
Read data from the client, reading exactly N bytes.
****************************************************************************/
ssize_t read_data(int fd,char *buffer,size_t N, enum smb_read_errors *pre)
{
return read_socket_with_timeout(fd, buffer, N, N, 0, pre);
}
/****************************************************************************
Write data to a fd.
****************************************************************************/
@@ -1214,7 +1204,6 @@ ssize_t receive_smb_raw(int fd,
enum smb_read_errors *pre)
{
size_t len;
ssize_t ret;
NTSTATUS status;
set_smb_read_error(pre,SMB_READ_OK);
@@ -1264,11 +1253,23 @@ ssize_t receive_smb_raw(int fd,
len = MIN(len,maxlen);
}
ret = read_socket_with_timeout(fd, buffer+4, len, len, timeout,
pre);
set_smb_read_error(pre, SMB_READ_OK);
if (ret != len) {
cond_set_smb_read_error(pre,SMB_READ_ERROR);
status = read_socket_with_timeout_ntstatus(
fd, buffer+4, len, len, timeout, &len);
if (!NT_STATUS_IS_OK(status)) {
if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
set_smb_read_error(pre, SMB_READ_EOF);
return -1;
}
if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
set_smb_read_error(pre, SMB_READ_TIMEOUT);
return -1;
}
set_smb_read_error(pre, SMB_READ_ERROR);
return -1;
}