summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-10-31 14:01:35 -0700
committerJeremy Allison <jra@samba.org>2007-10-31 14:01:35 -0700
commit133fad90b5f9cef26f9c78cc5b302358c9c4da6a (patch)
tree62e16ef71d5bb2640a6f0ec87349f2b16145a5a8 /source3
parentff82c0a037b7c7ce69d87ab70284acc71df5e1a7 (diff)
downloadsamba-133fad90b5f9cef26f9c78cc5b302358c9c4da6a.tar.gz
samba-133fad90b5f9cef26f9c78cc5b302358c9c4da6a.tar.bz2
samba-133fad90b5f9cef26f9c78cc5b302358c9c4da6a.zip
Make explicit draining the socket on RECVFILE. Add
capability for large UNIX write if not signing and recvfile set. Cope with large UNIX write length on incoming processing. Stevef - we can now test 1-16Mb writes from CIFFS. Jeremy. (This used to be commit 8cf78776b0a44bd026cef3d74eb11cfb415f8303)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/recvfile.c21
-rw-r--r--source3/smbd/server.c2
-rw-r--r--source3/smbd/trans2.c9
-rw-r--r--source3/smbd/vfs.c18
4 files changed, 24 insertions, 26 deletions
diff --git a/source3/lib/recvfile.c b/source3/lib/recvfile.c
index a009ce9dd6..f9788fdefb 100644
--- a/source3/lib/recvfile.c
+++ b/source3/lib/recvfile.c
@@ -126,20 +126,6 @@ static ssize_t default_sys_recvfile(int fromfd,
#if defined(HAVE_SPLICE_SYSCALL)
-#ifdef JRA_SPLICE_TEST
-#include <linux/unistd.h>
-#include <sys/syscall.h>
-
-#define __NR_splice 313
-_syscall6( long, splice,
- int, fromfd,
- loff_t *, fromoffset,
- int, tofd,
- loff_t *, tooffset,
- size_t, count,
- unsigned int, flags);
-#endif
-
/*
* Try and use the Linux system call to do this.
* Remember we only return -1 if the socket read
@@ -168,6 +154,13 @@ ssize_t sys_recvfile(int fromfd,
0);
if (ret == -1) {
if (errno != EINTR) {
+ if (total_written == 0 &&
+ errno == EBADF || errno == EINVAL) {
+ return default_sys_recvfile(fromfd,
+ tofd,
+ offset,
+ count);
+ }
break;
}
continue;
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 25e2d2cb5e..bac2d48ad6 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -148,7 +148,7 @@ ssize_t receive_smb_raw_talloc_partial_read(TALLOC_CTX *mem_ctx,
{
/* Size of a WRITEX call (+4 byte len). */
char writeX_header[4 + STANDARD_WRITE_AND_X_HEADER_SIZE];
- ssize_t len = smb_len(lenbuf);
+ ssize_t len = smb_len_large(lenbuf); /* Could be a UNIX large writeX. */
ssize_t toread;
ssize_t ret;
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 7f38d5caa8..d75f6a29fd 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2719,6 +2719,10 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
*/
case SMB_QUERY_CIFS_UNIX_INFO:
+ {
+ bool large_write = lp_min_receive_file_size() &&
+ !srv_is_signing_active();
+
if (!lp_unix_extensions()) {
reply_nterror(req, NT_STATUS_INVALID_LEVEL);
return;
@@ -2733,8 +2737,11 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
CIFS_UNIX_FCNTL_LOCKS_CAP|
CIFS_UNIX_EXTATTR_CAP|
CIFS_UNIX_POSIX_PATH_OPERATIONS_CAP|
- CIFS_UNIX_LARGE_READ_CAP)));
+ CIFS_UNIX_LARGE_READ_CAP|
+ large_write ?
+ CIFS_UNIX_LARGE_WRITE_CAP : 0)));
break;
+ }
case SMB_QUERY_POSIX_FS_INFO:
{
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 21a12ae766..78939881d3 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -428,15 +428,14 @@ ssize_t vfs_write_data(struct smb_request *req,
if (req && req->unread_bytes) {
SMB_ASSERT(req->unread_bytes == N);
- ret = SMB_VFS_RECVFILE(smbd_server_fd(),
+ /* VFS_RECVFILE must drain the socket
+ * before returning. */
+ req->unread_bytes = 0;
+ return SMB_VFS_RECVFILE(smbd_server_fd(),
fsp,
fsp->fh->fd,
(SMB_OFF_T)-1,
N);
- if (ret != -1) {
- req->unread_bytes = 0;
- }
- return ret;
}
while (total < N) {
@@ -463,15 +462,14 @@ ssize_t vfs_pwrite_data(struct smb_request *req,
if (req && req->unread_bytes) {
SMB_ASSERT(req->unread_bytes == N);
- ret = SMB_VFS_RECVFILE(smbd_server_fd(),
+ /* VFS_RECVFILE must drain the socket
+ * before returning. */
+ req->unread_bytes = 0;
+ return SMB_VFS_RECVFILE(smbd_server_fd(),
fsp,
fsp->fh->fd,
offset,
N);
- if (ret != -1) {
- req->unread_bytes = 0;
- }
- return ret;
}
while (total < N) {