]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/netinet/udp_usrreq.c
xnu-3789.51.2.tar.gz
[apple/xnu.git] / bsd / netinet / udp_usrreq.c
index 1b2bd8b1fec4cf81ef82f6c647b3b0745d33fea1..698aea8b6d4ff4fe4a615f7510d970abd695e023 100644 (file)
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2000-2013 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2016 Apple Inc. All rights reserved.
  *
  * @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
  * 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.
- * 
+ *
  * 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.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
@@ -58,7 +58,6 @@
  * SUCH DAMAGE.
  *
  *     @(#)udp_usrreq.c        8.6 (Berkeley) 5/23/95
- * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.64.2.13 2001/08/08 18:59:54 ghelmer Exp $
  */
 
 #include <sys/param.h>
@@ -85,6 +84,7 @@
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
+#include <netinet/in_tclass.h>
 #include <netinet/ip.h>
 #if INET6
 #include <netinet/ip6.h>
@@ -110,6 +110,14 @@ extern int ipsec_bypass;
 extern int esp_udp_encap_port;
 #endif /* IPSEC */
 
+#if NECP
+#include <net/necp.h>
+#endif /* NECP */
+
+#if FLOW_DIVERT
+#include <netinet/flow_divert.h>
+#endif /* FLOW_DIVERT */
+
 #define        DBG_LAYER_IN_BEG        NETDBG_CODE(DBG_NETUDP, 0)
 #define        DBG_LAYER_IN_END        NETDBG_CODE(DBG_NETUDP, 2)
 #define        DBG_LAYER_OUT_BEG       NETDBG_CODE(DBG_NETUDP, 1)
@@ -131,18 +139,18 @@ SYSCTL_INT(_net_inet_udp, UDPCTL_CHECKSUM, checksum,
 
 int udp_log_in_vain = 0;
 SYSCTL_INT(_net_inet_udp, OID_AUTO, log_in_vain, CTLFLAG_RW | CTLFLAG_LOCKED,
-    &udp_log_in_vain, 0, "Log all incoming UDP packets");
+       &udp_log_in_vain, 0, "Log all incoming UDP packets");
 
 static int blackhole = 0;
 SYSCTL_INT(_net_inet_udp, OID_AUTO, blackhole, CTLFLAG_RW | CTLFLAG_LOCKED,
-    &blackhole, 0, "Do not send port unreachables for refused connects");
+       &blackhole, 0, "Do not send port unreachables for refused connects");
 
 struct inpcbhead udb;          /* from udp_var.h */
 #define        udb6    udb  /* for KAME src sync over BSD*'s */
 struct inpcbinfo udbinfo;
 
 #ifndef UDBHASHSIZE
-#define UDBHASHSIZE 16
+#define        UDBHASHSIZE 16
 #endif
 
 /* Garbage collection performed during most recent udp_gc() run */
@@ -150,37 +158,38 @@ static boolean_t udp_gc_done = FALSE;
 
 #if IPFIREWALL
 extern int fw_verbose;
-extern void ipfwsyslog( int level, const char *format,...);
+extern void ipfwsyslog(int level, const char *format, ...);
 extern void ipfw_stealth_stats_incr_udp(void);
 
 /* Apple logging, log to ipfw.log */
-#define log_in_vain_log(a) {                                           \
+#define        log_in_vain_log(a) {                                            \
        if ((udp_log_in_vain == 3) && (fw_verbose == 2)) {              \
                ipfwsyslog a;                                           \
        } else if ((udp_log_in_vain == 4) && (fw_verbose == 2)) {       \
-               ipfw_stealth_stats_incr_udp();                          \
+               ipfw_stealth_stats_incr_udp();                          \
        } else {                                                        \
                log a;                                                  \
        }                                                               \
 }
 #else /* !IPFIREWALL */
-#define log_in_vain_log( a ) { log a; }
+#define        log_in_vain_log(a) { log a; }
 #endif /* !IPFIREWALL */
 
 static int udp_getstat SYSCTL_HANDLER_ARGS;
 struct udpstat udpstat;        /* from udp_var.h */
-SYSCTL_PROC(_net_inet_udp, UDPCTL_STATS, stats, CTLFLAG_RD | CTLFLAG_LOCKED,
-    0, 0, udp_getstat, "S,udpstat",
-    "UDP statistics (struct udpstat, netinet/udp_var.h)");
+SYSCTL_PROC(_net_inet_udp, UDPCTL_STATS, stats,
+       CTLTYPE_STRUCT | CTLFLAG_RD | CTLFLAG_LOCKED,
+       0, 0, udp_getstat, "S,udpstat",
+       "UDP statistics (struct udpstat, netinet/udp_var.h)");
 
 SYSCTL_INT(_net_inet_udp, OID_AUTO, pcbcount,
-    CTLFLAG_RD | CTLFLAG_LOCKED, &udbinfo.ipi_count, 0,
-    "Number of active PCBs");
+       CTLFLAG_RD | CTLFLAG_LOCKED, &udbinfo.ipi_count, 0,
+       "Number of active PCBs");
 
 __private_extern__ int udp_use_randomport = 1;
 SYSCTL_INT(_net_inet_udp, OID_AUTO, randomize_ports,
-    CTLFLAG_RW | CTLFLAG_LOCKED, &udp_use_randomport, 0,
-    "Randomize UDP port numbers");
+       CTLFLAG_RW | CTLFLAG_LOCKED, &udp_use_randomport, 0,
+       "Randomize UDP port numbers");
 
 #if INET6
 struct udp_in6 {
@@ -196,12 +205,12 @@ static int udp_abort(struct socket *);
 static int udp_attach(struct socket *, int, struct proc *);
 static int udp_bind(struct socket *, struct sockaddr *, struct proc *);
 static int udp_connect(struct socket *, struct sockaddr *, struct proc *);
-static int udp_connectx(struct socket *, struct sockaddr_list **,
-    struct sockaddr_list **, struct proc *, uint32_t, associd_t, connid_t *,
-    uint32_t, void *, uint32_t);
+static int udp_connectx(struct socket *, struct sockaddr *,
+    struct sockaddr *, struct proc *, uint32_t, sae_associd_t,
+    sae_connid_t *, uint32_t, void *, uint32_t, struct uio *, user_ssize_t *);
 static int udp_detach(struct socket *);
 static int udp_disconnect(struct socket *);
-static int udp_disconnectx(struct socket *, associd_t, connid_t);
+static int udp_disconnectx(struct socket *, sae_associd_t, sae_connid_t);
 static int udp_send(struct socket *, int, struct mbuf *, struct sockaddr *,
     struct mbuf *, struct proc *);
 static void udp_append(struct inpcb *, struct ip *, struct mbuf *, int,
@@ -232,6 +241,7 @@ struct pr_usrreqs udp_usrreqs = {
        .pru_sockaddr =         in_getsockaddr,
        .pru_sosend =           sosend,
        .pru_soreceive =        soreceive,
+       .pru_soreceive_list =   soreceive_list,
 };
 
 void
@@ -296,6 +306,7 @@ udp_input(struct mbuf *m, int iphlen)
        struct ifnet *ifp = m->m_pkthdr.rcvif;
        boolean_t cell = IFNET_IS_CELLULAR(ifp);
        boolean_t wifi = (!cell && IFNET_IS_WIFI(ifp));
+       boolean_t wired = (!wifi && IFNET_IS_WIRED(ifp));
 
        bzero(&udp_in, sizeof (udp_in));
        udp_in.sin_len = sizeof (struct sockaddr_in);
@@ -308,7 +319,7 @@ udp_input(struct mbuf *m, int iphlen)
 
        udpstat.udps_ipackets++;
 
-       KERNEL_DEBUG(DBG_FNC_UDP_INPUT | DBG_FUNC_START, 0,0,0,0,0);
+       KERNEL_DEBUG(DBG_FNC_UDP_INPUT | DBG_FUNC_START, 0, 0, 0, 0, 0);
 
        /* Expect 32-bit aligned data pointer on strict-align platforms */
        MBUF_STRICT_DATA_ALIGNMENT_CHECK_32(m);
@@ -333,7 +344,7 @@ udp_input(struct mbuf *m, int iphlen)
                if (m == NULL) {
                        udpstat.udps_hdrops++;
                        KERNEL_DEBUG(DBG_FNC_UDP_INPUT | DBG_FUNC_END,
-                           0,0,0,0,0);
+                           0, 0, 0, 0, 0);
                        return;
                }
                ip = mtod(m, struct ip *);
@@ -422,14 +433,10 @@ udp_input(struct mbuf *m, int iphlen)
                                /* NOTREACHED */
                        }
 #if INET6
