]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/netinet/tcp_usrreq.c
projects / apple / xnu.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
xnu-4570.41.2.tar.gz
[apple/xnu.git] / bsd / netinet / tcp_usrreq.c
diff --git a/bsd/netinet/tcp_usrreq.c b/bsd/netinet/tcp_usrreq.c
index c80d20e8a6181301e2ba3dbe9c4a72921da09d51..3c368cb52f3411c64d213ae84840c10346d7a7d1 100644 (file)
--- a/bsd/netinet/tcp_usrreq.c
+++ b/bsd/netinet/tcp_usrreq.c
@@ -1,8 +1,8 @@
 /*
 /*
- * Copyright (c) 2000-2014 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2017 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * 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
  * 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
@@ -11,10 +11,10 @@
  * 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.
  * 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.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 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,
  * 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,
@@ -22,7 +22,7 @@
  * 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.
  * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
@@ -70,7 +70,9 @@
 #if INET6
 #include <sys/domain.h>
 #endif /* INET6 */
 #if INET6
 #include <sys/domain.h>
 #endif /* INET6 */
+#if !CONFIG_EMBEDDED
 #include <sys/kasl.h>
 #include <sys/kasl.h>
+#endif
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
@@ -101,6 +103,7 @@
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
+#include <netinet/tcp_cc.h>
 #include <mach/sdt.h>
 #if TCPDEBUG
 #include <netinet/tcp_debug.h>
 #include <mach/sdt.h>
 #if TCPDEBUG
 #include <netinet/tcp_debug.h>
@@ -117,7 +120,6 @@
 #include <netinet/flow_divert.h>
 #endif /* FLOW_DIVERT */
 
 #include <netinet/flow_divert.h>
 #endif /* FLOW_DIVERT */
 
-void   tcp_fill_info(struct tcpcb *, struct tcp_info *);
 errno_t tcp_fill_info_for_info_tuple(struct info_tuple *, struct tcp_info *);
 
 int tcp_sysctl_info(struct sysctl_oid *, void *, int , struct sysctl_req *);
 errno_t tcp_fill_info_for_info_tuple(struct info_tuple *, struct tcp_info *);
 
 int tcp_sysctl_info(struct sysctl_oid *, void *, int , struct sysctl_req *);
@@ -136,13 +138,8 @@ static int tcp6_connect(struct tcpcb *, struct sockaddr *, struct proc *);
 static int     tcp6_usr_connect(struct socket *, struct sockaddr *,
                    struct proc *);
 #endif /* INET6 */
 static int     tcp6_usr_connect(struct socket *, struct sockaddr *,
                    struct proc *);
 #endif /* INET6 */
-static struct tcpcb *
-               tcp_disconnect(struct tcpcb *);
-static struct tcpcb *
-               tcp_usrclosed(struct tcpcb *);
-
-extern uint32_t tcp_autorcvbuf_max;
-
+static struct tcpcb *tcp_disconnect(struct tcpcb *);
+static struct tcpcb *tcp_usrclosed(struct tcpcb *);
 extern void tcp_sbrcv_trim(struct tcpcb *tp, struct sockbuf *sb);
 
 #if TCPDEBUG
 extern void tcp_sbrcv_trim(struct tcpcb *tp, struct sockbuf *sb);
 
 #if TCPDEBUG
@@ -183,7 +180,7 @@ tcp_usr_attach(struct socket *so, __unused int proto, struct proc *p)
                error = EISCONN;
                goto out;
        }
                error = EISCONN;
                goto out;
        }
-       
+
        error = tcp_attach(so, p);
        if (error)
                goto out;
        error = tcp_attach(so, p);
        if (error)
                goto out;
@@ -214,7 +211,7 @@ tcp_usr_detach(struct socket *so)
        if (inp == 0 || (inp->inp_state == INPCB_STATE_DEAD)) {
                return EINVAL;  /* XXX */
        }
        if (inp == 0 || (inp->inp_state == INPCB_STATE_DEAD)) {
                return EINVAL;  /* XXX */
        }
-       lck_mtx_assert(&((struct inpcb *)so->so_pcb)->inpcb_mtx, LCK_MTX_ASSERT_OWNED);
+       socket_lock_assert_owned(so);
        tp = intotcpcb(inp);
        /* In case we got disconnected from the peer */
         if (tp == NULL)
        tp = intotcpcb(inp);
        /* In case we got disconnected from the peer */
         if (tp == NULL)
@@ -296,6 +293,17 @@ tcp_usr_bind(struct socket *so, struct sockaddr *nam, struct proc *p)
        error = in_pcbbind(inp, nam, p);
        if (error)
                goto out;
        error = in_pcbbind(inp, nam, p);
        if (error)
                goto out;
+
+#if NECP
+       /* Update NECP client with bind result if not in middle of connect */
+       if ((inp->inp_flags2 & INP2_CONNECT_IN_PROGRESS) &&
+               !uuid_is_null(inp->necp_client_uuid)) {
+               socket_unlock(so, 0);
+               necp_client_assign_from_socket(so->last_pid, inp->necp_client_uuid, inp);
+               socket_lock(so, 0);
+       }
+#endif /* NECP */
+
        COMMON_END(PRU_BIND);
 
 }
        COMMON_END(PRU_BIND);
 
 }
