xnu-4570.71.2.tar.gz

[apple/xnu.git] / bsd / sys / socket.h

diff --git a/bsd/sys/socket.h b/bsd/sys/socket.h
index e290f0a5599d34c38763f330b026d29e35929cb9..3602f776496324dab3cd03629502fa55a86f4092 100644 (file)
--- a/bsd/sys/socket.h
+++ b/bsd/sys/socket.h
@@ -196,7 +196,7 @@
 #endif
 
 #ifdef PRIVATE
 #endif
 
 #ifdef PRIVATE

-#define        SO_EXECPATH     0x1085          /* Application Firewall Socket option */
+#define        SO_EXECPATH     0x1085          /* Application Firewall Socket option */

 
 /*
  * Traffic service class definitions (lowest to highest):
 
 /*
  * Traffic service class definitions (lowest to highest):


@@ -302,6 +302,7 @@
 #define        SO_TRAFFIC_CLASS_DBG    0x1088          /* Debug traffic class (struct so_tcdbg) */
 #define        SO_TRAFFIC_CLASS_STATS  0x1089          /* Traffic class statistics */
 #define        SO_PRIVILEGED_TRAFFIC_CLASS 0x1090      /* Privileged traffic class (bool) */
 #define        SO_TRAFFIC_CLASS_DBG    0x1088          /* Debug traffic class (struct so_tcdbg) */
 #define        SO_TRAFFIC_CLASS_STATS  0x1089          /* Traffic class statistics */
 #define        SO_PRIVILEGED_TRAFFIC_CLASS 0x1090      /* Privileged traffic class (bool) */

+#define        SO_DEFUNCTIT    0x1091          /* Defunct a socket (only in internal builds) */

 #define        SO_DEFUNCTOK    0x1100          /* can be defunct'd */
 #define        SO_ISDEFUNCT    0x1101          /* get defunct status */
 
 #define        SO_DEFUNCTOK    0x1100          /* can be defunct'd */
 #define        SO_ISDEFUNCT    0x1101          /* get defunct status */
 


@@ -324,13 +325,11 @@
 #define        SO_DELEGATED_UUID       0x1108  /* set socket as delegate (uuid_t) */
 #define        SO_NECP_ATTRIBUTES      0x1109  /* NECP socket attributes (domain, account, etc.) */
 #define        SO_CFIL_SOCK_ID         0x1110  /* get content filter socket ID (cfil_sock_id_t) */
 #define        SO_DELEGATED_UUID       0x1108  /* set socket as delegate (uuid_t) */
 #define        SO_NECP_ATTRIBUTES      0x1109  /* NECP socket attributes (domain, account, etc.) */
 #define        SO_CFIL_SOCK_ID         0x1110  /* get content filter socket ID (cfil_sock_id_t) */

-#if MPTCP
-#define        SO_MPTCP_FASTJOIN       0x1111  /* fast join MPTCP */
-#endif /* MPTCP */
+#define        SO_NECP_CLIENTUUID      0x1111  /* NECP Client uuid */

 #endif /* PRIVATE */
 #define        SO_NUMRCVPKT            0x1112  /* number of datagrams in receive socket buffer */
 #ifdef PRIVATE
 #endif /* PRIVATE */
 #define        SO_NUMRCVPKT            0x1112  /* number of datagrams in receive socket buffer */
 #ifdef PRIVATE

-#define        SO_AWDL_UNRESTRICTED    0x1113  /* try to use AWDL in restricted mode */
+#define        SO_AWDL_UNRESTRICTED    0x1113  /* try to use AWDL in restricted mode */

 #define        SO_EXTENDED_BK_IDLE     0x1114  /* extended time to keep socket idle after app is suspended (int) */
 #define        SO_MARK_CELLFALLBACK    0x1115  /* Mark as initiated by cell fallback */
 #endif /* PRIVATE */
 #define        SO_EXTENDED_BK_IDLE     0x1114  /* extended time to keep socket idle after app is suspended (int) */
 #define        SO_MARK_CELLFALLBACK    0x1115  /* Mark as initiated by cell fallback */
 #endif /* PRIVATE */


@@ -469,6 +468,7 @@ typedef __uint32_t sae_connid_t;
 /* connectx() flag parameters */
 #define        CONNECT_RESUME_ON_READ_WRITE    0x1 /* resume connect() on read/write */
 #define        CONNECT_DATA_IDEMPOTENT         0x2 /* data is idempotent */
 /* connectx() flag parameters */
 #define        CONNECT_RESUME_ON_READ_WRITE    0x1 /* resume connect() on read/write */
 #define        CONNECT_DATA_IDEMPOTENT         0x2 /* data is idempotent */

+#define        CONNECT_DATA_AUTHENTICATED      0x4 /* data includes security that replaces the TFO-cookie */

 
 /* sockaddr endpoints */
 typedef struct sa_endpoints {
 
 /* sockaddr endpoints */
 typedef struct sa_endpoints {


@@ -628,24 +628,6 @@ struct sockaddr_storage {
        char                    __ss_pad2[_SS_PAD2SIZE];
 };
 
        char                    __ss_pad2[_SS_PAD2SIZE];
 };
 

-#ifdef BSD_KERNEL_PRIVATE
-#include <sys/queue.h>
-
-struct sockaddr_entry {
-       TAILQ_ENTRY(sockaddr_entry)     se_link;
-       struct sockaddr                 *se_addr;
-       uint32_t                        se_flags;
-};
-
-#define        SEF_ATTACHED            1       /* attached to sockaddr_list */
-
-struct sockaddr_list {
-       TAILQ_HEAD(, sockaddr_entry)    sl_head;
-       uint32_t                        sl_cnt;
-
-};
-#endif /* BSD_KERNEL_PRIVATE */
-

 /*
  * Protocol families, same as address families for now.
  */
 /*
  * Protocol families, same as address families for now.
  */


@@ -1286,6 +1268,7 @@ struct so_cinforeq64 {
 
 /* valid connection info auxiliary data types */
 #define        CIAUX_TCP       0x1     /* TCP auxiliary data (conninfo_tcp_t) */
 
 /* valid connection info auxiliary data types */
 #define        CIAUX_TCP       0x1     /* TCP auxiliary data (conninfo_tcp_t) */

+#define        CIAUX_MPTCP     0x2     /* MPTCP auxiliary data (conninfo_mptcp_t) */

 
 /*
  * Structure for SIOC{S,G}CONNORDER
 
 /*
  * Structure for SIOC{S,G}CONNORDER


@@ -1442,8 +1425,12 @@ int      sendfile(int, int, off_t, off_t *, struct sf_hdtr *, int);
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 void   pfctlinput(int, struct sockaddr *);
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 void   pfctlinput(int, struct sockaddr *);

+
+__API_AVAILABLE(macosx(10.11), ios(9.0), tvos(9.0), watchos(2.0))

 int connectx(int, const sa_endpoints_t *, sae_associd_t, unsigned int,
     const struct iovec *, unsigned int, size_t *, sae_connid_t *);
 int connectx(int, const sa_endpoints_t *, sae_associd_t, unsigned int,
     const struct iovec *, unsigned int, size_t *, sae_connid_t *);

+
+__API_AVAILABLE(macosx(10.11), ios(9.0), tvos(9.0), watchos(2.0))

 int disconnectx(int, sae_associd_t, sae_connid_t);
 #endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
 __END_DECLS
 int disconnectx(int, sae_associd_t, sae_connid_t);
 #endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
 __END_DECLS