-                        if ((inp->inp_vflag & INP_IPV4) == 0)
-                                continue;
-#endif /* INET6 */
-                       if (inp_restricted(inp, ifp))
+                       if ((inp->inp_vflag & INP_IPV4) == 0)
                                continue;
-
-                       if (IFNET_IS_CELLULAR(ifp) &&
-                           (inp->inp_flags & INP_NO_IFT_CELLULAR))
+#endif /* INET6 */
+                       if (inp_restricted_recv(inp, ifp))
                                continue;
 
                        if ((inp->inp_moptions == NULL) &&
@@ -505,17 +512,16 @@ udp_input(struct mbuf *m, int iphlen)
                        reuse_sock = (inp->inp_socket->so_options &
                            (SO_REUSEPORT|SO_REUSEADDR));
 
-#if IPSEC
+#if NECP
                        skipit = 0;
-                       /* check AH/ESP integrity. */
-                       if (ipsec_bypass == 0 &&
-                           ipsec4_in_reject_so(m, inp->inp_socket)) {
-                               IPSEC_STAT_INCREMENT(ipsecstat.in_polvio);
+                       if (!necp_socket_is_allowed_to_send_recv_v4(inp,
+                           uh->uh_dport, uh->uh_sport, &ip->ip_dst,
+                           &ip->ip_src, ifp, NULL, NULL)) {
                                /* do not inject data to pcb */
                                skipit = 1;
                        }
                        if (skipit == 0)
-#endif /*IPSEC*/
+#endif /* NECP */
                        {
                                struct mbuf *n = NULL;
 
@@ -574,7 +580,7 @@ udp_input(struct mbuf *m, int iphlen)
                /* free the extra copy of mbuf or skipped by IPSec */
                if (m != NULL)
                        m_freem(m);
-               KERNEL_DEBUG(DBG_FNC_UDP_INPUT | DBG_FUNC_END, 0,0,0,0,0);
+               KERNEL_DEBUG(DBG_FNC_UDP_INPUT | DBG_FUNC_END, 0, 0, 0, 0, 0);
                return;
        }
 
@@ -596,7 +602,7 @@ udp_input(struct mbuf *m, int iphlen)
                            payload_len)) == NULL) {
                                udpstat.udps_hdrops++;
                                KERNEL_DEBUG(DBG_FNC_UDP_INPUT | DBG_FUNC_END,
-                                   0,0,0,0,0);
+                                   0, 0, 0, 0, 0);
                                return;
                        }
                        /*
@@ -609,17 +615,17 @@ udp_input(struct mbuf *m, int iphlen)
                        uh = (struct udphdr *)(void *)((caddr_t)ip + iphlen);
                }
                /* Check for NAT keepalive packet */
-               if (payload_len == 1 && *(u_int8_t*)
+               if (payload_len == 1 && *(u_int8_t *)
                    ((caddr_t)uh + sizeof (struct udphdr)) == 0xFF) {
                        m_freem(m);
                        KERNEL_DEBUG(DBG_FNC_UDP_INPUT | DBG_FUNC_END,
-                           0,0,0,0,0);
+                           0, 0, 0, 0, 0);
                        return;
-               } else if (payload_len == 4 && *(u_int32_t*)(void *)
+               } else if (payload_len == 4 && *(u_int32_t *)(void *)
                    ((caddr_t)uh + sizeof (struct udphdr)) != 0) {
                        /* UDP encapsulated IPSec packet to pass through NAT */
                        KERNEL_DEBUG(DBG_FNC_UDP_INPUT | DBG_FUNC_END,
-                           0,0,0,0,0);
+                           0, 0, 0, 0, 0);
                        /* preserve the udp header */
                        esp4_input(m, iphlen + sizeof (struct udphdr));
                        return;
@@ -643,7 +649,7 @@ udp_input(struct mbuf *m, int iphlen)
                        if (udp_log_in_vain < 3) {
                                log(LOG_INFO, "Connection attempt to "
                                    "UDP %s:%d from %s:%d\n", inet_ntop(AF_INET,
-                                       &ip->ip_dst, buf, sizeof (buf)),
+                                       &ip->ip_dst, buf, sizeof (buf)),
                                        ntohs(uh->uh_dport), inet_ntop(AF_INET,
                                        &ip->ip_src, buf2, sizeof (buf2)),
                                        ntohs(uh->uh_sport));
@@ -673,7 +679,7 @@ udp_input(struct mbuf *m, int iphlen)
                *ip = save_ip;
                ip->ip_len += iphlen;
                icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_PORT, 0, 0);
-               KERNEL_DEBUG(DBG_FNC_UDP_INPUT | DBG_FUNC_END, 0,0,0,0,0);
+               KERNEL_DEBUG(DBG_FNC_UDP_INPUT | DBG_FUNC_END, 0, 0, 0, 0, 0);
                return;
        }
        udp_lock(inp->inp_socket, 1, 0);
@@ -683,16 +689,14 @@ udp_input(struct mbuf *m, int iphlen)
                IF_UDP_STATINC(ifp, cleanup);
                goto bad;
        }
