xnu-792.18.15.tar.gz

[apple/xnu.git] / bsd / kern / kpi_socket.c

diff --git a/bsd/kern/kpi_socket.c b/bsd/kern/kpi_socket.c
index c2d295c2768a5ac566558648796b90edeb09da4a..357e1f40436a4dda94e33de060be4ba3c2266085 100644 (file)
--- a/bsd/kern/kpi_socket.c
+++ b/bsd/kern/kpi_socket.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 
 #define __KPI__
  */
 
 #define __KPI__


@@ -586,10 +592,22 @@ sock_send_internal(
                control->m_len = msg->msg_controllen;
        }
        
                control->m_len = msg->msg_controllen;
        }
        

-       error = sock->so_proto->pr_usrreqs->pru_sosend(sock, msg ? (struct sockaddr*)msg->msg_name : 0,
-                               auio, data, control, flags);
-       if (error == 0 && sentlen) {
-               if (auio)
+       error = sock->so_proto->pr_usrreqs->pru_sosend(sock, msg != NULL ?
+           (struct sockaddr*)msg->msg_name : NULL, auio, data, control, flags);
+
+       /*
+        * Residual data is possible in the case of IO vectors but not
+        * in the mbuf case since the latter is treated as atomic send.
+        * If pru_sosend() consumed a portion of the iovecs data and
+        * the error returned is transient, treat it as success; this
+        * is consistent with sendit() behavior.
+        */
+       if (auio != NULL && uio_resid(auio) != datalen &&
+           (error == ERESTART || error == EINTR || error == EWOULDBLOCK))
+               error = 0;
+
+       if (error == 0 && sentlen != NULL) {
+               if (auio != NULL)

                        *sentlen = datalen - uio_resid(auio);
                else
                        *sentlen = datalen;
                        *sentlen = datalen - uio_resid(auio);
                else
                        *sentlen = datalen;