@@ -401,8 +409,18 @@ static int
 tcp_connect_complete(struct socket *so)
 {
        struct tcpcb *tp = sototcpcb(so);
 tcp_connect_complete(struct socket *so)
 {
        struct tcpcb *tp = sototcpcb(so);
+       struct inpcb *inp = sotoinpcb(so);
        int error = 0;
 
        int error = 0;
 
+#if NECP
+       /* Update NECP client with connected five-tuple */
+       if (!uuid_is_null(inp->necp_client_uuid)) {
+               socket_unlock(so, 0);
+               necp_client_assign_from_socket(so->last_pid, inp->necp_client_uuid, inp);
+               socket_lock(so, 0);
+       }
+#endif /* NECP */
+
        /* TFO delays the tcp_output until later, when the app calls write() */
        if (so->so_flags1 & SOF1_PRECONNECT_DATA) {
                if (!necp_socket_is_allowed_to_send_recv(sotoinpcb(so), NULL, NULL))
        /* TFO delays the tcp_output until later, when the app calls write() */
        if (so->so_flags1 & SOF1_PRECONNECT_DATA) {
                if (!necp_socket_is_allowed_to_send_recv(sotoinpcb(so), NULL, NULL))
@@ -495,95 +513,53 @@ tcp_usr_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
 
 static int
 tcp_usr_connectx_common(struct socket *so, int af,
 
 static int
 tcp_usr_connectx_common(struct socket *so, int af,
-    struct sockaddr_list **src_sl, struct sockaddr_list **dst_sl,
+    struct sockaddr *src, struct sockaddr *dst,
     struct proc *p, uint32_t ifscope, sae_associd_t aid, sae_connid_t *pcid,
     uint32_t flags, void *arg, uint32_t arglen, struct uio *auio,
     user_ssize_t *bytes_written)
 {
     struct proc *p, uint32_t ifscope, sae_associd_t aid, sae_connid_t *pcid,
     uint32_t flags, void *arg, uint32_t arglen, struct uio *auio,
     user_ssize_t *bytes_written)
 {
-#pragma unused(aid)
-#if !MPTCP
-#pragma unused(flags, arg, arglen)
-#endif /* !MPTCP */
-       struct sockaddr_entry *src_se = NULL, *dst_se = NULL;
+#pragma unused(aid, flags, arg, arglen)
        struct inpcb *inp = sotoinpcb(so);
        struct inpcb *inp = sotoinpcb(so);
-       int error;
+       int error = 0;
        user_ssize_t datalen = 0;
 
        if (inp == NULL)
                return (EINVAL);
 
        user_ssize_t datalen = 0;
 
        if (inp == NULL)
                return (EINVAL);
 
-       VERIFY(dst_sl != NULL);
-
-       /* select source (if specified) and destination addresses */
-       error = in_selectaddrs(af, src_sl, &src_se, dst_sl, &dst_se);
-       if (error != 0)
-               return (error);
+       VERIFY(dst != NULL);
 
 
-       VERIFY(*dst_sl != NULL && dst_se != NULL);
-       VERIFY(src_se == NULL || *src_sl != NULL);
-       VERIFY(dst_se->se_addr->sa_family == af);
-       VERIFY(src_se == NULL || src_se->se_addr->sa_family == af);
+       ASSERT(!(inp->inp_flags2 & INP2_CONNECT_IN_PROGRESS));
+       inp->inp_flags2 |= INP2_CONNECT_IN_PROGRESS;
 
 #if NECP
 
 #if NECP
-       inp_update_necp_policy(inp, src_se ? src_se->se_addr : NULL, dst_se ? dst_se->se_addr : NULL, ifscope);
+       inp_update_necp_policy(inp, src, dst, ifscope);
 #endif /* NECP */
 
        if ((so->so_flags1 & SOF1_DATA_IDEMPOTENT) &&
            (tcp_fastopen & TCP_FASTOPEN_CLIENT))
                sototcpcb(so)->t_flagsext |= TF_FASTOPEN;
 
 #endif /* NECP */
 
        if ((so->so_flags1 & SOF1_DATA_IDEMPOTENT) &&
            (tcp_fastopen & TCP_FASTOPEN_CLIENT))
                sototcpcb(so)->t_flagsext |= TF_FASTOPEN;
 
-       /*
-        * We get here for 2 cases:
-        *
-        *   a. From MPTCP, to connect a subflow.  There is no need to
-        *      bind the socket to the source address and/or interface,
-        *      since everything has been taken care of by MPTCP.  We
-        *      simply check whether or not this is for the initial
-        *      MPTCP connection attempt, or to join an existing one.
-        *
-        *   b. From the socket layer, to connect a TCP.  Perform the
-        *      bind to source address and/or interface as necessary.
-        */
-#if MPTCP
-       if (flags & CONNREQF_MPTCP) {
-               struct mptsub_connreq *mpcr = arg;
-
-               /* Check to make sure this came down from MPTCP */
-               if (arg == NULL || arglen != sizeof (*mpcr))
-                       return (EOPNOTSUPP);
-
-               switch (mpcr->mpcr_type) {
-               case MPTSUB_CONNREQ_MP_ENABLE:
-                       break;
-               case MPTSUB_CONNREQ_MP_ADD:
-                       break;
-               default:
-                       return (EOPNOTSUPP);
-               }
-       } else
-#endif /* MPTCP */
-       {
-               /* bind socket to the specified interface, if requested */
-               if (ifscope != IFSCOPE_NONE &&
-                   (error = inp_bindif(inp, ifscope, NULL)) != 0)
-                       return (error);
+       /* bind socket to the specified interface, if requested */
+       if (ifscope != IFSCOPE_NONE &&
+               (error = inp_bindif(inp, ifscope, NULL)) != 0) {
+               goto done;
+       }
 
 
-               /* if source address and/or port is specified, bind to it */
-               if (src_se != NULL) {
-                       struct sockaddr *sa = src_se->se_addr;
-                       error = sobindlock(so, sa, 0);  /* already locked */
-                       if (error != 0)
-                               return (error);
+       /* if source address and/or port is specified, bind to it */
+       if (src != NULL) {
+               error = sobindlock(so, src, 0); /* already locked */
+               if (error != 0) {
+                       goto done;
                }
        }
 
        switch (af) {
        case AF_INET:
                }
        }
 
        switch (af) {
        case AF_INET:
-               error = tcp_usr_connect(so, dst_se->se_addr, p);
+               error = tcp_usr_connect(so, dst, p);
                break;
 #if INET6
        case AF_INET6:
                break;
 #if INET6
        case AF_INET6:
-               error = tcp6_usr_connect(so, dst_se->se_addr, p);
+               error = tcp6_usr_connect(so, dst, p);
                break;
 #endif /* INET6 */
        default:
                break;
 #endif /* INET6 */
        default:
@@ -591,8 +567,9 @@ tcp_usr_connectx_common(struct socket *so, int af,
                /* NOTREACHED */
        }
 
                /* NOTREACHED */
        }
 
-       if (error != 0)
-               return (error);
+       if (error != 0) {
+               goto done;
+       }
 
        /* if there is data, copy it */
        if (auio != NULL) {
 
        /* if there is data, copy it */
        if (auio != NULL) {
@@ -623,18 +600,19 @@ tcp_usr_connectx_common(struct socket *so, int af,
        if (error == 0 && pcid != NULL)
                *pcid = 1; /* there is only one connection in regular TCP */
 
        if (error == 0 && pcid != NULL)
                *pcid = 1; /* there is only one connection in regular TCP */
 
+done:
+       inp->inp_flags2 &= ~INP2_CONNECT_IN_PROGRESS;
        return (error);
 }
 
 static int
        return (error);
 }
 
 static int
-tcp_usr_connectx(struct socket *so, struct sockaddr_list **src_sl,
-    struct sockaddr_list **dst_sl, struct proc *p, uint32_t ifscope,
+tcp_usr_connectx(struct socket *so, struct sockaddr *src,
+    struct sockaddr *dst, struct proc *p, uint32_t ifscope,
     sae_associd_t aid, sae_connid_t *pcid, uint32_t flags, void *arg,
     uint32_t arglen, struct uio *uio, user_ssize_t *bytes_written)
 {
     sae_associd_t aid, sae_connid_t *pcid, uint32_t flags, void *arg,
     uint32_t arglen, struct uio *uio, user_ssize_t *bytes_written)
 {
-       return (tcp_usr_connectx_common(so, AF_INET, src_sl, dst_sl,
-           p, ifscope, aid, pcid, flags, arg, arglen, uio,
-           bytes_written));
+       return (tcp_usr_connectx_common(so, AF_INET, src, dst, p, ifscope, aid,
+           pcid, flags, arg, arglen, uio, bytes_written));
 }
 
 #if INET6
 }
 
 #if INET6
@@ -725,14 +703,13 @@ tcp6_usr_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
 }
 
 static int
 }
 
 static int
-tcp6_usr_connectx(struct socket *so, struct sockaddr_list **src_sl,
-    struct sockaddr_list **dst_sl, struct proc *p, uint32_t ifscope,
+tcp6_usr_connectx(struct socket *so, struct sockaddr*src,
+    struct sockaddr *dst, struct proc *p, uint32_t ifscope,
     sae_associd_t aid, sae_connid_t *pcid, uint32_t flags, void *arg,
     uint32_t arglen, struct uio *uio, user_ssize_t *bytes_written)
 {
     sae_associd_t aid, sae_connid_t *pcid, uint32_t flags, void *arg,
     uint32_t arglen, struct uio *uio, user_ssize_t *bytes_written)
 {
-       return (tcp_usr_connectx_common(so, AF_INET6, src_sl, dst_sl,
-           p, ifscope, aid, pcid, flags, arg, arglen, uio,
-           bytes_written));
+       return (tcp_usr_connectx_common(so, AF_INET6, src, dst, p, ifscope, aid,
+           pcid, flags, arg, arglen, uio, bytes_written));
 }
 #endif /* INET6 */
 
 }
 #endif /* INET6 */
 
@@ -754,8 +731,7 @@ tcp_usr_disconnect(struct socket *so)
        struct inpcb *inp = sotoinpcb(so);
        struct tcpcb *tp;
 
        struct inpcb *inp = sotoinpcb(so);
        struct tcpcb *tp;
 
-       lck_mtx_assert(&((struct inpcb *)so->so_pcb)->inpcb_mtx,
-           LCK_MTX_ASSERT_OWNED);
+       socket_lock_assert_owned(so);
        COMMON_START();
         /* In case we got disconnected from the peer */
         if (tp == NULL)
        COMMON_START();
         /* In case we got disconnected from the peer */
         if (tp == NULL)
@@ -1042,8 +1018,8 @@ tcp_usr_send(struct socket *so, int flags, struct mbuf *m,
                        m_freem(control);
                        control = NULL;
                } else if (control->m_len) {
                        m_freem(control);
                        control = NULL;
                } else if (control->m_len) {
-                       /* 
-                        * if not unordered, TCP should not have 
+                       /*
+                        * if not unordered, TCP should not have
                         * control mbufs
                         */
                        m_freem(control);
                         * control mbufs
                         */
                        m_freem(control);
@@ -1108,8 +1084,8 @@ tcp_usr_send(struct socket *so, int flags, struct mbuf *m,
                                tp->t_flags &= ~TF_MORETOCOME;
                }
        } else {
                                tp->t_flags &= ~TF_MORETOCOME;
                }
        } else {
-               if (sbspace(&so->so_snd) == 0) { 
-                       /* if no space is left in sockbuf, 
+               if (sbspace(&so->so_snd) == 0) {
+                       /* if no space is left in sockbuf,
                         * do not try to squeeze in OOB traffic */
                        m_freem(m);
                        error = ENOBUFS;
                         * do not try to squeeze in OOB traffic */
                        m_freem(m);
                        error = ENOBUFS;
@@ -1160,7 +1136,7 @@ tcp_usr_send(struct socket *so, int flags, struct mbuf *m,
                        error = sbwait(&so->so_snd);
        }
 
                        error = sbwait(&so->so_snd);
        }
 
-       COMMON_END((flags & PRUS_OOB) ? PRU_SENDOOB : 
+       COMMON_END((flags & PRUS_OOB) ? PRU_SENDOOB :
                   ((flags & PRUS_EOF) ? PRU_SEND_EOF : PRU_SEND));
 }
 
                   ((flags & PRUS_EOF) ? PRU_SEND_EOF : PRU_SEND));
 }
 
@@ -1179,6 +1155,7 @@ tcp_usr_abort(struct socket *so)
         if (tp == NULL)
                goto out;
        tp = tcp_drop(tp, ECONNABORTED);
         if (tp == NULL)
                goto out;
        tp = tcp_drop(tp, ECONNABORTED);
+       VERIFY(so->so_usecount > 0);
        so->so_usecount--;
        COMMON_END(PRU_ABORT);
 }
        so->so_usecount--;
        COMMON_END(PRU_ABORT);
 }
@@ -1212,6 +1189,7 @@ tcp_usr_rcvoob(struct socket *so, struct mbuf *m, int flags)
        }
        m->m_len = 1;
        *mtod(m, caddr_t) = tp->t_iobc;
        }
        m->m_len = 1;
        *mtod(m, caddr_t) = tp->t_iobc;