-#if IPSEC
-       if (ipsec_bypass == 0 && inp != NULL) {
-               if (ipsec4_in_reject_so(m, inp->inp_socket)) {
-                       IPSEC_STAT_INCREMENT(ipsecstat.in_polvio);
-                       udp_unlock(inp->inp_socket, 1, 0);
-                       IF_UDP_STATINC(ifp, badipsec);
-                       goto bad;
-               }
+#if NECP
+       if (!necp_socket_is_allowed_to_send_recv_v4(inp, uh->uh_dport,
+           uh->uh_sport, &ip->ip_dst, &ip->ip_src, ifp, NULL, NULL)) {
+               udp_unlock(inp->inp_socket, 1, 0);
+               IF_UDP_STATINC(ifp, badipsec);
+               goto bad;
        }
-#endif /* IPSEC */
+#endif /* NECP */
 
        /*
         * Construct sockaddr format source address.
@@ -737,8 +741,8 @@ udp_input(struct mbuf *m, int iphlen)
                append_sa = (struct sockaddr *)&udp_in;
        }
        if (nstat_collect) {
-               INP_ADD_STAT(inp, cell, wifi, rxpackets, 1);
-               INP_ADD_STAT(inp, cell, wifi, rxbytes, m->m_pkthdr.len);
+               INP_ADD_STAT(inp, cell, wifi, wired, rxpackets, 1);
+               INP_ADD_STAT(inp, cell, wifi, wired, rxbytes, m->m_pkthdr.len);
        }
        so_recv_data_stat(inp->inp_socket, m, 0);
        if (sbappendaddr(&inp->inp_socket->so_rcv, append_sa,
@@ -748,13 +752,13 @@ udp_input(struct mbuf *m, int iphlen)
                sorwakeup(inp->inp_socket);
        }
        udp_unlock(inp->inp_socket, 1, 0);
-       KERNEL_DEBUG(DBG_FNC_UDP_INPUT | DBG_FUNC_END, 0,0,0,0,0);
+       KERNEL_DEBUG(DBG_FNC_UDP_INPUT | DBG_FUNC_END, 0, 0, 0, 0, 0);
        return;
 bad:
        m_freem(m);
        if (opts)
                m_freem(opts);
-       KERNEL_DEBUG(DBG_FNC_UDP_INPUT | DBG_FUNC_END, 0,0,0,0,0);
+       KERNEL_DEBUG(DBG_FNC_UDP_INPUT | DBG_FUNC_END, 0, 0, 0, 0, 0);
 }
 
 #if INET6
@@ -795,6 +799,7 @@ udp_append(struct inpcb *last, struct ip *ip, struct mbuf *n, int off,
        struct mbuf *opts = 0;
        boolean_t cell = IFNET_IS_CELLULAR(ifp);
        boolean_t wifi = (!cell && IFNET_IS_WIFI(ifp));
+       boolean_t wired = (!wifi && IFNET_IS_WIRED(ifp));
        int ret = 0;
 
 #if CONFIG_MACF_NET
@@ -842,8 +847,9 @@ udp_append(struct inpcb *last, struct ip *ip, struct mbuf *n, int off,
 #endif /* INET6 */
        append_sa = (struct sockaddr *)pudp_in;
        if (nstat_collect) {
-               INP_ADD_STAT(last, cell, wifi, rxpackets, 1);
-               INP_ADD_STAT(last, cell, wifi, rxbytes, n->m_pkthdr.len);
+               INP_ADD_STAT(last, cell, wifi, wired, rxpackets, 1);
+               INP_ADD_STAT(last, cell, wifi, wired, rxbytes,
+                   n->m_pkthdr.len);
        }
        so_recv_data_stat(last->inp_socket, n, 0);
        m_adj(n, off);
@@ -857,7 +863,6 @@ udp_append(struct inpcb *last, struct ip *ip, struct mbuf *n, int off,
 error:
        m_freem(n);
        m_freem(opts);
-       return;
 }
 
 /*
@@ -877,7 +882,7 @@ udp_ctlinput(int cmd, struct sockaddr *sa, void *vip)
 {
        struct ip *ip = vip;
        void (*notify)(struct inpcb *, int) = udp_notify;
-        struct in_addr faddr;
+       struct in_addr faddr;
        struct inpcb *inp;
 
        faddr = ((struct sockaddr_in *)(void *)sa)->sin_addr;
@@ -897,7 +902,7 @@ udp_ctlinput(int cmd, struct sockaddr *sa, void *vip)
 
                bcopy(((caddr_t)ip + (ip->ip_hl << 2)), &uh, sizeof (uh));
                inp = in_pcblookup_hash(&udbinfo, faddr, uh.uh_dport,
-                    ip->ip_src, uh.uh_sport, 0, NULL);
+                   ip->ip_src, uh.uh_sport, 0, NULL);
                if (inp != NULL && inp->inp_socket != NULL) {
                        udp_lock(inp->inp_socket, 1, 0);
                        if (in_pcb_checkstate(inp, WNT_RELEASE, 1) ==
@@ -946,7 +951,78 @@ udp_ctloutput(struct socket *so, struct sockopt *sopt)
                        else
                                inp->inp_flags &= ~INP_UDP_NOCKSUM;
                        break;
+               case UDP_KEEPALIVE_OFFLOAD:
+               {
+                       struct udp_keepalive_offload ka;
+                       /*
+                        * If the socket is not connected, the stack will
+                        * not know the destination address to put in the
+                        * keepalive datagram. Return an error now instead
+                        * of failing later.
+                        */
+                       if (!(so->so_state & SS_ISCONNECTED)) {
+                               error = EINVAL;
+                               break;
+                       }
+                       if (sopt->sopt_valsize != sizeof(ka)) {
+                               error = EINVAL;
+                               break;
+                       }
+                       if ((error = sooptcopyin(sopt, &ka, sizeof(ka),
+                           sizeof(ka))) != 0)
+                               break;
+
+                       /* application should specify the type */
+                       if (ka.ka_type == 0)
+                               return (EINVAL);
+
+                       if (ka.ka_interval == 0) {
+                               /*
+                                * if interval is 0, disable the offload
+                                * mechanism
+                                */
+                               if (inp->inp_keepalive_data != NULL)
+                                       FREE(inp->inp_keepalive_data,
+                                           M_TEMP);
+                               inp->inp_keepalive_data = NULL;
+                               inp->inp_keepalive_datalen = 0;
+                               inp->inp_keepalive_interval = 0;
+                               inp->inp_keepalive_type = 0;
+                               inp->inp_flags2 &= ~INP2_KEEPALIVE_OFFLOAD;
+                       } else {
+                               if (inp->inp_keepalive_data != NULL) {
+                                       FREE(inp->inp_keepalive_data,
+                                           M_TEMP);
+                                       inp->inp_keepalive_data = NULL;
+                               }
 
+                               inp->inp_keepalive_datalen = min(
+                                   ka.ka_data_len,
+                                   UDP_KEEPALIVE_OFFLOAD_DATA_SIZE);
+                               if (inp->inp_keepalive_datalen > 0) {
+                                       MALLOC(inp->inp_keepalive_data,
+                                           u_int8_t *,
+                                           inp->inp_keepalive_datalen,
+                                           M_TEMP, M_WAITOK);
+                                       if (inp->inp_keepalive_data == NULL) {
+                                               inp->inp_keepalive_datalen = 0;
+                                               error = ENOMEM;
+                                               break;
+                                       }
+                                       bcopy(ka.ka_data,
+                                           inp->inp_keepalive_data,
+                                           inp->inp_keepalive_datalen);
+                               } else {
+                                       inp->inp_keepalive_datalen = 0;
+                               }
+                               inp->inp_keepalive_interval =
+                                   min(UDP_KEEPALIVE_INTERVAL_MAX_SECONDS,
+                                   ka.ka_interval);
+                               inp->inp_keepalive_type = ka.ka_type;
+                               inp->inp_flags2 |= INP2_KEEPALIVE_OFFLOAD;
+                       }
+                       break;
+               }
                case SO_FLUSH:
                        if ((error = sooptcopyin(sopt, &optval, sizeof (optval),
                            sizeof (optval))) != 0)
