Changeset 232 for branches/samba-3.2.x/source/lib/util_sock.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/lib/util_sock.c (modified) (3 diffs)

branches/samba-3.2.x/source/lib/util_sock.c

@@ -1038 +1038 @@
 
 /****************************************************************************
+ Write all data from an iov array
+****************************************************************************/
+
+ssize_t write_data_iov(int fd, const struct iovec *orig_iov, int iovcnt)
+{
+        int i;
+        size_t to_send;
+        ssize_t thistime;
+        size_t sent;
+        struct iovec *iov_copy, *iov;
+
+        to_send = 0;
+        for (i=0; i<iovcnt; i++) {
+                to_send += orig_iov[i].iov_len;
+        }
+
+        thistime = sys_writev(fd, orig_iov, iovcnt);
+        if ((thistime <= 0) || (thistime == to_send)) {
+                return thistime;
+        }
+        sent = thistime;
+
+        /*
+         * We could not send everything in one call. Make a copy of iov that
+         * we can mess with. We keep a copy of the array start in iov_copy for
+         * the TALLOC_FREE, because we're going to modify iov later on,
+         * discarding elements.
+         */
+
+        iov_copy = (struct iovec *)TALLOC_MEMDUP(
+                talloc_tos(), orig_iov, sizeof(struct iovec) * iovcnt);
+
+        if (iov_copy == NULL) {
+                errno = ENOMEM;
+                return -1;
+        }
+        iov = iov_copy;
+
+        while (sent < to_send) {
+                /*
+                 * We have to discard "thistime" bytes from the beginning
+                 * iov array, "thistime" contains the number of bytes sent
+                 * via writev last.
+                 */
+                while (thistime > 0) {
+                        if (thistime < iov[0].iov_len) {
+                                char *new_base =
+                                        (char *)iov[0].iov_base + thistime;
+                                iov[0].iov_base = new_base;
+                                iov[0].iov_len -= thistime;
+                                break;
+                        }
+                        thistime -= iov[0].iov_len;
+                        iov += 1;
+                        iovcnt -= 1;
+                }
+
+                thistime = sys_writev(fd, iov, iovcnt);
+                if (thistime <= 0) {
+                        break;
+                }
+                sent += thistime;
+        }
+
+        TALLOC_FREE(iov_copy);
+        return sent;
+}
+
+/****************************************************************************
  Write data to a fd.
 ****************************************************************************/
 
+/****************************************************************************
+ Write data to a fd.
+****************************************************************************/
+
 ssize_t write_data(int fd, const char *buffer, size_t N)
 {
-        size_t total=0;
         ssize_t ret;
-        char addr[INET6_ADDRSTRLEN];
-
-        while (total < N) {
-                ret = sys_write(fd,buffer + total,N - total);
-
-                if (ret == -1) {
-                        if (fd == get_client_fd()) {
-                                /* Try and give an error message saying
-                                 * what client failed. */
-                                DEBUG(0,("write_data: write failure in "
-                                        "writing to client %s. Error %s\n",
-                                        get_peer_addr(fd,addr,sizeof(addr)),
-                                        strerror(errno) ));
-                        } else {
-                                DEBUG(0,("write_data: write failure. "
-                                        "Error = %s\n", strerror(errno) ));
-                        }
-                        return -1;
-                }
-
-                if (ret == 0) {
-                        return total;
-                }
-
-                total += ret;
-        }
-        return (ssize_t)total;
+        struct iovec iov;
+
+        iov.iov_base = CONST_DISCARD(char *, buffer);
+        iov.iov_len = N;
+
+        ret = write_data_iov(fd, &iov, 1);
+        if (ret >= 0) {
+                return ret;
+        }
+
+        if (fd == get_client_fd()) {
+                char addr[INET6_ADDRSTRLEN];
+                /*
+                 * Try and give an error message saying what client failed.
+                 */
+                DEBUG(0, ("write_data: write failure in writing to client %s. "
+                          "Error %s\n", get_peer_addr(fd,addr,sizeof(addr)),
+                          strerror(errno)));
+        } else {
+                DEBUG(0,("write_data: write failure. Error = %s\n",
+                         strerror(errno) ));
+        }
+
+        return -1;
 }
 
@@ -2017 +2086 @@
 {
         TALLOC_CTX *ctx = talloc_tos();
+        char addr[INET6_ADDRSTRLEN];
         char *name = NULL;
         const char *dnsname;
@@ -2068 +2138 @@
                 /* Use DNS to resolve the name, but only the first address */
                 struct sockaddr_storage ss;
-                if (interpret_string_addr(&ss, servername,0)) {
-                        print_sockaddr(name,
-                                        sizeof(name),
+                if (interpret_string_addr(&ss, servername, 0)) {
+                        print_sockaddr(addr,
+                                        sizeof(addr),
                                         &ss);
-                        servername = name;
+                        servername = addr;
                 }
         }