+       so->so_state &= ~SS_RCVATMARK;
        if ((flags & MSG_PEEK) == 0)
                tp->t_oobflags ^= (TCPOOB_HAVEDATA | TCPOOB_HADDATA);
        COMMON_END(PRU_RCVOOB);
        if ((flags & MSG_PEEK) == 0)
                tp->t_oobflags ^= (TCPOOB_HAVEDATA | TCPOOB_HADDATA);
        COMMON_END(PRU_RCVOOB);
@@ -1235,8 +1213,7 @@ tcp_usr_preconnect(struct socket *so)
 
        error = tcp_output(sototcpcb(so));
 
 
        error = tcp_output(sototcpcb(so));
 
-       /* One read has been done. This was enough. Get back to "normal" behavior. */
-       so->so_flags1 &= ~SOF1_PRECONNECT_DATA;
+       soclearfastopen(so);
 
        COMMON_END(PRU_PRECONNECT);
 }
 
        COMMON_END(PRU_PRECONNECT);
 }
@@ -1315,10 +1292,7 @@ struct pr_usrreqs tcp6_usrreqs = {
  *     in_pcbladdr:EADDRNOTAVAIL       Address not available
  */
 static int
  *     in_pcbladdr:EADDRNOTAVAIL       Address not available
  */
 static int
-tcp_connect(tp, nam, p)
-       register struct tcpcb *tp;
-       struct sockaddr *nam;
-       struct proc *p;
+tcp_connect(struct tcpcb *tp, struct sockaddr *nam, struct proc *p)
 {
        struct inpcb *inp = tp->t_inpcb, *oinp;
        struct socket *so = inp->inp_socket;
 {
        struct inpcb *inp = tp->t_inpcb, *oinp;
        struct socket *so = inp->inp_socket;
@@ -1339,23 +1313,23 @@ tcp_connect(tp, nam, p)
         * earlier incarnation of this same connection still in
         * TIME_WAIT state, creating an ADDRINUSE error.
         */
         * earlier incarnation of this same connection still in
         * TIME_WAIT state, creating an ADDRINUSE error.
         */
-       error = in_pcbladdr(inp, nam, &laddr, IFSCOPE_NONE, &outif);
+       error = in_pcbladdr(inp, nam, &laddr, IFSCOPE_NONE, &outif, 0);
        if (error)
                goto done;
 
        if (error)
                goto done;
 
-       tcp_unlock(inp->inp_socket, 0, 0);
+       socket_unlock(inp->inp_socket, 0);
        oinp = in_pcblookup_hash(inp->inp_pcbinfo,
            sin->sin_addr, sin->sin_port,
            inp->inp_laddr.s_addr != INADDR_ANY ? inp->inp_laddr : laddr,
            inp->inp_lport,  0, NULL);
 
        oinp = in_pcblookup_hash(inp->inp_pcbinfo,
            sin->sin_addr, sin->sin_port,
            inp->inp_laddr.s_addr != INADDR_ANY ? inp->inp_laddr : laddr,
            inp->inp_lport,  0, NULL);
 
-       tcp_lock(inp->inp_socket, 0, 0);
+       socket_lock(inp->inp_socket, 0);
        if (oinp) {
                if (oinp != inp) /* 4143933: avoid deadlock if inp == oinp */
        if (oinp) {
                if (oinp != inp) /* 4143933: avoid deadlock if inp == oinp */
-                       tcp_lock(oinp->inp_socket, 1, 0);
+                       socket_lock(oinp->inp_socket, 1);
                if (in_pcb_checkstate(oinp, WNT_RELEASE, 1) == WNT_STOPUSING) {
                        if (oinp != inp)
                if (in_pcb_checkstate(oinp, WNT_RELEASE, 1) == WNT_STOPUSING) {
                        if (oinp != inp)
-                               tcp_unlock(oinp->inp_socket, 1, 0);
+                               socket_unlock(oinp->inp_socket, 1);
                        goto skip_oinp;
                }
 
                        goto skip_oinp;
                }
 
@@ -1368,12 +1342,12 @@ tcp_connect(tp, nam, p)
                        printf("tcp_connect: inp=0x%llx err=EADDRINUSE\n",
                            (uint64_t)VM_KERNEL_ADDRPERM(inp));
                        if (oinp != inp)
                        printf("tcp_connect: inp=0x%llx err=EADDRINUSE\n",
                            (uint64_t)VM_KERNEL_ADDRPERM(inp));
                        if (oinp != inp)
-                               tcp_unlock(oinp->inp_socket, 1, 0);
+                               socket_unlock(oinp->inp_socket, 1);
                        error = EADDRINUSE;
                        goto done;
                }
                if (oinp != inp)
                        error = EADDRINUSE;
                        goto done;
                }
                if (oinp != inp)
-                       tcp_unlock(oinp->inp_socket, 1, 0);
+                       socket_unlock(oinp->inp_socket, 1);
        }
 skip_oinp:
        if ((inp->inp_laddr.s_addr == INADDR_ANY ? laddr.s_addr :
        }
 skip_oinp:
        if ((inp->inp_laddr.s_addr == INADDR_ANY ? laddr.s_addr :
@@ -1392,6 +1366,7 @@ skip_oinp:
                inp->inp_laddr = laddr;
                /* no reference needed */
                inp->inp_last_outifp = outif;
                inp->inp_laddr = laddr;
                /* no reference needed */
                inp->inp_last_outifp = outif;
+
                inp->inp_flags |= INP_INADDR_ANY;
        }
        inp->inp_faddr = sin->sin_addr;
                inp->inp_flags |= INP_INADDR_ANY;
        }
        inp->inp_faddr = sin->sin_addr;
@@ -1402,7 +1377,7 @@ skip_oinp:
        if (inp->inp_flowhash == 0)
                inp->inp_flowhash = inp_calc_flowhash(inp);
 
        if (inp->inp_flowhash == 0)
                inp->inp_flowhash = inp_calc_flowhash(inp);
 
-       tcp_set_max_rwinscale(tp, so);
+       tcp_set_max_rwinscale(tp, so, TCP_AUTORCVBUF_MAX(outif));
 
        soisconnecting(so);
        tcpstat.tcps_connattempt++;
 
        soisconnecting(so);
        tcpstat.tcps_connattempt++;
@@ -1422,10 +1397,7 @@ done:
 
 #if INET6
 static int
 
 #if INET6
 static int
-tcp6_connect(tp, nam, p)
-       register struct tcpcb *tp;
-       struct sockaddr *nam;
-       struct proc *p;
+tcp6_connect(struct tcpcb *tp, struct sockaddr *nam, struct proc *p)
 {
        struct inpcb *inp = tp->t_inpcb, *oinp;
        struct socket *so = inp->inp_socket;
 {
        struct inpcb *inp = tp->t_inpcb, *oinp;
        struct socket *so = inp->inp_socket;
@@ -1453,14 +1425,14 @@ tcp6_connect(tp, nam, p)
        error = in6_pcbladdr(inp, nam, &addr6, &outif);
        if (error)
                goto done;
        error = in6_pcbladdr(inp, nam, &addr6, &outif);
        if (error)
                goto done;
-       tcp_unlock(inp->inp_socket, 0, 0);
+       socket_unlock(inp->inp_socket, 0);
        oinp = in6_pcblookup_hash(inp->inp_pcbinfo,
                                  &sin6->sin6_addr, sin6->sin6_port,
                                  IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)
                                  ? &addr6
                                  : &inp->in6p_laddr,
                                  inp->inp_lport,  0, NULL);
        oinp = in6_pcblookup_hash(inp->inp_pcbinfo,
                                  &sin6->sin6_addr, sin6->sin6_port,
                                  IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)
                                  ? &addr6
                                  : &inp->in6p_laddr,
                                  inp->inp_lport,  0, NULL);
-       tcp_lock(inp->inp_socket, 0, 0);
+       socket_lock(inp->inp_socket, 0);
        if (oinp) {
                if (oinp != inp && (otp = intotcpcb(oinp)) != NULL &&
                    otp->t_state == TCPS_TIME_WAIT &&
        if (oinp) {
                if (oinp != inp && (otp = intotcpcb(oinp)) != NULL &&
                    otp->t_state == TCPS_TIME_WAIT &&
@@ -1499,12 +1471,12 @@ tcp6_connect(tp, nam, p)
                    (htonl(inp->inp_flowhash) & IPV6_FLOWLABEL_MASK);
        }
 
                    (htonl(inp->inp_flowhash) & IPV6_FLOWLABEL_MASK);
        }
 
-       tcp_set_max_rwinscale(tp, so);
+       tcp_set_max_rwinscale(tp, so, TCP_AUTORCVBUF_MAX(outif));
 
        soisconnecting(so);
        tcpstat.tcps_connattempt++;
        tp->t_state = TCPS_SYN_SENT;
 
        soisconnecting(so);
        tcpstat.tcps_connattempt++;
        tp->t_state = TCPS_SYN_SENT;
-       tp->t_timer[TCPT_KEEP] = OFFSET_FROM_START(tp, 
+       tp->t_timer[TCPT_KEEP] = OFFSET_FROM_START(tp,
                TCP_CONN_KEEPINIT(tp));
        tp->iss = tcp_new_isn(tp);
        tcp_sendseqinit(tp);
                TCP_CONN_KEEPINIT(tp));
        tp->iss = tcp_new_isn(tp);
        tcp_sendseqinit(tp);
@@ -1522,11 +1494,11 @@ done:
 /*
  * Export TCP internal state information via a struct tcp_info
  */
 /*
  * Export TCP internal state information via a struct tcp_info
  */
-__private_extern__ void
+void
 tcp_fill_info(struct tcpcb *tp, struct tcp_info *ti)
 {
        struct inpcb *inp = tp->t_inpcb;
 tcp_fill_info(struct tcpcb *tp, struct tcp_info *ti)
 {
        struct inpcb *inp = tp->t_inpcb;
-       
+
        bzero(ti, sizeof(*ti));
 
        ti->tcpi_state = tp->t_state;
        bzero(ti, sizeof(*ti));
 
        ti->tcpi_state = tp->t_state;
@@ -1549,6 +1521,9 @@ tcp_fill_info(struct tcpcb *tp, struct tcp_info *ti)
                if (IN_FASTRECOVERY(tp) || tp->t_rxtshift > 0)
                        ti->tcpi_flags |= TCPI_FLAG_LOSSRECOVERY;
 
                if (IN_FASTRECOVERY(tp) || tp->t_rxtshift > 0)
                        ti->tcpi_flags |= TCPI_FLAG_LOSSRECOVERY;
 
+               if (tp->t_flags & TF_STREAMING_ON)
+                       ti->tcpi_flags |= TCPI_FLAG_STREAMING_ON;
+
                ti->tcpi_rto = tp->t_timer[TCPT_REXMT] ? tp->t_rxtcur : 0;
                ti->tcpi_snd_mss = tp->t_maxseg;
                ti->tcpi_rcv_mss = tp->t_maxseg;
                ti->tcpi_rto = tp->t_timer[TCPT_REXMT] ? tp->t_rxtcur : 0;
                ti->tcpi_snd_mss = tp->t_maxseg;
                ti->tcpi_rcv_mss = tp->t_maxseg;
@@ -1561,7 +1536,7 @@ tcp_fill_info(struct tcpcb *tp, struct tcp_info *ti)
                ti->tcpi_snd_ssthresh = tp->snd_ssthresh;
                ti->tcpi_snd_cwnd = tp->snd_cwnd;
                ti->tcpi_snd_sbbytes = inp->inp_socket->so_snd.sb_cc;
                ti->tcpi_snd_ssthresh = tp->snd_ssthresh;
                ti->tcpi_snd_cwnd = tp->snd_cwnd;
                ti->tcpi_snd_sbbytes = inp->inp_socket->so_snd.sb_cc;
-       
+
                ti->tcpi_rcv_space = tp->rcv_wnd;
 
                ti->tcpi_snd_wnd = tp->snd_wnd;
                ti->tcpi_rcv_space = tp->rcv_wnd;
 
                ti->tcpi_snd_wnd = tp->snd_wnd;
@@ -1573,7 +1548,7 @@ tcp_fill_info(struct tcpcb *tp, struct tcp_info *ti)
                        tp->t_bwmeas != NULL) {
                        ti->tcpi_snd_bw = (tp->t_bwmeas->bw_sndbw * 8000);
                }
                        tp->t_bwmeas != NULL) {
                        ti->tcpi_snd_bw = (tp->t_bwmeas->bw_sndbw * 8000);
                }
-               
+
                ti->tcpi_last_outif = (tp->t_inpcb->inp_last_outifp == NULL) ? 0 :
                    tp->t_inpcb->inp_last_outifp->if_index;
 
                ti->tcpi_last_outif = (tp->t_inpcb->inp_last_outifp == NULL) ? 0 :
                    tp->t_inpcb->inp_last_outifp->if_index;
 
@@ -1581,8 +1556,9 @@ tcp_fill_info(struct tcpcb *tp, struct tcp_info *ti)
                ti->tcpi_txpackets = inp->inp_stat->txpackets;
                ti->tcpi_txbytes = inp->inp_stat->txbytes;
                ti->tcpi_txretransmitbytes = tp->t_stat.txretransmitbytes;
                ti->tcpi_txpackets = inp->inp_stat->txpackets;
                ti->tcpi_txbytes = inp->inp_stat->txbytes;
                ti->tcpi_txretransmitbytes = tp->t_stat.txretransmitbytes;
+               ti->tcpi_txretransmitpackets = tp->t_stat.rxmitpkts;
                ti->tcpi_txunacked = tp->snd_max - tp->snd_una;
                ti->tcpi_txunacked = tp->snd_max - tp->snd_una;
-               
+
                //atomic_get_64(ti->tcpi_rxbytes, &inp->inp_stat->rxbytes);
                ti->tcpi_rxpackets = inp->inp_stat->rxpackets;
                ti->tcpi_rxbytes = inp->inp_stat->rxbytes;
                //atomic_get_64(ti->tcpi_rxbytes, &inp->inp_stat->rxbytes);
                ti->tcpi_rxpackets = inp->inp_stat->rxpackets;
                ti->tcpi_rxbytes = inp->inp_stat->rxbytes;
@@ -1618,6 +1594,12 @@ tcp_fill_info(struct tcpcb *tp, struct tcp_info *ti)
                ti->tcpi_tfo_syn_data_sent = !!(tp->t_tfo_stats & TFO_S_SYN_DATA_SENT);
                ti->tcpi_tfo_syn_data_acked = !!(tp->t_tfo_stats & TFO_S_SYN_DATA_ACKED);
                ti->tcpi_tfo_syn_loss = !!(tp->t_tfo_stats & TFO_S_SYN_LOSS);
                ti->tcpi_tfo_syn_data_sent = !!(tp->t_tfo_stats & TFO_S_SYN_DATA_SENT);
                ti->tcpi_tfo_syn_data_acked = !!(tp->t_tfo_stats & TFO_S_SYN_DATA_ACKED);
                ti->tcpi_tfo_syn_loss = !!(tp->t_tfo_stats & TFO_S_SYN_LOSS);
+               ti->tcpi_tfo_cookie_wrong = !!(tp->t_tfo_stats & TFO_S_COOKIE_WRONG);
+               ti->tcpi_tfo_no_cookie_rcv = !!(tp->t_tfo_stats & TFO_S_NO_COOKIE_RCV);
+               ti->tcpi_tfo_heuristics_disable = !!(tp->t_tfo_stats & TFO_S_HEURISTICS_DISABLE);
+               ti->tcpi_tfo_send_blackhole = !!(tp->t_tfo_stats & TFO_S_SEND_BLACKHOLE);
+               ti->tcpi_tfo_recv_blackhole = !!(tp->t_tfo_stats & TFO_S_RECV_BLACKHOLE);
+               ti->tcpi_tfo_onebyte_proxy = !!(tp->t_tfo_stats & TFO_S_ONE_BYTE_PROXY);
 
                ti->tcpi_ecn_client_setup = !!(tp->ecn_flags & TE_SETUPSENT);
                ti->tcpi_ecn_server_setup = !!(tp->ecn_flags & TE_SETUPRECEIVED);
 
                ti->tcpi_ecn_client_setup = !!(tp->ecn_flags & TE_SETUPSENT);
                ti->tcpi_ecn_server_setup = !!(tp->ecn_flags & TE_SETUPRECEIVED);
@@ -1630,9 +1612,20 @@ tcp_fill_info(struct tcpcb *tp, struct tcp_info *ti)
                if (tp->t_inpcb->inp_last_outifp != NULL) {
                        if (IFNET_IS_CELLULAR(tp->t_inpcb->inp_last_outifp))
                                ti->tcpi_if_cell = 1;
                if (tp->t_inpcb->inp_last_outifp != NULL) {
                        if (IFNET_IS_CELLULAR(tp->t_inpcb->inp_last_outifp))
                                ti->tcpi_if_cell = 1;
-                       else if (IFNET_IS_WIFI(tp->t_inpcb->inp_last_outifp))
+                       if (IFNET_IS_WIFI(tp->t_inpcb->inp_last_outifp))
                                ti->tcpi_if_wifi = 1;
                                ti->tcpi_if_wifi = 1;
+                       if (IFNET_IS_WIRED(tp->t_inpcb->inp_last_outifp))
+                               ti->tcpi_if_wired = 1;
+                       if (IFNET_IS_WIFI_INFRA(tp->t_inpcb->inp_last_outifp))
+                               ti->tcpi_if_wifi_infra = 1;
+                       if (tp->t_inpcb->inp_last_outifp->if_eflags & IFEF_AWDL)
+                               ti->tcpi_if_wifi_awdl = 1;
                }
                }
+               if (tp->tcp_cc_index == TCP_CC_ALGO_BACKGROUND_INDEX)
+                       ti->tcpi_snd_background = 1;
+               if (tcp_recv_bg == 1 ||
+                   IS_TCP_RECV_BG(tp->t_inpcb->inp_socket))
+                       ti->tcpi_rcv_background = 1;
 
                ti->tcpi_ecn_recv_ce = tp->t_ecn_recv_ce;
                ti->tcpi_ecn_recv_cwr = tp->t_ecn_recv_cwr;
 
                ti->tcpi_ecn_recv_ce = tp->t_ecn_recv_ce;
                ti->tcpi_ecn_recv_cwr = tp->t_ecn_recv_cwr;
@@ -1653,15 +1646,15 @@ tcp_fill_info_for_info_tuple(struct info_tuple *itpl, struct tcp_info *ti)
        struct inpcb *inp = NULL;
        struct socket *so;
        struct tcpcb *tp;
        struct inpcb *inp = NULL;
        struct socket *so;
        struct tcpcb *tp;
-       
+
        if (itpl->itpl_proto == IPPROTO_TCP)
                pcbinfo = &tcbinfo;
        else
                return EINVAL;
        if (itpl->itpl_proto == IPPROTO_TCP)
                pcbinfo = &tcbinfo;
        else
                return EINVAL;
-       
+
        if (itpl->itpl_local_sa.sa_family == AF_INET &&
                itpl->itpl_remote_sa.sa_family == AF_INET) {
        if (itpl->itpl_local_sa.sa_family == AF_INET &&
                itpl->itpl_remote_sa.sa_family == AF_INET) {
-               inp = in_pcblookup_hash(pcbinfo, 
+               inp = in_pcblookup_hash(pcbinfo,
                        itpl->itpl_remote_sin.sin_addr,
                        itpl->itpl_remote_sin.sin_port,
                        itpl->itpl_local_sin.sin_addr,
                        itpl->itpl_remote_sin.sin_addr,
                        itpl->itpl_remote_sin.sin_port,
                        itpl->itpl_local_sin.sin_addr,
@@ -1671,18 +1664,18 @@ tcp_fill_info_for_info_tuple(struct info_tuple *itpl, struct tcp_info *ti)
                itpl->itpl_remote_sa.sa_family == AF_INET6) {
                struct in6_addr ina6_local;
                struct in6_addr ina6_remote;
                itpl->itpl_remote_sa.sa_family == AF_INET6) {
                struct in6_addr ina6_local;
                struct in6_addr ina6_remote;
-               
+
                ina6_local = itpl->itpl_local_sin6.sin6_addr;
                ina6_local = itpl->itpl_local_sin6.sin6_addr;
-               if (IN6_IS_SCOPE_LINKLOCAL(&ina6_local) && 
+               if (IN6_IS_SCOPE_LINKLOCAL(&ina6_local) &&
                        itpl->itpl_local_sin6.sin6_scope_id)
                        ina6_local.s6_addr16[1] = htons(itpl->itpl_local_sin6.sin6_scope_id);
 
                ina6_remote = itpl->itpl_remote_sin6.sin6_addr;
                        itpl->itpl_local_sin6.sin6_scope_id)
                        ina6_local.s6_addr16[1] = htons(itpl->itpl_local_sin6.sin6_scope_id);
 
                ina6_remote = itpl->itpl_remote_sin6.sin6_addr;
-               if (IN6_IS_SCOPE_LINKLOCAL(&ina6_remote) && 
+               if (IN6_IS_SCOPE_LINKLOCAL(&ina6_remote) &&
                        itpl->itpl_remote_sin6.sin6_scope_id)
                        ina6_remote.s6_addr16[1] = htons(itpl->itpl_remote_sin6.sin6_scope_id);
                        itpl->itpl_remote_sin6.sin6_scope_id)
                        ina6_remote.s6_addr16[1] = htons(itpl->itpl_remote_sin6.sin6_scope_id);
-               
-               inp = in6_pcblookup_hash(pcbinfo, 
+
+               inp = in6_pcblookup_hash(pcbinfo,
                        &ina6_remote,
                        itpl->itpl_remote_sin6.sin6_port,
                        &ina6_local,
                        &ina6_remote,
                        itpl->itpl_remote_sin6.sin6_port,
                        &ina6_local,
@@ -1744,6 +1737,7 @@ tcp_connection_fill_info(struct tcpcb *tp, struct tcp_connection_info *tci)
                tci->tcpi_txpackets = inp->inp_stat->txpackets;
                tci->tcpi_txbytes = inp->inp_stat->txbytes;
                tci->tcpi_txretransmitbytes = tp->t_stat.txretransmitbytes;
                tci->tcpi_txpackets = inp->inp_stat->txpackets;
                tci->tcpi_txbytes = inp->inp_stat->txbytes;
                tci->tcpi_txretransmitbytes = tp->t_stat.txretransmitbytes;
+               tci->tcpi_txretransmitpackets = tp->t_stat.rxmitpkts;
                tci->tcpi_rxpackets = inp->inp_stat->rxpackets;
                tci->tcpi_rxbytes = inp->inp_stat->rxbytes;
                tci->tcpi_rxoutoforderbytes = tp->t_stat.rxoutoforderbytes;
                tci->tcpi_rxpackets = inp->inp_stat->rxpackets;
                tci->tcpi_rxbytes = inp->inp_stat->rxbytes;
                tci->tcpi_rxoutoforderbytes = tp->t_stat.rxoutoforderbytes;
@@ -1757,16 +1751,23 @@ tcp_connection_fill_info(struct tcpcb *tp, struct tcp_connection_info *tci)
                tci->tcpi_tfo_syn_data_sent = !!(tp->t_tfo_stats & TFO_S_SYN_DATA_SENT);
                tci->tcpi_tfo_syn_data_acked = !!(tp->t_tfo_stats & TFO_S_SYN_DATA_ACKED);
                tci->tcpi_tfo_syn_loss = !!(tp->t_tfo_stats & TFO_S_SYN_LOSS);
                tci->tcpi_tfo_syn_data_sent = !!(tp->t_tfo_stats & TFO_S_SYN_DATA_SENT);
                tci->tcpi_tfo_syn_data_acked = !!(tp->t_tfo_stats & TFO_S_SYN_DATA_ACKED);
                tci->tcpi_tfo_syn_loss = !!(tp->t_tfo_stats & TFO_S_SYN_LOSS);
+               tci->tcpi_tfo_cookie_wrong = !!(tp->t_tfo_stats & TFO_S_COOKIE_WRONG);
+               tci->tcpi_tfo_no_cookie_rcv = !!(tp->t_tfo_stats & TFO_S_NO_COOKIE_RCV);
+               tci->tcpi_tfo_heuristics_disable = !!(tp->t_tfo_stats & TFO_S_HEURISTICS_DISABLE);
+               tci->tcpi_tfo_send_blackhole = !!(tp->t_tfo_stats & TFO_S_SEND_BLACKHOLE);
+               tci->tcpi_tfo_recv_blackhole = !!(tp->t_tfo_stats & TFO_S_RECV_BLACKHOLE);
+               tci->tcpi_tfo_onebyte_proxy = !!(tp->t_tfo_stats & TFO_S_ONE_BYTE_PROXY);
        }
 }
 
 
        }
 }
 
 
-__private_extern__ int 
+__private_extern__ int
 tcp_sysctl_info(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
 {
        int error;
 tcp_sysctl_info(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused int arg2, struct sysctl_req *req)
 {
        int error;
-       struct tcp_info ti;
+       struct tcp_info ti = {};
        struct info_tuple itpl;
        struct info_tuple itpl;
+#if !CONFIG_EMBEDDED
        proc_t caller = PROC_NULL;
        proc_t caller_parent = PROC_NULL;
        char command_name[MAXCOMLEN + 1] = "";
        proc_t caller = PROC_NULL;
        proc_t caller_parent = PROC_NULL;
        char command_name[MAXCOMLEN + 1] = "";
@@ -1802,6 +1803,7 @@ tcp_sysctl_info(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused
 
        if (caller != PROC_NULL)
                proc_rele(caller);
 
        if (caller != PROC_NULL)
                proc_rele(caller);
+#endif /* !CONFIG_EMBEDDED */
 
        if (req->newptr == USER_ADDR_NULL) {
                return EINVAL;
 
        if (req->newptr == USER_ADDR_NULL) {
                return EINVAL;
@@ -1821,7 +1823,7 @@ tcp_sysctl_info(__unused struct sysctl_oid *oidp, __unused void *arg1, __unused
        if (error != 0) {
                return error;
        }
        if (error != 0) {
                return error;
        }
-       
+
        return 0;
 }
 
        return 0;
 }
 
@@ -1831,12 +1833,12 @@ tcp_lookup_peer_pid_locked(struct socket *so, pid_t *out_pid)
        int error = EHOSTUNREACH;
        *out_pid = -1;
        if ((so->so_state & SS_ISCONNECTED) == 0) return ENOTCONN;
        int error = EHOSTUNREACH;
        *out_pid = -1;
        if ((so->so_state & SS_ISCONNECTED) == 0) return ENOTCONN;
-       
+
        struct inpcb    *inp = (struct inpcb*)so->so_pcb;
        uint16_t                lport = inp->inp_lport;
        uint16_t                fport = inp->inp_fport;
        struct inpcb    *finp = NULL;
        struct inpcb    *inp = (struct inpcb*)so->so_pcb;
        uint16_t                lport = inp->inp_lport;
        uint16_t                fport = inp->inp_fport;
        struct inpcb    *finp = NULL;
-       
+
        if (inp->inp_vflag & INP_IPV6) {
                struct  in6_addr        laddr6 = inp->in6p_laddr;
                struct  in6_addr        faddr6 = inp->in6p_faddr;
        if (inp->inp_vflag & INP_IPV6) {
                struct  in6_addr        laddr6 = inp->in6p_laddr;
                struct  in6_addr        faddr6 = inp->in6p_faddr;
@@ -1850,13 +1852,17 @@ tcp_lookup_peer_pid_locked(struct socket *so, pid_t *out_pid)
                finp = in_pcblookup_hash(&tcbinfo, laddr4, lport, faddr4, fport, 0, NULL);
                socket_lock(so, 0);
        }
                finp = in_pcblookup_hash(&tcbinfo, laddr4, lport, faddr4, fport, 0, NULL);
                socket_lock(so, 0);
        }
-       
+
        if (finp) {
                *out_pid = finp->inp_socket->last_pid;
                error = 0;
        if (finp) {
                *out_pid = finp->inp_socket->last_pid;
                error = 0;
-               in_pcb_checkstate(finp, WNT_RELEASE, 0);
+               /* Avoid deadlock due to same inpcb for loopback socket */
+               if (inp == finp)
+                       in_pcb_checkstate(finp, WNT_RELEASE, 1);
+               else
+                       in_pcb_checkstate(finp, WNT_RELEASE, 0);
        }
        }
-       
+
        return error;
 }
 
        return error;
 }
 
@@ -1875,15 +1881,12 @@ tcp_getconninfo(struct socket *so, struct conninfo_tcp *tcp_ci)
  * splnet() any more.  This needs more examination.)
  */
 int
  * splnet() any more.  This needs more examination.)
  */
 int
-tcp_ctloutput(so, sopt)
-       struct socket *so;
-       struct sockopt *sopt;
+tcp_ctloutput(struct socket *so, struct sockopt *sopt)
 {
 {
-       int     error, opt, optval;
+       int     error = 0, opt = 0, optval = 0;
        struct  inpcb *inp;
        struct  tcpcb *tp;
 
        struct  inpcb *inp;
        struct  tcpcb *tp;
 
-       error = 0;
        inp = sotoinpcb(so);
        if (inp == NULL) {
                return (ECONNRESET);
        inp = sotoinpcb(so);
        if (inp == NULL) {
                return (ECONNRESET);
@@ -1998,7 +2001,7 @@ tcp_ctloutput(so, sopt)
                                error = EINVAL;
                                break;
                        }
                                error = EINVAL;
                                break;
                        }
-                       minpkts = (in.min_burst_size != 0) ? in.min_burst_size : 
+                       minpkts = (in.min_burst_size != 0) ? in.min_burst_size :
                                tp->t_bwmeas->bw_minsizepkts;
                        maxpkts = (in.max_burst_size != 0) ? in.max_burst_size :
                                tp->t_bwmeas->bw_maxsizepkts;
                                tp->t_bwmeas->bw_minsizepkts;
                        maxpkts = (in.max_burst_size != 0) ? in.max_burst_size :
                                tp->t_bwmeas->bw_maxsizepkts;
@@ -2035,7 +2038,7 @@ tcp_ctloutput(so, sopt)
                        } else {
                                tp->t_keepidle = optval * TCP_RETRANSHZ;
                                /* reset the timer to new value */
                        } else {
                                tp->t_keepidle = optval * TCP_RETRANSHZ;
                                /* reset the timer to new value */
-                               tp->t_timer[TCPT_KEEP] = OFFSET_FROM_START(tp, 
+                               tp->t_timer[TCPT_KEEP] = OFFSET_FROM_START(tp,
                                        TCP_CONN_KEEPIDLE(tp));
                                tcp_check_timer_state(tp);
                        }
                                        TCP_CONN_KEEPIDLE(tp));
                                tcp_check_timer_state(tp);
                        }
@@ -2095,6 +2098,21 @@ tcp_ctloutput(so, sopt)
                        }
                        break;
 
                        }
                        break;
 
+               case TCP_KEEPALIVE_OFFLOAD:
+                       error = sooptcopyin(sopt, &optval, sizeof(optval),
+                               sizeof(optval));
+                       if (error)
+                               break;
+                       if (optval < 0 || optval > INT32_MAX) {
+                               error = EINVAL;
+                               break;
+                       }
+                       if (optval != 0)
+                               inp->inp_flags2 |= INP2_KEEPALIVE_OFFLOAD;
+                       else
+                               inp->inp_flags2 &= ~INP2_KEEPALIVE_OFFLOAD;
+                       break;
+
                case PERSIST_TIMEOUT:
                        error = sooptcopyin(sopt, &optval, sizeof optval,
                                                sizeof optval);
                case PERSIST_TIMEOUT:
                        error = sooptcopyin(sopt, &optval, sizeof optval,
                                                sizeof optval);
@@ -2102,7 +2120,7 @@ tcp_ctloutput(so, sopt)
                                break;
                        if (optval < 0)
                                error = EINVAL;
                                break;
                        if (optval < 0)
                                error = EINVAL;
-                       else 
+                       else
                                tp->t_persist_timeout = optval * TCP_RETRANSHZ;
                        break;
                case TCP_RXT_CONNDROPTIME:
                                tp->t_persist_timeout = optval * TCP_RETRANSHZ;
                        break;
                case TCP_RXT_CONNDROPTIME:
@@ -2127,7 +2145,7 @@ tcp_ctloutput(so, sopt)
                                if (optval == 0) {
                                        so->so_flags &= ~(SOF_NOTSENT_LOWAT);
                                        tp->t_notsent_lowat = 0;
                                if (optval == 0) {
                                        so->so_flags &= ~(SOF_NOTSENT_LOWAT);
                                        tp->t_notsent_lowat = 0;
-                               } else { 
+                               } else {
                                        so->so_flags |= SOF_NOTSENT_LOWAT;
                                        tp->t_notsent_lowat = optval;
                                }
                                        so->so_flags |= SOF_NOTSENT_LOWAT;
                                        tp->t_notsent_lowat = optval;
                                }
@@ -2138,13 +2156,16 @@ tcp_ctloutput(so, sopt)
                            sizeof(optval));
                        if (error)
                                break;
                            sizeof(optval));
                        if (error)
                                break;
-                       if (optval < 0 || 
+                       if (optval < 0 ||
                            optval > TCP_ADAPTIVE_TIMEOUT_MAX) {
                                error = EINVAL;
                                break;
                        } else if (optval == 0) {
                                tp->t_adaptive_rtimo = 0;
                                tcp_keepalive_reset(tp);
                            optval > TCP_ADAPTIVE_TIMEOUT_MAX) {
                                error = EINVAL;
                                break;
                        } else if (optval == 0) {
                                tp->t_adaptive_rtimo = 0;
                                tcp_keepalive_reset(tp);
+
+                               if (tp->t_mpsub)
+                                       mptcp_reset_keepalive(tp);
                        } else {
                                tp->t_adaptive_rtimo = optval;
                        }
                        } else {
                                tp->t_adaptive_rtimo = optval;
                        }
@@ -2154,7 +2175,7 @@ tcp_ctloutput(so, sopt)
                            sizeof (optval));
                        if (error)
                                break;
                            sizeof (optval));
                        if (error)
                                break;
-                       if (optval < 0 || 
+                       if (optval < 0 ||
                            optval > TCP_ADAPTIVE_TIMEOUT_MAX) {
                                error = EINVAL;
                                break;
                            optval > TCP_ADAPTIVE_TIMEOUT_MAX) {
                                error = EINVAL;
                                break;
@@ -2180,13 +2201,13 @@ tcp_ctloutput(so, sopt)
                                }
 
                                /*
                                }
 
                                /*
-                                * allocate memory for storing message 
+                                * allocate memory for storing message
                                 * related state
                                 */
                                VERIFY(so->so_msg_state == NULL);
                                 * related state
                                 */
                                VERIFY(so->so_msg_state == NULL);
-                               MALLOC(so->so_msg_state, 
+                               MALLOC(so->so_msg_state,
                                        struct msg_state *,
                                        struct msg_state *,
-                                       sizeof(struct msg_state), 
+                                       sizeof(struct msg_state),
                                        M_TEMP, M_WAITOK | M_ZERO);
                                if (so->so_msg_state == NULL) {
                                        error = ENOMEM;
                                        M_TEMP, M_WAITOK | M_ZERO);
                                if (so->so_msg_state == NULL) {
                                        error = ENOMEM;
@@ -2196,9 +2217,9 @@ tcp_ctloutput(so, sopt)
                                /* Enable message delivery */
                                so->so_flags |= SOF_ENABLE_MSGS;
                        } else {
                                /* Enable message delivery */
                                so->so_flags |= SOF_ENABLE_MSGS;
                        } else {
-                               /* 
-                                * Can't disable message delivery on socket 
-                                * because of restrictions imposed by 
+                               /*
+                                * Can't disable message delivery on socket
+                                * because of restrictions imposed by
                                 * encoding/decoding
                                 */
                                error = EINVAL;
                                 * encoding/decoding
                                 */
                                error = EINVAL;
@@ -2256,6 +2277,27 @@ tcp_ctloutput(so, sopt)
                        else
                                tcp_disable_tfo(tp);
                        break;
                        else
                                tcp_disable_tfo(tp);
                        break;
+               case TCP_FASTOPEN_FORCE_HEURISTICS:
+                       error = sooptcopyin(sopt, &optval, sizeof(optval),
+                               sizeof(optval));
+
+                       if (error)
+                               break;
+                       if (optval < 0 || optval > 1) {
+                               error = EINVAL;
+                               break;
+                       }
+
+                       if (tp->t_state != TCPS_CLOSED) {
+                               error =  EINVAL;
+                               break;
+                       }
+                       if (optval)
+                               tp->t_flagsext |= TF_FASTOPEN_HEUR;
+                       else
+                               tp->t_flagsext &= ~TF_FASTOPEN_HEUR;
+
+                       break;
                case TCP_ENABLE_ECN:
                        error = sooptcopyin(sopt, &optval, sizeof optval,
                                            sizeof optval);
                case TCP_ENABLE_ECN:
                        error = sooptcopyin(sopt, &optval, sizeof optval,
                                            sizeof optval);
@@ -2266,6 +2308,7 @@ tcp_ctloutput(so, sopt)
                                tp->ecn_flags &= ~TE_ECN_MODE_DISABLE;
                        } else {
                                tp->ecn_flags &= ~TE_ECN_MODE_ENABLE;
                                tp->ecn_flags &= ~TE_ECN_MODE_DISABLE;
                        } else {
                                tp->ecn_flags &= ~TE_ECN_MODE_ENABLE;
+                               tp->ecn_flags |= TE_ECN_MODE_DISABLE;
                        }
                        break;
                case TCP_ECN_MODE:
                        }
                        break;
                case TCP_ECN_MODE:
@@ -2286,6 +2329,30 @@ tcp_ctloutput(so, sopt)
                                error = EINVAL;
                        }
                        break;
                                error = EINVAL;
                        }
                        break;
+               case TCP_NOTIFY_ACKNOWLEDGEMENT:
+                       error = sooptcopyin(sopt, &optval,
+                           sizeof(optval), sizeof(optval));
+                       if (error)
+                               break;
+                       if (optval <= 0) {
+                               error = EINVAL;
+                               break;
+                       }
+                       if (tp->t_notify_ack_count >= TCP_MAX_NOTIFY_ACK) {
+                               error = ETOOMANYREFS;
+                               break;
+                       }
+
+                       /*
+                        * validate that the given marker id is not
+                        * a duplicate to avoid ambiguity
+                        */
+                       if ((error = tcp_notify_ack_id_valid(tp, so,
+                           optval)) != 0) {
+                               break;
+                       }
+                       error = tcp_add_notify_ack_marker(tp, optval);
+                       break;
                case SO_FLUSH:
                        if ((error = sooptcopyin(sopt, &optval, sizeof (optval),
                            sizeof (optval))) != 0)
                case SO_FLUSH:
                        if ((error = sooptcopyin(sopt, &optval, sizeof (optval),
                            sizeof (optval))) != 0)
@@ -2307,7 +2374,24 @@ tcp_ctloutput(so, sopt)
                                    TRAFFIC_MGT_SO_BACKGROUND);
                        }
                        break;
                                    TRAFFIC_MGT_SO_BACKGROUND);
                        }
                        break;