@@ -1036,7 +1112,7 @@ udp_pcblist SYSCTL_HANDLER_ARGS
        }
 
        for (inp = LIST_FIRST(udbinfo.ipi_listhead), i = 0; inp && i < n;
-            inp = LIST_NEXT(inp, inp_list)) {
+           inp = LIST_NEXT(inp, inp_list)) {
                if (inp->inp_gencnt <= gencnt &&
                    inp->inp_state != INPCB_STATE_DEAD)
                        inp_list[i++] = inp;
@@ -1045,19 +1121,32 @@ udp_pcblist SYSCTL_HANDLER_ARGS
 
        error = 0;
        for (i = 0; i < n; i++) {
+               struct xinpcb xi;
+
                inp = inp_list[i];
-               if (inp->inp_gencnt <= gencnt &&
-                   inp->inp_state != INPCB_STATE_DEAD) {
-                       struct xinpcb xi;
-
-                       bzero(&xi, sizeof (xi));
-                       xi.xi_len = sizeof (xi);
-                       /* XXX should avoid extra copy */
-                       inpcb_to_compat(inp, &xi.xi_inp);
-                       if (inp->inp_socket)
-                               sotoxsocket(inp->inp_socket, &xi.xi_socket);
-                       error = SYSCTL_OUT(req, &xi, sizeof (xi));
+
+               if (in_pcb_checkstate(inp, WNT_ACQUIRE, 0) == WNT_STOPUSING)
+                       continue;
+               udp_lock(inp->inp_socket, 1, 0);
+               if (in_pcb_checkstate(inp, WNT_RELEASE, 1) == WNT_STOPUSING) {
+                       udp_unlock(inp->inp_socket, 1, 0);
+                       continue;
+               }
+               if (inp->inp_gencnt > gencnt) {
+                       udp_unlock(inp->inp_socket, 1, 0);
+                       continue;
                }
+
+               bzero(&xi, sizeof (xi));
+               xi.xi_len = sizeof (xi);
+               /* XXX should avoid extra copy */
+               inpcb_to_compat(inp, &xi.xi_inp);
+               if (inp->inp_socket)
+                       sotoxsocket(inp->inp_socket, &xi.xi_socket);
+
+               udp_unlock(inp->inp_socket, 1, 0);
+
+               error = SYSCTL_OUT(req, &xi, sizeof (xi));
        }
        if (!error) {
                /*
@@ -1080,53 +1169,53 @@ udp_pcblist SYSCTL_HANDLER_ARGS
 }
 
 SYSCTL_PROC(_net_inet_udp, UDPCTL_PCBLIST, pcblist,
-    CTLFLAG_RD | CTLFLAG_LOCKED, 0, 0, udp_pcblist,
-    "S,xinpcb", "List of active UDP sockets");
+       CTLTYPE_STRUCT | CTLFLAG_RD | CTLFLAG_LOCKED, 0, 0, udp_pcblist,
+       "S,xinpcb", "List of active UDP sockets");
 
 
 static int
 udp_pcblist64 SYSCTL_HANDLER_ARGS
 {
 #pragma unused(oidp, arg1, arg2)
-        int error, i, n;
-        struct inpcb *inp, **inp_list;
-        inp_gen_t gencnt;
-        struct xinpgen xig;
-
-        /*
-         * The process of preparing the TCB list is too time-consuming and
-         * resource-intensive to repeat twice on every request.
-         */
-        lck_rw_lock_shared(udbinfo.ipi_lock);
-        if (req->oldptr == USER_ADDR_NULL) {
-                n = udbinfo.ipi_count;
-                req->oldidx =
+       int error, i, n;
+       struct inpcb *inp, **inp_list;
+       inp_gen_t gencnt;
+       struct xinpgen xig;
+
+       /*
+        * The process of preparing the TCB list is too time-consuming and
+        * resource-intensive to repeat twice on every request.
+        */
+       lck_rw_lock_shared(udbinfo.ipi_lock);
+       if (req->oldptr == USER_ADDR_NULL) {
+               n = udbinfo.ipi_count;
+               req->oldidx =
                    2 * (sizeof (xig)) + (n + n/8) * sizeof (struct xinpcb64);
-                lck_rw_done(udbinfo.ipi_lock);
-                return (0);
-        }
-
-        if (req->newptr != USER_ADDR_NULL) {
-                lck_rw_done(udbinfo.ipi_lock);
-                return (EPERM);
-        }
-
-        /*
-         * OK, now we're committed to doing something.
-         */
-        gencnt = udbinfo.ipi_gencnt;
-        n = udbinfo.ipi_count;
-
-        bzero(&xig, sizeof (xig));
-        xig.xig_len = sizeof (xig);
-        xig.xig_count = n;
-        xig.xig_gen = gencnt;
-        xig.xig_sogen = so_gencnt;
-        error = SYSCTL_OUT(req, &xig, sizeof (xig));
-        if (error) {
-                lck_rw_done(udbinfo.ipi_lock);
-                return (error);
-        }
+               lck_rw_done(udbinfo.ipi_lock);
+               return (0);
+       }
+
+       if (req->newptr != USER_ADDR_NULL) {
+               lck_rw_done(udbinfo.ipi_lock);
+               return (EPERM);
+       }
+
+       /*
+        * OK, now we're committed to doing something.
+        */
+       gencnt = udbinfo.ipi_gencnt;
+       n = udbinfo.ipi_count;
+
+       bzero(&xig, sizeof (xig));
+       xig.xig_len = sizeof (xig);
+       xig.xig_count = n;
+       xig.xig_gen = gencnt;
+       xig.xig_sogen = so_gencnt;
+       error = SYSCTL_OUT(req, &xig, sizeof (xig));
+       if (error) {
+               lck_rw_done(udbinfo.ipi_lock);
+               return (error);
+       }
        /*
         * We are done if there is no pcb
         */
@@ -1135,58 +1224,71 @@ udp_pcblist64 SYSCTL_HANDLER_ARGS
                return (0);
        }
 
-        inp_list = _MALLOC(n * sizeof (*inp_list), M_TEMP, M_WAITOK);
-        if (inp_list == 0) {
-                lck_rw_done(udbinfo.ipi_lock);
-                return (ENOMEM);
-        }
+       inp_list = _MALLOC(n * sizeof (*inp_list), M_TEMP, M_WAITOK);
+       if (inp_list == 0) {
+               lck_rw_done(udbinfo.ipi_lock);
+               return (ENOMEM);
+       }
 
-        for (inp = LIST_FIRST(udbinfo.ipi_listhead), i = 0; inp && i < n;
-             inp = LIST_NEXT(inp, inp_list)) {
-                if (inp->inp_gencnt <= gencnt &&
+       for (inp = LIST_FIRST(udbinfo.ipi_listhead), i = 0; inp && i < n;
+           inp = LIST_NEXT(inp, inp_list)) {
+               if (inp->inp_gencnt <= gencnt &&
                    inp->inp_state != INPCB_STATE_DEAD)
-                        inp_list[i++] = inp;
-        }
-        n = i;
-
-        error = 0;
-        for (i = 0; i < n; i++) {
-                inp = inp_list[i];
-                if (inp->inp_gencnt <= gencnt &&
-                   inp->inp_state != INPCB_STATE_DEAD) {
-                        struct xinpcb64 xi;
-
-                        bzero(&xi, sizeof (xi));
-                        xi.xi_len = sizeof (xi);
-                        inpcb_to_xinpcb64(inp, &xi);
-                        if (inp->inp_socket)
-                                sotoxsocket64(inp->inp_socket, &xi.xi_socket);
-                        error = SYSCTL_OUT(req, &xi, sizeof (xi));
-                }
-        }
-        if (!error) {
-                /*
-                 * Give the user an updated idea of our state.
-                 * If the generation differs from what we told
-                 * her before, she knows that something happened
-                 * while we were processing this request, and it
-                 * might be necessary to retry.
-                 */
-                bzero(&xig, sizeof (xig));
-                xig.xig_len = sizeof (xig);
-                xig.xig_gen = udbinfo.ipi_gencnt;
-                xig.xig_sogen = so_gencnt;
-                xig.xig_count = udbinfo.ipi_count;
-                error = SYSCTL_OUT(req, &xig, sizeof (xig));
-        }
-        FREE(inp_list, M_TEMP);
-        lck_rw_done(udbinfo.ipi_lock);
-        return (error);
+                       inp_list[i++] = inp;
+       }
+       n = i;
+
+       error = 0;
+       for (i = 0; i < n; i++) {
+               struct xinpcb64 xi;
+
+               inp = inp_list[i];
+
+               if (in_pcb_checkstate(inp, WNT_ACQUIRE, 0) == WNT_STOPUSING)
+                       continue;
+               udp_lock(inp->inp_socket, 1, 0);
+               if (in_pcb_checkstate(inp, WNT_RELEASE, 1) == WNT_STOPUSING) {
+                       udp_unlock(inp->inp_socket, 1, 0);
+                       continue;
+               }
+               if (inp->inp_gencnt > gencnt) {
+                       udp_unlock(inp->inp_socket, 1, 0);
+                       continue;
+               }
+
+               bzero(&xi, sizeof (xi));
+               xi.xi_len = sizeof (xi);
+               inpcb_to_xinpcb64(inp, &xi);
+               if (inp->inp_socket)
+                       sotoxsocket64(inp->inp_socket, &xi.xi_socket);
+
+               udp_unlock(inp->inp_socket, 1, 0);
+
+               error = SYSCTL_OUT(req, &xi, sizeof (xi));
+       }
+       if (!error) {
+               /*
+                * Give the user an updated idea of our state.
+                * If the generation differs from what we told
+                * her before, she knows that something happened
+                * while we were processing this request, and it
+                * might be necessary to retry.
+                */
+               bzero(&xig, sizeof (xig));
+               xig.xig_len = sizeof (xig);
+               xig.xig_gen = udbinfo.ipi_gencnt;
+               xig.xig_sogen = so_gencnt;
+               xig.xig_count = udbinfo.ipi_count;
+               error = SYSCTL_OUT(req, &xig, sizeof (xig));
+       }
+       FREE(inp_list, M_TEMP);
+       lck_rw_done(udbinfo.ipi_lock);
+       return (error);
 }
 
 SYSCTL_PROC(_net_inet_udp, OID_AUTO, pcblist64,
-    CTLFLAG_RD | CTLFLAG_LOCKED, 0, 0, udp_pcblist64,
-    "S,xinpcb64", "List of active UDP sockets");
+       CTLTYPE_STRUCT | CTLFLAG_RD | CTLFLAG_LOCKED, 0, 0, udp_pcblist64,
+       "S,xinpcb64", "List of active UDP sockets");
 
 
 static int
@@ -1197,14 +1299,14 @@ udp_pcblist_n SYSCTL_HANDLER_ARGS
 }
 
 SYSCTL_PROC(_net_inet_udp, OID_AUTO, pcblist_n,
-    CTLFLAG_RD | CTLFLAG_LOCKED, 0, 0, udp_pcblist_n,
-    "S,xinpcb_n", "List of active UDP sockets");
+       CTLTYPE_STRUCT | CTLFLAG_RD | CTLFLAG_LOCKED, 0, 0, udp_pcblist_n,
+       "S,xinpcb_n", "List of active UDP sockets");
 
 __private_extern__ void
