Changeset 751 for trunk/server/source3/lib/recvfile.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/lib/recvfile.c (modified) (4 diffs)

trunk/server/source3/lib/recvfile.c

@@ -34 +34 @@
  * as we're below the Samba vfs layer.
  *
- * If tofd is -1 we just drain the incoming socket of count
- * bytes without writing to the outgoing fd.
- * If a write fails we do the same (to cope with disk full)
- * errors.
- *
  * Returns -1 on short reads from fromfd (read error)
  * and sets errno.
  *
  * Returns number of bytes written to 'tofd'
- * or thrown away if 'tofd == -1'.
  * return != count then sets errno.
  * Returns count if complete success.
@@ -100 +94 @@
                 num_written = 0;
 
-                while (num_written < read_ret) {
+                /* Don't write any more after a write error. */
+                while (tofd != -1 && (num_written < read_ret)) {
                         ssize_t write_ret;
 
-                        if (tofd == -1) {
-                                write_ret = read_ret;
-                        } else {
-                                /* Write to file - ignore EINTR. */
-                                write_ret = sys_write(tofd,
-                                                buffer + num_written,
-                                                read_ret - num_written);
-
-                                if (write_ret <= 0) {
-                                        /* write error - stop writing. */
-                                        tofd = -1;
-                                        saved_errno = errno;
-                                        continue;
-                                }
+                        /* Write to file - ignore EINTR. */
+                        write_ret = sys_write(tofd,
+                                        buffer + num_written,
+                                        read_ret - num_written);
+
+                        if (write_ret <= 0) {
+                                /* write error - stop writing. */
+                                tofd = -1;
+                                if (total_written == 0) {
+                                        /* Ensure we return
+                                           -1 if the first
+                                           write failed. */
+                                        total_written = -1;
+                                }
+                                saved_errno = errno;
+                                break;
                         }
 
@@ -218 +215 @@
 
  done:
-        if (total_written < count) {
+        if (count) {
                 int saved_errno = errno;
-                if (drain_socket(fromfd, count-total_written) !=
-                                count-total_written) {
+                if (drain_socket(fromfd, count) != count) {
                         /* socket is dead. */
                         return -1;
@@ -247 +243 @@
 /*****************************************************************
  Throw away "count" bytes from the client socket.
+ Returns count or -1 on error.
 *****************************************************************/
 
 ssize_t drain_socket(int sockfd, size_t count)
 {
-        return default_sys_recvfile(sockfd, -1, (SMB_OFF_T)-1, count);
-}
+        size_t total = 0;
+        size_t bufsize = MIN(TRANSFER_BUF_SIZE,count);
+        char *buffer = NULL;
+
+        if (count == 0) {
+                return 0;
+        }
+
+        buffer = SMB_MALLOC_ARRAY(char, bufsize);
+        if (buffer == NULL) {
+                return -1;
+        }
+
+        while (total < count) {
+                ssize_t read_ret;
+                size_t toread = MIN(bufsize,count - total);
+
+                /* Read from socket - ignore EINTR. */
+                read_ret = sys_read(sockfd, buffer, toread);
+                if (read_ret <= 0) {
+                        /* EOF or socket error. */
+                        free(buffer);
+                        return -1;
+                }
+                total += read_ret;
+        }
+
+        free(buffer);
+        return count;
+}