-
+               case TCP_RXT_MINIMUM_TIMEOUT:
+                       error = sooptcopyin(sopt, &optval, sizeof(optval),
+                           sizeof(optval));
+                       if (error)
+                               break;
+                       if (optval < 0) {
+                               error = EINVAL;
+                               break;
+                       }
+                       if (optval == 0) {
+                               tp->t_rxt_minimum_timeout = 0;
+                       } else {
+                               tp->t_rxt_minimum_timeout = min(optval,
+                                   TCP_RXT_MINIMUM_TIMEOUT_LIMIT);
+                               /* convert to milliseconds */
+                               tp->t_rxt_minimum_timeout *= TCP_RETRANSHZ;
+                       }
+                       break;
                default:
                        error = ENOPROTOOPT;
                        break;
                default:
                        error = ENOPROTOOPT;
                        break;
@@ -2323,13 +2407,25 @@ tcp_ctloutput(so, sopt)
                        optval = tp->t_maxseg;
                        break;
                case TCP_KEEPALIVE:
                        optval = tp->t_maxseg;
                        break;
                case TCP_KEEPALIVE:
-                       optval = tp->t_keepidle / TCP_RETRANSHZ;
+                       if (tp->t_keepidle > 0)
+                               optval = tp->t_keepidle / TCP_RETRANSHZ;
+                       else
+                               optval = tcp_keepidle  / TCP_RETRANSHZ;
                        break;
                case TCP_KEEPINTVL:
                        break;
                case TCP_KEEPINTVL:
-                       optval = tp->t_keepintvl / TCP_RETRANSHZ;
+                       if (tp->t_keepintvl > 0)
+                               optval = tp->t_keepintvl / TCP_RETRANSHZ;
+                       else
+                               optval = tcp_keepintvl / TCP_RETRANSHZ;
                        break;
                case TCP_KEEPCNT:
                        break;
                case TCP_KEEPCNT:
-                       optval = tp->t_keepcnt;
+                       if (tp->t_keepcnt > 0)
+                               optval = tp->t_keepcnt;
+                       else
+                               optval = tcp_keepcnt;
+                       break;
+               case TCP_KEEPALIVE_OFFLOAD:
+                       optval = !!(inp->inp_flags2 & INP2_KEEPALIVE_OFFLOAD);
                        break;
                case TCP_NOOPT:
                        optval = tp->t_flags & TF_NOOPT;
                        break;
                case TCP_NOOPT:
                        optval = tp->t_flags & TF_NOOPT;
@@ -2359,7 +2455,7 @@ tcp_ctloutput(so, sopt)
                        break;
                case TCP_RXT_FINDROP:
                        optval = tp->t_flagsext & TF_RXTFINDROP;
                        break;
                case TCP_RXT_FINDROP:
                        optval = tp->t_flagsext & TF_RXTFINDROP;