-udp_get_ports_used(uint32_t ifindex, int protocol, uint32_t wildcardok,
+udp_get_ports_used(uint32_t ifindex, int protocol, uint32_t flags,
     bitstr_t *bitfield)
 {
-       inpcb_get_ports_used(ifindex, protocol, wildcardok, bitfield, &udbinfo);
+       inpcb_get_ports_used(ifindex, protocol, flags, bitfield, &udbinfo);
 }
 
 __private_extern__ uint32_t
@@ -1309,22 +1411,23 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
        struct ip_moptions *mopts;
        struct route ro;
        struct ip_out_args ipoa =
-           { IFSCOPE_NONE, { 0 }, IPOAF_SELECT_SRCIF, 0 };
+           { IFSCOPE_NONE, { 0 }, IPOAF_SELECT_SRCIF, 0, 0, 0 };
        struct ifnet *outif = NULL;
        struct flowadv *adv = &ipoa.ipoa_flowadv;
-       mbuf_svc_class_t msc = MBUF_SC_UNSPEC;
-       struct ifnet *origoutifp;
+       int sotc = SO_TC_UNSPEC;
+       int netsvctype = _NET_SERVICE_TYPE_UNSPEC;
+       struct ifnet *origoutifp = NULL;
        int flowadv = 0;
 
        /* Enable flow advisory only when connected */
        flowadv = (so->so_state & SS_ISCONNECTED) ? 1 : 0;
        pi_laddr.s_addr = INADDR_ANY;
 
-       KERNEL_DEBUG(DBG_FNC_UDP_OUTPUT | DBG_FUNC_START, 0,0,0,0,0);
+       KERNEL_DEBUG(DBG_FNC_UDP_OUTPUT | DBG_FUNC_START, 0, 0, 0, 0, 0);
 
        lck_mtx_assert(&inp->inpcb_mtx, LCK_MTX_ASSERT_OWNED);
        if (control != NULL) {
-               msc = mbuf_service_class_from_control(control);
+               sotc = so_tc_from_control(control, &netsvctype);
                VERIFY(outif == NULL);
                error = udp_check_pktinfo(control, &outif, &pi_laddr);
                m_freem(control);
@@ -1335,6 +1438,10 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
                if (outif != NULL)
                        ipoa.ipoa_boundif = outif->if_index;
        }
+       if (sotc == SO_TC_UNSPEC) {
+               sotc = so->so_traffic_class;
+               netsvctype = so->so_netsvctype;
+       }
 
        KERNEL_DEBUG(DBG_LAYER_OUT_BEG, inp->inp_fport, inp->inp_lport,
            inp->inp_laddr.s_addr, inp->inp_faddr.s_addr,
@@ -1367,8 +1474,14 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
                outif = inp->inp_boundifp;
                ipoa.ipoa_boundif = outif->if_index;
        }
-       if (inp->inp_flags & INP_NO_IFT_CELLULAR)
+       if (INP_NO_CELLULAR(inp))
                ipoa.ipoa_flags |=  IPOAF_NO_CELLULAR;
+       if (INP_NO_EXPENSIVE(inp))
+               ipoa.ipoa_flags |=  IPOAF_NO_EXPENSIVE;
+       if (INP_AWDL_UNRESTRICTED(inp))
+               ipoa.ipoa_flags |=  IPOAF_AWDL_UNRESTRICTED;
+       ipoa.ipoa_sotc = sotc;
+       ipoa.ipoa_netsvctype = netsvctype;
        soopts |= IP_OUTARGS;
 
        /*
@@ -1407,8 +1520,6 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
                        IFA_REMREF(&ia->ia_ifa);
        }
 
-       origoutifp = inp->inp_last_outifp;
-
        /*
         * IP_PKTINFO option check.  If a temporary scope or src address
         * is provided, use it for this packet only and make sure we forget
@@ -1421,7 +1532,7 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
                origladdr.s_addr = INADDR_ANY;
                /* we don't want to keep the laddr or route */
                udp_dodisconnect = 1;
-               /* remember we don't care about src addr.*/
+               /* remember we don't care about src addr */
                inp->inp_flags |= INP_INADDR_ANY;
        } else {
                origladdr = laddr = inp->inp_laddr;
@@ -1467,8 +1578,7 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
                        /* synch up in case in_pcbladdr() overrides */
                        if (outif != NULL && ipoa.ipoa_boundif != IFSCOPE_NONE)
                                ipoa.ipoa_boundif = outif->if_index;
-               }
-               else {
+               } else {
                        /*
                         * Fast path case
                         *
@@ -1481,7 +1591,7 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
                         */
                        if (laddr.s_addr == INADDR_ANY) {
                                if ((error = in_pcbladdr(inp, addr, &laddr,
-                                   ipoa.ipoa_boundif, &outif)) != 0)
+                                   ipoa.ipoa_boundif, &outif, 0)) != 0)
                                        goto release;
                                /*
                                 * from pcbconnect: remember we don't
@@ -1516,7 +1626,7 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
         * Calculate data length and get a mbuf
         * for UDP and IP headers.
         */
-       M_PREPEND(m, sizeof (struct udpiphdr), M_DONTWAIT);
+       M_PREPEND(m, sizeof (struct udpiphdr), M_DONTWAIT, 1);
        if (m == 0) {
                error = ENOBUFS;
                goto abort;
@@ -1552,10 +1662,64 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
        udpstat.udps_opackets++;
 
        KERNEL_DEBUG(DBG_LAYER_OUT_END, ui->ui_dport, ui->ui_sport,
-                    ui->ui_src.s_addr, ui->ui_dst.s_addr, ui->ui_ulen);
+           ui->ui_src.s_addr, ui->ui_dst.s_addr, ui->ui_ulen);
+
+#if NECP
+       {
+               necp_kernel_policy_id policy_id;
+               u_int32_t route_rule_id;
+
+               /*
+                * We need a route to perform NECP route rule checks
+                */
+               if (net_qos_policy_restricted != 0 &&
+                   ROUTE_UNUSABLE(&inp->inp_route)) {
+                       struct sockaddr_in to;
+                       struct sockaddr_in from;
+
+                       ROUTE_RELEASE(&inp->inp_route);
+
+                       bzero(&from, sizeof(struct sockaddr_in));
+                       from.sin_family = AF_INET;
+                       from.sin_len = sizeof(struct sockaddr_in);
+                       from.sin_addr = laddr;
+
+                       bzero(&to, sizeof(struct sockaddr_in));
+                       to.sin_family = AF_INET;
+                       to.sin_len = sizeof(struct sockaddr_in);
+                       to.sin_addr = faddr;
+
+                       inp->inp_route.ro_dst.sa_family = AF_INET;
+                       inp->inp_route.ro_dst.sa_len = sizeof(struct sockaddr_in);
+                       ((struct sockaddr_in *)(void *)&inp->inp_route.ro_dst)->sin_addr =
+                               faddr;
+
+                       rtalloc_scoped(&inp->inp_route, ipoa.ipoa_boundif);
+
+                       inp_update_necp_policy(inp, (struct sockaddr *)&from,
+                           (struct sockaddr *)&to, ipoa.ipoa_boundif);
+                       inp->inp_policyresult.results.qos_marking_gencount = 0;
+               }
+
+               if (!necp_socket_is_allowed_to_send_recv_v4(inp, lport, fport,
+                   &laddr, &faddr, NULL, &policy_id, &route_rule_id)) {
+                       error = EHOSTUNREACH;
+                       goto abort;
+               }
+
+               necp_mark_packet_from_socket(m, inp, policy_id, route_rule_id);
+
+               if (net_qos_policy_restricted != 0) {
+                       necp_socket_update_qos_marking(inp,
+                           inp->inp_route.ro_rt, NULL, route_rule_id);
+               }
+       }
+#endif /* NECP */
+       if ((so->so_flags1 & SOF1_QOSMARKING_ALLOWED))
+               ipoa.ipoa_flags |= IPOAF_QOSMARKING_ALLOWED;
 
 #if IPSEC
-       if (ipsec_bypass == 0 && ipsec_setsocket(m, inp->inp_socket) != 0) {
+       if (inp->inp_sp != NULL && ipsec_setsocket(m, inp->inp_socket) != 0) {
                error = ENOBUFS;
                goto abort;
        }
@@ -1578,7 +1742,7 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
        /* Copy the cached route and take an extra reference */
        inp_route_copyout(inp, &ro);
 
-       set_packet_service_class(m, so, msc, 0);
+       set_packet_service_class(m, so, sotc, 0);
        m->m_pkthdr.pkt_flowsrc = FLOWSRC_INPCB;
        m->m_pkthdr.pkt_flowid = inp->inp_flowhash;
        m->m_pkthdr.pkt_proto = IPPROTO_UDP;
@@ -1602,21 +1766,23 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
                IMO_REMREF(mopts);
 
        if (error == 0 && nstat_collect) {
-               boolean_t cell, wifi;
+               boolean_t cell, wifi, wired;
 
                if (ro.ro_rt != NULL) {
                        cell = IFNET_IS_CELLULAR(ro.ro_rt->rt_ifp);
                        wifi = (!cell && IFNET_IS_WIFI(ro.ro_rt->rt_ifp));
+                       wired = (!wifi && IFNET_IS_WIRED(ro.ro_rt->rt_ifp));
                } else {
-                       cell = wifi = FALSE;
+                       cell = wifi = wired = FALSE;
                }
-               INP_ADD_STAT(inp, cell, wifi, txpackets, 1);
-               INP_ADD_STAT(inp, cell, wifi, txbytes, len);
+               INP_ADD_STAT(inp, cell, wifi, wired, txpackets, 1);
+               INP_ADD_STAT(inp, cell, wifi, wired, txbytes, len);
        }
 
        if (flowadv && (adv->code == FADV_FLOW_CONTROLLED ||
            adv->code == FADV_SUSPENDED)) {
-               /* return a hint to the application that 
+               /*
+                * return a hint to the application that
                 * the packet has been dropped
                 */
                error = ENOBUFS;
@@ -1654,18 +1820,27 @@ abort:
                 * If the destination route is unicast, update outifp with
                 * that of the route interface used by IP.
                 */
-               if (rt != NULL && (outifp = rt->rt_ifp) != inp->inp_last_outifp)
-                       inp->inp_last_outifp = outifp;  /* no reference needed */
+               if (rt != NULL &&
+                   (outifp = rt->rt_ifp) != inp->inp_last_outifp) {
+                       inp->inp_last_outifp = outifp; /* no reference needed */
+
+                       so->so_pktheadroom = P2ROUNDUP(
+                           sizeof(struct udphdr) +
+                           sizeof(struct ip) +
+                           ifnet_hdrlen(outifp) +
+                           ifnet_packetpreamblelen(outifp),
+                           sizeof(u_int32_t));
+               }
        } else {
                ROUTE_RELEASE(&inp->inp_route);
        }
 
        /*
-        * If output interface was cellular, and this socket is denied
-        * access to it, generate an event.
+        * If output interface was cellular/expensive, and this socket is
+        * denied access to it, generate an event.
         */
        if (error != 0 && (ipoa.ipoa_retflags & IPOARF_IFDENIED) &&
-           (inp->inp_flags & INP_NO_IFT_CELLULAR))
+           (INP_NO_CELLULAR(inp) || INP_NO_EXPENSIVE(inp)))
                soevent(so, (SO_FILT_HINT_LOCKED|SO_FILT_HINT_IFDENIED));
 
 release:
@@ -1708,26 +1883,26 @@ sysctl_udp_sospace(struct sysctl_oid *oidp, void *arg1, int arg2,
                space_p = &udp_sendspace;
                break;
        default:
-               return EINVAL;
+               return (EINVAL);
        }
-        error = sysctl_io_number(req, *space_p, sizeof (u_int32_t),
+       error = sysctl_io_number(req, *space_p, sizeof (u_int32_t),
            &new_value, &changed);
-        if (changed) {
-                if (new_value > 0 && new_value <= sb_effective_max)
-                        *space_p = new_value;
-                else
-                        error = ERANGE;
-        }
-        return (error);
+       if (changed) {
+               if (new_value > 0 && new_value <= sb_effective_max)
+                       *space_p = new_value;
+               else
+                       error = ERANGE;
+       }
+       return (error);
 }
 
 SYSCTL_PROC(_net_inet_udp, UDPCTL_RECVSPACE, recvspace,
-    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, &udp_recvspace, 0,
-    &sysctl_udp_sospace, "IU", "Maximum incoming UDP datagram size");
+       CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, &udp_recvspace, 0,
+       &sysctl_udp_sospace, "IU", "Maximum incoming UDP datagram size");
 
 SYSCTL_PROC(_net_inet_udp, UDPCTL_MAXDGRAM, maxdgram,
-    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, &udp_sendspace, 0,
-    &sysctl_udp_sospace, "IU", "Maximum outgoing UDP datagram size");
+       CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, &udp_sendspace, 0,
+       &sysctl_udp_sospace, "IU", "Maximum outgoing UDP datagram size");
 
 static int
 udp_abort(struct socket *so)
@@ -1753,7 +1928,7 @@ udp_attach(struct socket *so, int proto, struct proc *p)
 
        inp = sotoinpcb(so);
        if (inp != NULL) {
-               panic ("%s so=%p inp=%p\n", __func__, so, inp);
+               panic("%s so=%p inp=%p\n", __func__, so, inp);
                /* NOTREACHED */
        }
        error = in_pcballoc(so, &udbinfo, p);
@@ -1781,8 +1956,8 @@ udp_bind(struct socket *so, struct sockaddr *nam, struct proc *p)
                return (EAFNOSUPPORT);
 
        inp = sotoinpcb(so);
-       if (inp == NULL || (inp->inp_flags2 & INP2_WANT_FLOW_DIVERT))
-               return (inp == NULL ? EINVAL : EPROTOTYPE);
+       if (inp == NULL)
+               return (EINVAL);
        error = in_pcbbind(inp, nam, p);
        return (error);
 }
@@ -1794,10 +1969,29 @@ udp_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
        int error;
 
        inp = sotoinpcb(so);
-       if (inp == NULL || (inp->inp_flags2 & INP2_WANT_FLOW_DIVERT))
-               return (inp == NULL ? EINVAL : EPROTOTYPE);
+       if (inp == NULL)
+               return (EINVAL);
        if (inp->inp_faddr.s_addr != INADDR_ANY)
                return (EISCONN);
+
+#if NECP
+#if FLOW_DIVERT
+       if (necp_socket_should_use_flow_divert(inp)) {
+               uint32_t fd_ctl_unit =
+                   necp_socket_get_flow_divert_control_unit(inp);
+               if (fd_ctl_unit > 0) {
+                       error = flow_divert_pcb_init(so, fd_ctl_unit);
+                       if (error == 0) {
+                               error = flow_divert_connect_out(so, nam, p);
+                       }
+               } else {
+                       error = ENETDOWN;
+               }
+               return (error);
+       }
+#endif /* FLOW_DIVERT */
+#endif /* NECP */
+
        error = in_pcbconnect(inp, nam, p, IFSCOPE_NONE, NULL);
        if (error == 0) {
                soisconnected(so);
@@ -1808,30 +2002,24 @@ udp_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
 }
 
 int
-udp_connectx_common(struct socket *so, int af,
-    struct sockaddr_list **src_sl, struct sockaddr_list **dst_sl,
-    struct proc *p, uint32_t ifscope, associd_t aid, connid_t *pcid,
-    uint32_t flags, void *arg, uint32_t arglen)
+udp_connectx_common(struct socket *so, int af, 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)
 {
 #pragma unused(aid, flags, arg, arglen)
-       struct sockaddr_entry *src_se = NULL, *dst_se = NULL;
        struct inpcb *inp = sotoinpcb(so);
        int error;
+       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);
+#if NECP
+       inp_update_necp_policy(inp, src, dst, ifscope);
+#endif /* NECP */
 
        /* bind socket to the specified interface, if requested */
        if (ifscope != IFSCOPE_NONE &&
@@ -1839,20 +2027,19 @@ udp_connectx_common(struct socket *so, int af,
                return (error);
 
        /* 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 (src != NULL) {
+               error = sobindlock(so, src, 0); /* already locked */
                if (error != 0)
                        return (error);
        }
 
        switch (af) {
        case AF_INET:
-               error = udp_connect(so, dst_se->se_addr, p);
+               error = udp_connect(so, dst, p);
                break;
 #if INET6
        case AF_INET6:
-               error = udp6_connect(so, dst_se->se_addr, p);
+               error = udp6_connect(so, dst, p);
                break;
 #endif /* INET6 */
        default:
@@ -1860,20 +2047,51 @@ udp_connectx_common(struct socket *so, int af,
                /* NOTREACHED */
        }
 
+       if (error != 0)
+               return (error);
+
+       /*
+        * If there is data, copy it. DATA_IDEMPOTENT is ignored.
+        * CONNECT_RESUME_ON_READ_WRITE is ignored.
+        */
+       if (uio != NULL) {
+               socket_unlock(so, 0);
+
+               VERIFY(bytes_written != NULL);
+
+               datalen = uio_resid(uio);
+               error = so->so_proto->pr_usrreqs->pru_sosend(so, NULL,
+                   (uio_t)uio, NULL, NULL, 0);
+               socket_lock(so, 0);
+
+               /* If error returned is EMSGSIZE, for example, disconnect */
+               if (error == 0 || error == EWOULDBLOCK)
+                       *bytes_written = datalen - uio_resid(uio);
+               else
+                       (void) so->so_proto->pr_usrreqs->pru_disconnectx(so,
+                           SAE_ASSOCID_ANY, SAE_CONNID_ANY);
+               /*
+                * mask the EWOULDBLOCK error so that the caller
+                * knows that atleast the connect was successful.
+                */
+               if (error == EWOULDBLOCK)
+                       error = 0;
+       }
+
        if (error == 0 && pcid != NULL)
-               *pcid = 1;      /* there is only 1 connection for UDP */
+               *pcid = 1;      /* there is only 1 connection for UDP */
 
        return (error);
 }
 
 static int
-udp_connectx(struct socket *so, struct sockaddr_list **src_sl,
-    struct sockaddr_list **dst_sl, struct proc *p, uint32_t ifscope,
-    associd_t aid, connid_t *pcid, uint32_t flags, void *arg,
-    uint32_t arglen)
+udp_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)
 {
-       return (udp_connectx_common(so, AF_INET, src_sl, dst_sl,
-           p, ifscope, aid, pcid, flags, arg, arglen));
+       return (udp_connectx_common(so, AF_INET, src, dst,
+           p, ifscope, aid, pcid, flags, arg, arglen, uio, bytes_written));
 }
 
 static int