-                       break; 
+                       break;
                case TCP_NOTIMEWAIT:
                        optval = (tp->t_flagsext & TF_NOTIMEWAIT) ? 1 : 0;
                        break;
                case TCP_NOTIMEWAIT:
                        optval = (tp->t_flagsext & TF_NOTIMEWAIT) ? 1 : 0;
                        break;
@@ -2371,6 +2467,9 @@ tcp_ctloutput(so, sopt)
                        }
                        optval = tfo_enabled(tp);
                        break;
                        }
                        optval = tfo_enabled(tp);
                        break;
+               case TCP_FASTOPEN_FORCE_HEURISTICS:
+                       optval = (tp->t_flagsext & TF_FASTOPEN_HEUR) ? 1 : 0;
+                       break;
                case TCP_MEASURE_SND_BW:
                        optval = tp->t_flagsext & TF_MEASURESNDBW;
                        break;
                case TCP_MEASURE_SND_BW:
                        optval = tp->t_flagsext & TF_MEASURESNDBW;
                        break;
@@ -2390,7 +2489,7 @@ tcp_ctloutput(so, sopt)
                        goto done;
                }
                case TCP_MEASURE_BW_BURST: {
                        goto done;
                }
                case TCP_MEASURE_BW_BURST: {
-                       struct tcp_measure_bw_burst out;
+                       struct tcp_measure_bw_burst out = {};
                        if ((tp->t_flagsext & TF_MEASURESNDBW) == 0 ||
                                tp->t_bwmeas == NULL) {
                                error = EINVAL;
                        if ((tp->t_flagsext & TF_MEASURESNDBW) == 0 ||
                                tp->t_bwmeas == NULL) {
                                error = EINVAL;
@@ -2442,8 +2541,26 @@ tcp_ctloutput(so, sopt)
                        optval = tp->t_adaptive_wtimo;
                        break;
                case SO_TRAFFIC_MGT_BACKGROUND:
                        optval = tp->t_adaptive_wtimo;
                        break;
                case SO_TRAFFIC_MGT_BACKGROUND:
-                       optval = (so->so_traffic_mgt_flags &
-                           TRAFFIC_MGT_SO_BACKGROUND) ? 1 : 0;
+                       optval = (so->so_flags1 &
+                           SOF1_TRAFFIC_MGT_SO_BACKGROUND) ? 1 : 0;
+                       break;
+               case TCP_NOTIFY_ACKNOWLEDGEMENT: {
+                       struct tcp_notify_ack_complete retid;
+
+                       if (sopt->sopt_valsize != sizeof (retid)) {
+                               error = EINVAL;
+                               break;
+                       }
+                       bzero(&retid, sizeof (retid));
+                       tcp_get_notify_ack_count(tp, &retid);
+                       if (retid.notify_complete_count > 0)
+                               tcp_get_notify_ack_ids(tp, &retid);
+
+                       error = sooptcopyout(sopt, &retid, sizeof (retid));
+                       goto done;
+               }
+               case TCP_RXT_MINIMUM_TIMEOUT:
+                       optval = tp->t_rxt_minimum_timeout / TCP_RETRANSHZ;
                        break;
                default:
                        error = ENOPROTOOPT;
                        break;
                default:
                        error = ENOPROTOOPT;
@@ -2469,10 +2586,12 @@ u_int32_t       tcp_recvspace = 1448*384;
  * sb_max in sbreserve. Disallow setting the tcp send and recv space
  * to be more than sb_max because that will cause tcp_attach to fail
  * (see radar 5713060)
  * sb_max in sbreserve. Disallow setting the tcp send and recv space
  * to be more than sb_max because that will cause tcp_attach to fail
  * (see radar 5713060)
- */  
+ */
 static int
 sysctl_tcp_sospace(struct sysctl_oid *oidp, __unused void *arg1,
 static int
 sysctl_tcp_sospace(struct sysctl_oid *oidp, __unused void *arg1,
-       __unused int arg2, struct sysctl_req *req) {
+       int arg2, struct sysctl_req *req)
+{
+#pragma unused(arg2)
        u_int32_t new_value = 0, *space_p = NULL;
        int changed = 0, error = 0;
        u_quad_t sb_effective_max = (sb_max / (MSIZE+MCLBYTES)) * MCLBYTES;
        u_int32_t new_value = 0, *space_p = NULL;
        int changed = 0, error = 0;
        u_quad_t sb_effective_max = (sb_max / (MSIZE+MCLBYTES)) * MCLBYTES;
@@ -2492,6 +2611,7 @@ sysctl_tcp_sospace(struct sysctl_oid *oidp, __unused void *arg1,
        if (changed) {
                if (new_value > 0 && new_value <= sb_effective_max) {
                        *space_p = new_value;
        if (changed) {
                if (new_value > 0 && new_value <= sb_effective_max) {
                        *space_p = new_value;
+                       SYSCTL_SKMEM_UPDATE_AT_OFFSET(arg2, new_value);
                } else {
                        error = ERANGE;
                }
                } else {
                        error = ERANGE;
                }
@@ -2499,19 +2619,21 @@ sysctl_tcp_sospace(struct sysctl_oid *oidp, __unused void *arg1,
        return error;
 }
 
        return error;
 }
 
+#if SYSCTL_SKMEM
+SYSCTL_PROC(_net_inet_tcp, TCPCTL_SENDSPACE, sendspace,
+                       CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, &tcp_sendspace,
+                       offsetof(skmem_sysctl, tcp.sendspace), sysctl_tcp_sospace,
+                       "IU", "Maximum outgoing TCP datagram size");
+SYSCTL_PROC(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace,
+                       CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, &tcp_recvspace,
+                       offsetof(skmem_sysctl, tcp.recvspace), sysctl_tcp_sospace,
+                       "IU", "Maximum incoming TCP datagram size");
+#else /* SYSCTL_SKMEM */
 SYSCTL_PROC(_net_inet_tcp, TCPCTL_SENDSPACE, sendspace, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &tcp_sendspace , 0, &sysctl_tcp_sospace, "IU", "Maximum outgoing TCP datagram size");
 SYSCTL_PROC(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &tcp_recvspace , 0, &sysctl_tcp_sospace, "IU", "Maximum incoming TCP datagram size");
 SYSCTL_PROC(_net_inet_tcp, TCPCTL_SENDSPACE, sendspace, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &tcp_sendspace , 0, &sysctl_tcp_sospace, "IU", "Maximum outgoing TCP datagram size");
 SYSCTL_PROC(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &tcp_recvspace , 0, &sysctl_tcp_sospace, "IU", "Maximum incoming TCP datagram size");
-
-/* Sysctl for testing and tuning the connectx with data api */
-#define TCP_PRECONNECT_SBSZ_MAX 1460
-#define TCP_PRECONNECT_SBSZ_MIN (TCP_MSS)
-#define TCP_PRECONNECT_SBSZ_DEF        (TCP6_MSS)
-static int tcp_preconnect_sbspace = TCP_PRECONNECT_SBSZ_DEF;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, preconn_sbsz, CTLFLAG_RW | CTLFLAG_LOCKED,
-    &tcp_preconnect_sbspace, 0, "Maximum preconnect space");
-
+#endif /* SYSCTL_SKMEM */
 
 /*
  * Attach TCP protocol to socket, allocating
 
 /*
  * Attach TCP protocol to socket, allocating
@@ -2525,11 +2647,9 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, preconn_sbsz, CTLFLAG_RW | CTLFLAG_LOCKED,
  *     soreserve:ENOBUFS
  */
 static int
  *     soreserve:ENOBUFS
  */
 static int
-tcp_attach(so, p)
-       struct socket *so;
-       struct proc *p;
+tcp_attach(struct socket *so, struct proc *p)
 {
 {
-       register struct tcpcb *tp;
+       struct tcpcb *tp;
        struct inpcb *inp;
        int error;
 #if INET6
        struct inpcb *inp;
        int error;
 #if INET6
@@ -2549,8 +2669,7 @@ tcp_attach(so, p)
        }
 
        if (so->so_snd.sb_preconn_hiwat == 0) {
        }
 
        if (so->so_snd.sb_preconn_hiwat == 0) {
-               soreserve_preconnect(so, imin(TCP_PRECONNECT_SBSZ_MAX,
-                   imax(tcp_preconnect_sbspace, TCP_PRECONNECT_SBSZ_MIN)));
+               soreserve_preconnect(so, 2048);
        }
 
        if ((so->so_rcv.sb_flags & SB_USRSIZE) == 0)
        }
 
        if ((so->so_rcv.sb_flags & SB_USRSIZE) == 0)
@@ -2595,11 +2714,13 @@ tcp_attach(so, p)
  * send segment to peer (with FIN).
  */
 static struct tcpcb *
  * send segment to peer (with FIN).
  */
 static struct tcpcb *
-tcp_disconnect(tp)
-       register struct tcpcb *tp;
+tcp_disconnect(struct tcpcb *tp)
 {
        struct socket *so = tp->t_inpcb->inp_socket;
 
 {
        struct socket *so = tp->t_inpcb->inp_socket;
 
+       if (so->so_rcv.sb_cc != 0 || tp->t_reassqlen != 0)
+               return tcp_drop(tp, 0);
+
        if (tp->t_state < TCPS_ESTABLISHED)
                tp = tcp_close(tp);
        else if ((so->so_options & SO_LINGER) && so->so_linger == 0)
        if (tp->t_state < TCPS_ESTABLISHED)
                tp = tcp_close(tp);
        else if ((so->so_options & SO_LINGER) && so->so_linger == 0)
@@ -2631,10 +2752,8 @@ tcp_disconnect(tp)
  * We can let the user exit from the close as soon as the FIN is acked.
  */
 static struct tcpcb *
  * We can let the user exit from the close as soon as the FIN is acked.
  */
 static struct tcpcb *
-tcp_usrclosed(tp)
-       register struct tcpcb *tp;
+tcp_usrclosed(struct tcpcb *tp)
 {
 {
-
        switch (tp->t_state) {
 
        case TCPS_CLOSED:
        switch (tp->t_state) {
 
        case TCPS_CLOSED:
@@ -2648,17 +2767,17 @@ tcp_usrclosed(tp)
                break;
 
        case TCPS_ESTABLISHED:
                break;
 
        case TCPS_ESTABLISHED:
-               DTRACE_TCP4(state__change, void, NULL, 
+               DTRACE_TCP4(state__change, void, NULL,
                        struct inpcb *, tp->t_inpcb,
                        struct inpcb *, tp->t_inpcb,
-                       struct tcpcb *, tp, 
+                       struct tcpcb *, tp,
                        int32_t, TCPS_FIN_WAIT_1);
                tp->t_state = TCPS_FIN_WAIT_1;
                break;
 
        case TCPS_CLOSE_WAIT:
                        int32_t, TCPS_FIN_WAIT_1);
                tp->t_state = TCPS_FIN_WAIT_1;
                break;
 
        case TCPS_CLOSE_WAIT:
-               DTRACE_TCP4(state__change, void, NULL, 
+               DTRACE_TCP4(state__change, void, NULL,
                        struct inpcb *, tp->t_inpcb,
                        struct inpcb *, tp->t_inpcb,
-                       struct tcpcb *, tp, 
+                       struct tcpcb *, tp,
                        int32_t, TCPS_LAST_ACK);
                tp->t_state = TCPS_LAST_ACK;
                break;
                        int32_t, TCPS_LAST_ACK);
                tp->t_state = TCPS_LAST_ACK;
                break;
@@ -2667,7 +2786,7 @@ tcp_usrclosed(tp)
                soisdisconnected(tp->t_inpcb->inp_socket);
                /* To prevent the connection hanging in FIN_WAIT_2 forever. */
                if (tp->t_state == TCPS_FIN_WAIT_2)
                soisdisconnected(tp->t_inpcb->inp_socket);
                /* To prevent the connection hanging in FIN_WAIT_2 forever. */
                if (tp->t_state == TCPS_FIN_WAIT_2)
-                       tp->t_timer[TCPT_2MSL] = OFFSET_FROM_START(tp, 
+                       tp->t_timer[TCPT_2MSL] = OFFSET_FROM_START(tp,
                                TCP_CONN_MAXIDLE(tp));
        }
        return (tp);
                                TCP_CONN_MAXIDLE(tp));
        }
        return (tp);
@@ -2702,12 +2821,12 @@ tcp_out6_cksum_stats(u_int32_t len)
        tcpstat.tcps_snd6_swcsum_bytes += len;
 }
 
        tcpstat.tcps_snd6_swcsum_bytes += len;
 }
 
-/* 
+/*
  * When messages are enabled on a TCP socket, the message priority
  * is sent as a control message. This function will extract it.
  */
 int
  * When messages are enabled on a TCP socket, the message priority
  * is sent as a control message. This function will extract it.
  */
 int
-tcp_get_msg_priority(struct mbuf *control, uint32_t *msgpri) 
+tcp_get_msg_priority(struct mbuf *control, uint32_t *msgpri)
 {
        struct cmsghdr *cm;
        if (control == NULL)
 {
        struct cmsghdr *cm;
        if (control == NULL)
@@ -2726,7 +2845,7 @@ tcp_get_msg_priority(struct mbuf *control, uint32_t *msgpri)
                }
        }
 
                }
        }
 
-       VERIFY(*msgpri >= MSG_PRI_MIN && *msgpri <= MSG_PRI_MAX); 
+       VERIFY(*msgpri >= MSG_PRI_MIN && *msgpri <= MSG_PRI_MAX);
        return (0);
 }
 #endif /* INET6 */
        return (0);
 }
 #endif /* INET6 */
mirror of XNU