@@ -1886,6 +2104,16 @@ udp_detach(struct socket *so)
                panic("%s: so=%p null inp\n", __func__, so);
                /* NOTREACHED */
        }
+
+       /*
+        * If this is a socket that does not want to wakeup the device
+        * for it's traffic, the application might be waiting for
+        * close to complete before going to sleep. Send a notification
+        * for this kind of sockets
+        */
+       if (so->so_options & SO_NOWAKEFROMSLEEP)
+               socket_post_kev_msg_closed(so);
+
        in_pcbdetach(inp);
        inp->inp_state = INPCB_STATE_DEAD;
        return (0);
@@ -1897,7 +2125,11 @@ udp_disconnect(struct socket *so)
        struct inpcb *inp;
 
        inp = sotoinpcb(so);
-       if (inp == NULL || (inp->inp_flags2 & INP2_WANT_FLOW_DIVERT))
+       if (inp == NULL
+#if NECP
+               || (necp_socket_should_use_flow_divert(inp))
+#endif /* NECP */
+               )
                return (inp == NULL ? EINVAL : EPROTOTYPE);
        if (inp->inp_faddr.s_addr == INADDR_ANY)
                return (ENOTCONN);
@@ -1914,10 +2146,10 @@ udp_disconnect(struct socket *so)
 }
 
 static int
-udp_disconnectx(struct socket *so, associd_t aid, connid_t cid)
+udp_disconnectx(struct socket *so, sae_associd_t aid, sae_connid_t cid)
 {
 #pragma unused(cid)
-       if (aid != ASSOCID_ANY && aid != ASSOCID_ALL)
+       if (aid != SAE_ASSOCID_ANY && aid != SAE_ASSOCID_ALL)
                return (EINVAL);
 
        return (udp_disconnect(so));
@@ -1927,18 +2159,30 @@ static int
 udp_send(struct socket *so, int flags, struct mbuf *m,
     struct sockaddr *addr, struct mbuf *control, struct proc *p)
 {
+#ifndef FLOW_DIVERT
 #pragma unused(flags)
+#endif /* !(FLOW_DIVERT) */
        struct inpcb *inp;
 
        inp = sotoinpcb(so);
-       if (inp == NULL || (inp->inp_flags2 & INP2_WANT_FLOW_DIVERT)) {
+       if (inp == NULL) {
                if (m != NULL)
                        m_freem(m);
                if (control != NULL)
                        m_freem(control);
-               return (inp == NULL ? EINVAL : EPROTOTYPE);
+               return (EINVAL);
        }
 
+#if NECP
+#if FLOW_DIVERT
+       if (necp_socket_should_use_flow_divert(inp)) {
+               /* Implicit connect */
+               return (flow_divert_implicit_data_out(so, flags, m, addr,
+                   control, p));
+       }
+#endif /* FLOW_DIVERT */
+#endif /* NECP */
+
        return (udp_output(inp, m, addr, control, p));
 }
 
@@ -1991,9 +2235,10 @@ udp_unlock(struct socket *so, int refcount, void *debug)
        else
                lr_saved = debug;
 
-       if (refcount)
+       if (refcount) {
+               VERIFY(so->so_usecount > 0);
                so->so_usecount--;
-
+       }
        if (so->so_pcb == NULL) {
                panic("%s: so=%p NO PCB! lr=%p lrh= %s\n", __func__,
                    so, lr_saved, solockhistory_nr(so));
@@ -2086,8 +2331,6 @@ udp_gc(struct inpcbinfo *ipi)
                }
        }
        lck_rw_done(ipi->ipi_lock);
-
-       return;
 }
 
 static int
@@ -2208,3 +2451,253 @@ udp_input_checksum(struct mbuf *m, struct udphdr *uh, int off, int ulen)
 
        return (0);
 }
+
+void
+udp_fill_keepalive_offload_frames(ifnet_t ifp,
+    struct ifnet_keepalive_offload_frame *frames_array,
+    u_int32_t frames_array_count, size_t frame_data_offset,
+    u_int32_t *used_frames_count)
+{
+       struct inpcb *inp;
+       inp_gen_t gencnt;
+       u_int32_t frame_index = *used_frames_count;
+
+       if (ifp == NULL || frames_array == NULL ||
+           frames_array_count == 0 ||
+           frame_index >= frames_array_count ||
+           frame_data_offset >= IFNET_KEEPALIVE_OFFLOAD_FRAME_DATA_SIZE)
+               return;
+
+       lck_rw_lock_shared(udbinfo.ipi_lock);
+       gencnt = udbinfo.ipi_gencnt;
+       LIST_FOREACH(inp, udbinfo.ipi_listhead, inp_list) {
+               struct socket *so;
+               u_int8_t *data;
+               struct ifnet_keepalive_offload_frame *frame;
+               struct mbuf *m = NULL;
+
+               if (frame_index >= frames_array_count)
+                       break;
+
+               if (inp->inp_gencnt > gencnt ||
+                   inp->inp_state == INPCB_STATE_DEAD)
+                       continue;
+
+               if ((so = inp->inp_socket) == NULL ||
+                   (so->so_state & SS_DEFUNCT))
+                       continue;
+               /*
+                * check for keepalive offload flag without socket
+                * lock to avoid a deadlock
+                */
+               if (!(inp->inp_flags2 & INP2_KEEPALIVE_OFFLOAD)) {
+                       continue;
+               }
+
+               udp_lock(so, 1, 0);
+               if (!(inp->inp_vflag & (INP_IPV4 | INP_IPV6))) {
+                       udp_unlock(so, 1, 0);
+                       continue;
+               }
+               if ((inp->inp_vflag & INP_IPV4) &&
+                   (inp->inp_laddr.s_addr == INADDR_ANY ||
+                   inp->inp_faddr.s_addr == INADDR_ANY)) {
+                       udp_unlock(so, 1, 0);
+                       continue;
+               }
+               if ((inp->inp_vflag & INP_IPV6) &&
+                   (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr) ||
+                   IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr))) {
+                       udp_unlock(so, 1, 0);
+                       continue;
+               }
+               if (inp->inp_lport == 0 || inp->inp_fport == 0) {
+                       udp_unlock(so, 1, 0);
+                       continue;
+               }
+               if (inp->inp_last_outifp == NULL ||
+                   inp->inp_last_outifp->if_index != ifp->if_index) {
+                       udp_unlock(so, 1, 0);
+                       continue;
+               }
+               if ((inp->inp_vflag & INP_IPV4)) {
+                       if ((frame_data_offset + sizeof(struct udpiphdr) +
+                           inp->inp_keepalive_datalen) >
+                           IFNET_KEEPALIVE_OFFLOAD_FRAME_DATA_SIZE) {
+                               udp_unlock(so, 1, 0);
+                               continue;
+                       }
+                       if ((sizeof(struct udpiphdr) +
+                           inp->inp_keepalive_datalen) > _MHLEN) {
+                               udp_unlock(so, 1, 0);
+                               continue;
+                       }
+               } else {
+                       if ((frame_data_offset + sizeof(struct ip6_hdr) +
+                           sizeof(struct udphdr) +
+                           inp->inp_keepalive_datalen) >
+                           IFNET_KEEPALIVE_OFFLOAD_FRAME_DATA_SIZE) {
+                               udp_unlock(so, 1, 0);
+                               continue;
+                       }
+                       if ((sizeof(struct ip6_hdr) + sizeof(struct udphdr) +
+                           inp->inp_keepalive_datalen) > _MHLEN) {
+                               udp_unlock(so, 1, 0);
+                               continue;
+                       }
+               }
+               MGETHDR(m, M_WAIT, MT_HEADER);
+               if (m == NULL) {
+                       udp_unlock(so, 1, 0);
+                       continue;
+               }
+               /*
+                * This inp has all the information that is needed to
+                * generate an offload frame.
+                */
+               if (inp->inp_vflag & INP_IPV4) {
+                       struct ip *ip;
+                       struct udphdr *udp;
+
+                       frame = &frames_array[frame_index];
+                       frame->length = frame_data_offset +
+                           sizeof(struct udpiphdr) +
+                           inp->inp_keepalive_datalen;
+                       frame->ether_type =
+                           IFNET_KEEPALIVE_OFFLOAD_FRAME_ETHERTYPE_IPV4;
+                       frame->interval = inp->inp_keepalive_interval;
+                       switch (inp->inp_keepalive_type) {
+                       case UDP_KEEPALIVE_OFFLOAD_TYPE_AIRPLAY:
+                               frame->type =
+                                   IFNET_KEEPALIVE_OFFLOAD_FRAME_AIRPLAY;
+                               break;
+                       default:
+                               break;
+                       }
+                       data = mtod(m, u_int8_t *);
+                       bzero(data, sizeof(struct udpiphdr));
+                       ip = (__typeof__(ip))(void *)data;
+                       udp = (__typeof__(udp))(void *) (data +
+                           sizeof(struct ip));
+                       m->m_len = sizeof(struct udpiphdr);
+                       data = data + sizeof(struct udpiphdr);
+                       if (inp->inp_keepalive_datalen > 0 &&
+                           inp->inp_keepalive_data != NULL) {
+                               bcopy(inp->inp_keepalive_data, data,
+                                   inp->inp_keepalive_datalen);
+                               m->m_len += inp->inp_keepalive_datalen;
+                       }
+                       m->m_pkthdr.len = m->m_len;
+
+                       ip->ip_v = IPVERSION;
+                       ip->ip_hl = (sizeof(struct ip) >> 2);
+                       ip->ip_p = IPPROTO_UDP;
+                       ip->ip_len = htons(sizeof(struct udpiphdr) +
+                           (u_short)inp->inp_keepalive_datalen);
+                       ip->ip_ttl = inp->inp_ip_ttl;
+                       ip->ip_tos |= (inp->inp_ip_tos & ~IPTOS_ECN_MASK);
+                       ip->ip_src = inp->inp_laddr;
+                       ip->ip_dst = inp->inp_faddr;
+                       ip->ip_sum = in_cksum_hdr_opt(ip);
+
+                       udp->uh_sport = inp->inp_lport;
+                       udp->uh_dport = inp->inp_fport;
+                       udp->uh_ulen = htons(sizeof(struct udphdr) +
+                           (u_short)inp->inp_keepalive_datalen);
+
+                       if (!(inp->inp_flags & INP_UDP_NOCKSUM)) {
+                               udp->uh_sum = in_pseudo(ip->ip_src.s_addr,
+                                   ip->ip_dst.s_addr,
+                                   htons(sizeof(struct udphdr) +
+                                   (u_short)inp->inp_keepalive_datalen +
+                                   IPPROTO_UDP));
+                               m->m_pkthdr.csum_flags = CSUM_UDP;
+                               m->m_pkthdr.csum_data = offsetof(struct udphdr,
+                                   uh_sum);
+                       }
+                       m->m_pkthdr.pkt_proto = IPPROTO_UDP;
+                       in_delayed_cksum(m);
+                       bcopy(m->m_data, frame->data + frame_data_offset,
+                           m->m_len);
+               } else {
+                       struct ip6_hdr *ip6;
+                       struct udphdr *udp6;
+
+                       VERIFY(inp->inp_vflag & INP_IPV6);
+                       frame = &frames_array[frame_index];
+                       frame->length = frame_data_offset +
+                           sizeof(struct ip6_hdr) +
+                           sizeof(struct udphdr) +
+                           inp->inp_keepalive_datalen;
+                       frame->ether_type =
+                           IFNET_KEEPALIVE_OFFLOAD_FRAME_ETHERTYPE_IPV6;
+                       frame->interval = inp->inp_keepalive_interval;
+                       switch (inp->inp_keepalive_type) {
+                       case UDP_KEEPALIVE_OFFLOAD_TYPE_AIRPLAY:
+                               frame->type =
+                                   IFNET_KEEPALIVE_OFFLOAD_FRAME_AIRPLAY;
+                               break;
+                       default:
+                               break;
+                       }
+                       data = mtod(m, u_int8_t *);
+                       bzero(data, sizeof(struct ip6_hdr) + sizeof(struct udphdr));
+                       ip6 = (__typeof__(ip6))(void *)data;
+                       udp6 = (__typeof__(udp6))(void *)(data +
+                           sizeof(struct ip6_hdr));
+                       m->m_len = sizeof(struct ip6_hdr) +
+                           sizeof(struct udphdr);
+                       data = data + (sizeof(struct ip6_hdr) +
+                           sizeof(struct udphdr));
+                       if (inp->inp_keepalive_datalen > 0 &&
+                           inp->inp_keepalive_data != NULL) {
+                               bcopy(inp->inp_keepalive_data, data,
+                                   inp->inp_keepalive_datalen);
+                               m->m_len += inp->inp_keepalive_datalen;
+                       }
+                       m->m_pkthdr.len = m->m_len;
+                       ip6->ip6_flow = inp->inp_flow & IPV6_FLOWINFO_MASK;
+                       ip6->ip6_flow = ip6->ip6_flow & ~IPV6_FLOW_ECN_MASK;
+                       ip6->ip6_vfc &= ~IPV6_VERSION_MASK;
+                       ip6->ip6_vfc |= IPV6_VERSION;
+                       ip6->ip6_nxt = IPPROTO_UDP;
+                       ip6->ip6_hlim = ip6_defhlim;
+                       ip6->ip6_plen = htons(sizeof(struct udphdr) +
+                           (u_short)inp->inp_keepalive_datalen);
+                       ip6->ip6_src = inp->in6p_laddr;
+                       if (IN6_IS_SCOPE_EMBED(&ip6->ip6_src))
+                               ip6->ip6_src.s6_addr16[1] = 0;
+
+                       ip6->ip6_dst = inp->in6p_faddr;
+                       if (IN6_IS_SCOPE_EMBED(&ip6->ip6_dst))
+                               ip6->ip6_dst.s6_addr16[1] = 0;
+
+                       udp6->uh_sport = inp->in6p_lport;
+                       udp6->uh_dport = inp->in6p_fport;
+                       udp6->uh_ulen = htons(sizeof(struct udphdr) +
+                           (u_short)inp->inp_keepalive_datalen);
+                       if (!(inp->inp_flags & INP_UDP_NOCKSUM)) {
+                               udp6->uh_sum = in6_pseudo(&ip6->ip6_src,
+                                   &ip6->ip6_dst,
+                                   htonl(sizeof(struct udphdr) +
+                                   (u_short)inp->inp_keepalive_datalen +
+                                   IPPROTO_UDP));
+                               m->m_pkthdr.csum_flags = CSUM_UDPIPV6;
+                               m->m_pkthdr.csum_data = offsetof(struct udphdr,
+                                   uh_sum);
+                       }
+                       m->m_pkthdr.pkt_proto = IPPROTO_UDP;
+                       in6_delayed_cksum(m);
+                       bcopy(m->m_data, frame->data + frame_data_offset,
+                           m->m_len);
+               }
+               if (m != NULL) {
+                       m_freem(m);
+                       m = NULL;
+               }
+               frame_index++;
+               udp_unlock(so, 1, 0);
+       }
+       lck_rw_done(udbinfo.ipi_lock);
+       *used_frames_count = frame_index;
+}