]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/net/necp.h
xnu-4903.270.47.tar.gz
[apple/xnu.git] / bsd / net / necp.h
index 8eb159c17762e6ad41d360f8d623ed482acb80f5..5ae4af20d711adcf0d4132e3e4804623a8eaedd1 100644 (file)
@@ -26,8 +26,8 @@
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
-#ifndef        _NET_NECP_H_
-#define        _NET_NECP_H_
+#ifndef _NET_NECP_H_
+#define _NET_NECP_H_
 
 #include <net/net_kev.h>
 #ifdef PRIVATE
 /*
  * Name registered by the ipsec kernel control
  */
-#define        NECP_CONTROL_NAME "com.apple.net.necp_control"
+#define NECP_CONTROL_NAME "com.apple.net.necp_control"
 
-#define NECP_TLV_LENGTH_UINT32 1
+#define NECP_TLV_LENGTH_UINT32  1
 
 struct necp_packet_header {
-    u_int8_t           packet_type;
-       u_int8_t                flags;
-    u_int32_t          message_id;
+       u_int8_t            packet_type;
+       u_int8_t                flags;
+       u_int32_t           message_id;
 };
 
 /*
  * Control message commands
  */
-#define        NECP_PACKET_TYPE_POLICY_ADD                             1
-#define        NECP_PACKET_TYPE_POLICY_GET                             2
-#define        NECP_PACKET_TYPE_POLICY_DELETE                  3
-#define        NECP_PACKET_TYPE_POLICY_APPLY_ALL               4
-#define        NECP_PACKET_TYPE_POLICY_LIST_ALL                5
-#define        NECP_PACKET_TYPE_POLICY_DELETE_ALL              6
-#define        NECP_PACKET_TYPE_SET_SESSION_PRIORITY   7
-#define        NECP_PACKET_TYPE_LOCK_SESSION_TO_PROC   8
-#define        NECP_PACKET_TYPE_REGISTER_SERVICE               9
-#define        NECP_PACKET_TYPE_UNREGISTER_SERVICE             10
-#define NECP_PACKET_TYPE_POLICY_DUMP_ALL               11
+#define NECP_PACKET_TYPE_POLICY_ADD                             1
+#define NECP_PACKET_TYPE_POLICY_GET                             2
+#define NECP_PACKET_TYPE_POLICY_DELETE                  3
+#define NECP_PACKET_TYPE_POLICY_APPLY_ALL               4
+#define NECP_PACKET_TYPE_POLICY_LIST_ALL                5
+#define NECP_PACKET_TYPE_POLICY_DELETE_ALL              6
+#define NECP_PACKET_TYPE_SET_SESSION_PRIORITY   7
+#define NECP_PACKET_TYPE_LOCK_SESSION_TO_PROC   8
+#define NECP_PACKET_TYPE_REGISTER_SERVICE               9
+#define NECP_PACKET_TYPE_UNREGISTER_SERVICE             10
+#define NECP_PACKET_TYPE_POLICY_DUMP_ALL                11
 
 /*
  * Session actions
  */
-#define        NECP_SESSION_ACTION_POLICY_ADD                          1       // In: Policy TLVs                              Out: necp_policy_id
-#define        NECP_SESSION_ACTION_POLICY_GET                          2       // In: necp_policy_id                   Out: Policy TLVs
-#define        NECP_SESSION_ACTION_POLICY_DELETE                       3       // In: necp_policy_id                   Out: None
-#define        NECP_SESSION_ACTION_POLICY_APPLY_ALL            4       // In: None                                             Out: None
-#define        NECP_SESSION_ACTION_POLICY_LIST_ALL                     5       // In: None                                             Out: TLVs of IDs
-#define        NECP_SESSION_ACTION_POLICY_DELETE_ALL           6       // In: None                                             Out: None
-#define        NECP_SESSION_ACTION_SET_SESSION_PRIORITY        7       // In: necp_session_priority    Out: None
-#define        NECP_SESSION_ACTION_LOCK_SESSION_TO_PROC        8       // In: None                                             Out: None
-#define        NECP_SESSION_ACTION_REGISTER_SERVICE            9       // In: uuid_t                                   Out: None
-#define        NECP_SESSION_ACTION_UNREGISTER_SERVICE          10      // In: uuid_t                                   Out: None
-#define        NECP_SESSION_ACTION_POLICY_DUMP_ALL                     11      // In: None                                             Out: uint32_t bytes length, then Policy TLVs
+#define NECP_SESSION_ACTION_POLICY_ADD                          1       // In: Policy TLVs                             Out: necp_policy_id
+#define NECP_SESSION_ACTION_POLICY_GET                          2       // In: necp_policy_id                  Out: Policy TLVs
+#define NECP_SESSION_ACTION_POLICY_DELETE                       3       // In: necp_policy_id                  Out: None
+#define NECP_SESSION_ACTION_POLICY_APPLY_ALL            4       // In: None                                            Out: None
+#define NECP_SESSION_ACTION_POLICY_LIST_ALL                     5       // In: None                                            Out: TLVs of IDs
+#define NECP_SESSION_ACTION_POLICY_DELETE_ALL           6       // In: None                                            Out: None
+#define NECP_SESSION_ACTION_SET_SESSION_PRIORITY        7       // In: necp_session_priority   Out: None
+#define NECP_SESSION_ACTION_LOCK_SESSION_TO_PROC        8       // In: None                                            Out: None
+#define NECP_SESSION_ACTION_REGISTER_SERVICE            9       // In: uuid_t                                  Out: None
+#define NECP_SESSION_ACTION_UNREGISTER_SERVICE          10      // In: uuid_t                                  Out: None
+#define NECP_SESSION_ACTION_POLICY_DUMP_ALL                     11      // In: None                                            Out: uint32_t bytes length, then Policy TLVs
 
 /*
  * Control message flags
  */
-#define        NECP_PACKET_FLAGS_RESPONSE                              0x01    // Used for acks, errors, and query responses
+#define NECP_PACKET_FLAGS_RESPONSE                              0x01    // Used for acks, errors, and query responses
 
 /*
  * Control message TLV types
  */
-#define        NECP_TLV_NIL                                                    0
-#define        NECP_TLV_ERROR                                                  1       // u_int32_t
-#define        NECP_TLV_POLICY_ORDER                                   2       // u_int32_t
-#define        NECP_TLV_POLICY_CONDITION                               3
-#define        NECP_TLV_POLICY_RESULT                                  4
-#define        NECP_TLV_POLICY_ID                                              5       // u_int32_t
-#define        NECP_TLV_SESSION_PRIORITY                               6       // u_int32_t
-#define        NECP_TLV_ATTRIBUTE_DOMAIN                               7       // char[]
-#define        NECP_TLV_ATTRIBUTE_ACCOUNT                              8       // char[]
-#define        NECP_TLV_SERVICE_UUID                                   9       // uuid_t
-#define        NECP_TLV_ROUTE_RULE                                             10
+#define NECP_TLV_NIL                                                    0
+#define NECP_TLV_ERROR                                                  1       // u_int32_t
+#define NECP_TLV_POLICY_ORDER                                   2       // u_int32_t
+#define NECP_TLV_POLICY_CONDITION                               3
+#define NECP_TLV_POLICY_RESULT                                  4
+#define NECP_TLV_POLICY_ID                                              5       // u_int32_t
+#define NECP_TLV_SESSION_PRIORITY                               6       // u_int32_t
+#define NECP_TLV_ATTRIBUTE_DOMAIN                               7       // char[]
+#define NECP_TLV_ATTRIBUTE_ACCOUNT                              8       // char[]
+#define NECP_TLV_SERVICE_UUID                                   9       // uuid_t
+#define NECP_TLV_ROUTE_RULE                                             10
 
 /*
  * Control message TLV sent only by the kernel to userspace
  */
-#define        NECP_TLV_POLICY_OWNER                                   100     // char []
-#define        NECP_TLV_POLICY_DUMP                                    101
-#define        NECP_TLV_POLICY_RESULT_STRING                   102     // char []
-#define        NECP_TLV_POLICY_SESSION_ORDER                   103     // u_int32_t
+#define NECP_TLV_POLICY_OWNER                                   100     // char []
+#define NECP_TLV_POLICY_DUMP                                    101
+#define NECP_TLV_POLICY_RESULT_STRING                   102     // char []
+#define NECP_TLV_POLICY_SESSION_ORDER                   103     // u_int32_t
 
 /*
  * Condition flags
  */
-#define        NECP_POLICY_CONDITION_FLAGS_NEGATIVE    0x01 // Negative
+#define NECP_POLICY_CONDITION_FLAGS_NEGATIVE    0x01 // Negative
 
 /*
  * Conditions
  * Used for setting policies as well as passing parameters to necp_match_policy.
  */
-#define        NECP_POLICY_CONDITION_DEFAULT                   0       // N/A, not valid with any other conditions
+#define NECP_POLICY_CONDITION_DEFAULT                   0       // N/A, not valid with any other conditions
 // Socket/Application conditions
-#define        NECP_POLICY_CONDITION_APPLICATION               1       // uuid_t, uses effective UUID when possible
-#define        NECP_POLICY_CONDITION_REAL_APPLICATION  2       // uuid_t, never uses effective UUID. Only valid with NECP_POLICY_CONDITION_APPLICATION
-#define        NECP_POLICY_CONDITION_DOMAIN                    3       // String, such as apple.com
-#define        NECP_POLICY_CONDITION_ACCOUNT                   4       // String
-#define        NECP_POLICY_CONDITION_ENTITLEMENT               5       // String
-#define        NECP_POLICY_CONDITION_PID                               6       // pid_t
-#define        NECP_POLICY_CONDITION_UID                               7       // uid_t
-#define        NECP_POLICY_CONDITION_ALL_INTERFACES    8       // N/A
-#define        NECP_POLICY_CONDITION_BOUND_INTERFACE   9       // String
-#define        NECP_POLICY_CONDITION_TRAFFIC_CLASS             10      // necp_policy_condition_tc_range
+#define NECP_POLICY_CONDITION_APPLICATION               1       // uuid_t, uses effective UUID when possible
+#define NECP_POLICY_CONDITION_REAL_APPLICATION  2       // uuid_t, never uses effective UUID. Only valid with NECP_POLICY_CONDITION_APPLICATION
+#define NECP_POLICY_CONDITION_DOMAIN                    3       // String, such as apple.com
+#define NECP_POLICY_CONDITION_ACCOUNT                   4       // String
+#define NECP_POLICY_CONDITION_ENTITLEMENT               5       // String
+#define NECP_POLICY_CONDITION_PID                               6       // pid_t
+#define NECP_POLICY_CONDITION_UID                               7       // uid_t
+#define NECP_POLICY_CONDITION_ALL_INTERFACES    8       // N/A
+#define NECP_POLICY_CONDITION_BOUND_INTERFACE   9       // String
+#define NECP_POLICY_CONDITION_TRAFFIC_CLASS             10      // necp_policy_condition_tc_range
 // Socket/IP conditions
-#define        NECP_POLICY_CONDITION_IP_PROTOCOL               11      // u_int8_t
-#define        NECP_POLICY_CONDITION_LOCAL_ADDR                12      // necp_policy_condition_addr
-#define        NECP_POLICY_CONDITION_REMOTE_ADDR               13      // necp_policy_condition_addr
-#define        NECP_POLICY_CONDITION_LOCAL_ADDR_RANGE  14      // necp_policy_condition_addr_range
-#define        NECP_POLICY_CONDITION_REMOTE_ADDR_RANGE 15      // necp_policy_condition_addr_range
-#define        NECP_POLICY_CONDITION_AGENT_TYPE                16      // struct necp_policy_condition_agent_type
+#define NECP_POLICY_CONDITION_IP_PROTOCOL               11      // u_int8_t
+#define NECP_POLICY_CONDITION_LOCAL_ADDR                12      // necp_policy_condition_addr
+#define NECP_POLICY_CONDITION_REMOTE_ADDR               13      // necp_policy_condition_addr
+#define NECP_POLICY_CONDITION_LOCAL_ADDR_RANGE  14      // necp_policy_condition_addr_range
+#define NECP_POLICY_CONDITION_REMOTE_ADDR_RANGE 15      // necp_policy_condition_addr_range
+#define NECP_POLICY_CONDITION_AGENT_TYPE                16      // struct necp_policy_condition_agent_type
 
 /*
  * Results
  */
-#define        NECP_POLICY_RESULT_PASS                                 1       // N/A
-#define        NECP_POLICY_RESULT_SKIP                                 2       // u_int32_t, policy order to skip to. 0 to skip all session policies.
-#define        NECP_POLICY_RESULT_DROP                                 3       // N/A
-#define        NECP_POLICY_RESULT_SOCKET_DIVERT                4       // u_int32_t, flow divert control unit
-#define        NECP_POLICY_RESULT_SOCKET_FILTER                5       // u_int32_t, filter control unit
-#define        NECP_POLICY_RESULT_IP_TUNNEL                    6       // String, interface name
-#define        NECP_POLICY_RESULT_IP_FILTER                    7       // ?
-#define        NECP_POLICY_RESULT_TRIGGER                              8       // service uuid_t
-#define        NECP_POLICY_RESULT_TRIGGER_IF_NEEDED    9       // service uuid_t
-#define        NECP_POLICY_RESULT_TRIGGER_SCOPED               10      // service uuid_t
-#define        NECP_POLICY_RESULT_NO_TRIGGER_SCOPED    11      // service uuid_t
-#define        NECP_POLICY_RESULT_SOCKET_SCOPED                12      // String, interface name
-#define        NECP_POLICY_RESULT_ROUTE_RULES                  13      // N/A, must have route rules defined
-#define        NECP_POLICY_RESULT_USE_NETAGENT                 14      // netagent uuid_t
-#define        NECP_POLICY_RESULT_NETAGENT_SCOPED              15      // netagent uuid_t
-#define        NECP_POLICY_RESULT_SCOPED_DIRECT                16      // N/A, scopes to primary physical interface
-
-#define        NECP_POLICY_RESULT_MAX                                  NECP_POLICY_RESULT_SCOPED_DIRECT
+#define NECP_POLICY_RESULT_PASS                                 1       // N/A
+#define NECP_POLICY_RESULT_SKIP                                 2       // u_int32_t, policy order to skip to. 0 to skip all session policies.
+#define NECP_POLICY_RESULT_DROP                                 3       // N/A
+#define NECP_POLICY_RESULT_SOCKET_DIVERT                4       // u_int32_t, flow divert control unit
+#define NECP_POLICY_RESULT_SOCKET_FILTER                5       // u_int32_t, filter control unit
+#define NECP_POLICY_RESULT_IP_TUNNEL                    6       // String, interface name
+#define NECP_POLICY_RESULT_IP_FILTER                    7       // ?
+#define NECP_POLICY_RESULT_TRIGGER                              8       // service uuid_t
+#define NECP_POLICY_RESULT_TRIGGER_IF_NEEDED    9       // service uuid_t
+#define NECP_POLICY_RESULT_TRIGGER_SCOPED               10      // service uuid_t
+#define NECP_POLICY_RESULT_NO_TRIGGER_SCOPED    11      // service uuid_t
+#define NECP_POLICY_RESULT_SOCKET_SCOPED                12      // String, interface name
+#define NECP_POLICY_RESULT_ROUTE_RULES                  13      // N/A, must have route rules defined
+#define NECP_POLICY_RESULT_USE_NETAGENT                 14      // netagent uuid_t
+#define NECP_POLICY_RESULT_NETAGENT_SCOPED              15      // netagent uuid_t
+#define NECP_POLICY_RESULT_SCOPED_DIRECT                16      // N/A, scopes to primary physical interface
+
+#define NECP_POLICY_RESULT_MAX                                  NECP_POLICY_RESULT_SCOPED_DIRECT
 
 /*
  * Route Rules
  * Detailed parameters for NECP_POLICY_RESULT_ROUTE_RULES.
  */
-#define        NECP_ROUTE_RULE_NONE                                    0       // N/A
-#define        NECP_ROUTE_RULE_DENY_INTERFACE                  1       // String, or empty to match all
-#define        NECP_ROUTE_RULE_ALLOW_INTERFACE                 2       // String, or empty to match all
-#define        NECP_ROUTE_RULE_QOS_MARKING                             3       // String, or empty to match all
-#define        NECP_ROUTE_RULE_DENY_LQM_ABORT                  4       // String, or empty to match all
+#define NECP_ROUTE_RULE_NONE                                    0       // N/A
+#define NECP_ROUTE_RULE_DENY_INTERFACE                  1       // String, or empty to match all
+#define NECP_ROUTE_RULE_ALLOW_INTERFACE                 2       // String, or empty to match all
+#define NECP_ROUTE_RULE_QOS_MARKING                             3       // String, or empty to match all
+#define NECP_ROUTE_RULE_DENY_LQM_ABORT                  4       // String, or empty to match all
 
-#define        NECP_ROUTE_RULE_FLAG_CELLULAR                   0x01
-#define        NECP_ROUTE_RULE_FLAG_WIFI                               0x02
-#define        NECP_ROUTE_RULE_FLAG_WIRED                              0x04
-#define        NECP_ROUTE_RULE_FLAG_EXPENSIVE                  0x08
+#define NECP_ROUTE_RULE_FLAG_CELLULAR                   0x01
+#define NECP_ROUTE_RULE_FLAG_WIFI                               0x02
+#define NECP_ROUTE_RULE_FLAG_WIRED                              0x04
+#define NECP_ROUTE_RULE_FLAG_EXPENSIVE                  0x08
 
 /*
  * Error types
  */
-#define        NECP_ERROR_INTERNAL                                             0
-#define        NECP_ERROR_UNKNOWN_PACKET_TYPE                  1
-#define        NECP_ERROR_INVALID_TLV                                  2
-#define        NECP_ERROR_POLICY_RESULT_INVALID                3
-#define        NECP_ERROR_POLICY_CONDITIONS_INVALID    4
-#define        NECP_ERROR_POLICY_ID_NOT_FOUND                  5
-#define        NECP_ERROR_INVALID_PROCESS                              6
-#define        NECP_ERROR_ROUTE_RULES_INVALID                  7
+#define NECP_ERROR_INTERNAL                                             0
+#define NECP_ERROR_UNKNOWN_PACKET_TYPE                  1
+#define NECP_ERROR_INVALID_TLV                                  2
+#define NECP_ERROR_POLICY_RESULT_INVALID                3
+#define NECP_ERROR_POLICY_CONDITIONS_INVALID    4
+#define NECP_ERROR_POLICY_ID_NOT_FOUND                  5
+#define NECP_ERROR_INVALID_PROCESS                              6
+#define NECP_ERROR_ROUTE_RULES_INVALID                  7
 
 // Modifiers
-#define        NECP_MASK_USERSPACE_ONLY        0x80000000      // on filter_control_unit value
+#define NECP_MASK_USERSPACE_ONLY        0x80000000      // on filter_control_unit value
 
 struct necp_policy_condition_tc_range {
        u_int32_t start_tc;
@@ -195,24 +195,24 @@ struct necp_policy_condition_tc_range {
 } __attribute__((__packed__));
 
 struct necp_policy_condition_addr {
-       u_int8_t                prefix;
+       u_int8_t                prefix;
        union {
-               struct sockaddr                 sa;
-               struct sockaddr_in              sin;
-               struct sockaddr_in6             sin6;
+               struct sockaddr                 sa;
+               struct sockaddr_in              sin;
+               struct sockaddr_in6             sin6;
        } address;
 } __attribute__((__packed__));
 
 struct necp_policy_condition_addr_range {
        union {
-               struct sockaddr                 sa;
-               struct sockaddr_in              sin;
-               struct sockaddr_in6             sin6;
+               struct sockaddr                 sa;
+               struct sockaddr_in              sin;
+               struct sockaddr_in6             sin6;
        } start_address;
        union {
-               struct sockaddr                 sa;
-               struct sockaddr_in              sin;
-               struct sockaddr_in6             sin6;
+               struct sockaddr                 sa;
+               struct sockaddr_in              sin;
+               struct sockaddr_in6             sin6;
        } end_address;
 } __attribute__((__packed__));
 
@@ -221,14 +221,14 @@ struct necp_policy_condition_agent_type {
        char agent_type[32];
 } __attribute__((__packed__));
 
-#define        NECP_SESSION_PRIORITY_UNKNOWN                   0
-#define        NECP_SESSION_PRIORITY_CONTROL                   1
-#define        NECP_SESSION_PRIORITY_PRIVILEGED_TUNNEL 2
-#define        NECP_SESSION_PRIORITY_HIGH                              3
-#define        NECP_SESSION_PRIORITY_DEFAULT                   4
-#define        NECP_SESSION_PRIORITY_LOW                               5
+#define NECP_SESSION_PRIORITY_UNKNOWN                   0
+#define NECP_SESSION_PRIORITY_CONTROL                   1
+#define NECP_SESSION_PRIORITY_PRIVILEGED_TUNNEL 2
+#define NECP_SESSION_PRIORITY_HIGH                              3
+#define NECP_SESSION_PRIORITY_DEFAULT                   4
+#define NECP_SESSION_PRIORITY_LOW                               5
 
-#define        NECP_SESSION_NUM_PRIORITIES                             NECP_SESSION_PRIORITY_LOW
+#define NECP_SESSION_NUM_PRIORITIES                             NECP_SESSION_PRIORITY_LOW
 
 typedef u_int32_t necp_policy_id;
 typedef u_int32_t necp_policy_order;
@@ -238,31 +238,31 @@ typedef u_int32_t necp_kernel_policy_result;
 typedef u_int32_t necp_kernel_policy_filter;
 
 typedef union {
-       u_int                                           tunnel_interface_index;
-       u_int                                           scoped_interface_index;
-       u_int32_t                                       flow_divert_control_unit;
-       u_int32_t                                       filter_control_unit;
+       u_int                                           tunnel_interface_index;
+       u_int                                           scoped_interface_index;
+       u_int32_t                                       flow_divert_control_unit;
+       u_int32_t                                       filter_control_unit;
 } necp_kernel_policy_routing_result_parameter;
 
-#define        NECP_SERVICE_FLAGS_REGISTERED                   0x01
-#define        NECP_MAX_NETAGENTS                                              8
+#define NECP_SERVICE_FLAGS_REGISTERED                   0x01
+#define NECP_MAX_NETAGENTS                                              8
 
-#define NECP_AGENT_USE_FLAG_SCOPE                              0x01
+#define NECP_AGENT_USE_FLAG_SCOPE                               0x01
 
 #define NECP_TFO_COOKIE_LEN_MAX      16
 struct necp_aggregate_result {
-       necp_kernel_policy_result                       routing_result;
-       necp_kernel_policy_routing_result_parameter     routing_result_parameter;
-       necp_kernel_policy_filter                       filter_control_unit;
-       necp_kernel_policy_result                       service_action;
-       uuid_t                                                          service_uuid;
-       u_int32_t                                                       service_flags;
-       u_int32_t                                                       service_data;
-       u_int                                                           routed_interface_index;
-       u_int32_t                                                       policy_id;
-       uuid_t                                                          netagents[NECP_MAX_NETAGENTS];
-       u_int32_t                                                       netagent_use_flags[NECP_MAX_NETAGENTS];
-       u_int8_t                                                        mss_recommended;
+       necp_kernel_policy_result                       routing_result;
+       necp_kernel_policy_routing_result_parameter     routing_result_parameter;
+       necp_kernel_policy_filter                       filter_control_unit;
+       necp_kernel_policy_result                       service_action;
+       uuid_t                                                          service_uuid;
+       u_int32_t                                                       service_flags;
+       u_int32_t                                                       service_data;
+       u_int                                                           routed_interface_index;
+       u_int32_t                                                       policy_id;
+       uuid_t                                                          netagents[NECP_MAX_NETAGENTS];
+       u_int32_t                                                       netagent_use_flags[NECP_MAX_NETAGENTS];
+       u_int8_t                                                        mss_recommended;
 };
 
 /*
@@ -270,27 +270,26 @@ struct necp_aggregate_result {
  * but they get entangled with #defines for v4 etc in pfvar.h and it may be better practice
  * to have separate definitions here.
  */
-struct necp_stat_counts
-{
+struct necp_stat_counts {
        /*      Counters        */
-       u_int64_t       necp_stat_rxpackets             __attribute__((aligned(8)));
-       u_int64_t       necp_stat_rxbytes               __attribute__((aligned(8)));
-       u_int64_t       necp_stat_txpackets             __attribute__((aligned(8)));
-       u_int64_t       necp_stat_txbytes               __attribute__((aligned(8)));
+       u_int64_t       necp_stat_rxpackets             __attribute__((aligned(8)));
+       u_int64_t       necp_stat_rxbytes               __attribute__((aligned(8)));
+       u_int64_t       necp_stat_txpackets             __attribute__((aligned(8)));
+       u_int64_t       necp_stat_txbytes               __attribute__((aligned(8)));
 
-       u_int32_t       necp_stat_rxduplicatebytes;
-       u_int32_t       necp_stat_rxoutoforderbytes;
-       u_int32_t       necp_stat_txretransmit;
+       u_int32_t       necp_stat_rxduplicatebytes;
+       u_int32_t       necp_stat_rxoutoforderbytes;
+       u_int32_t       necp_stat_txretransmit;
 
-       u_int32_t       necp_stat_connectattempts;
-       u_int32_t       necp_stat_connectsuccesses;
+       u_int32_t       necp_stat_connectattempts;
+       u_int32_t       necp_stat_connectsuccesses;
 
-       u_int32_t       necp_stat_min_rtt;
-       u_int32_t       necp_stat_avg_rtt;
-       u_int32_t       necp_stat_var_rtt;
+       u_int32_t       necp_stat_min_rtt;
+       u_int32_t       necp_stat_avg_rtt;
+       u_int32_t       necp_stat_var_rtt;
 
-#define        NECP_STAT_ROUTE_FLAGS   1
-       u_int32_t       necp_stat_route_flags;
+#define NECP_STAT_ROUTE_FLAGS   1
+       u_int32_t       necp_stat_route_flags;
 };
 
 // Note, some metadata is implicit in the necp client itself:
@@ -299,91 +298,89 @@ struct necp_stat_counts
 //
 // The following may well be supplied via future necp client parameters,
 // but they are here so they don't get forgotten.
-struct necp_basic_metadata
-{
-       u_int32_t       rcvbufsize;
-       u_int32_t       rcvbufused;
+struct necp_basic_metadata {
+       u_int32_t       rcvbufsize;
+       u_int32_t       rcvbufused;
 };
 
 struct necp_tcp_probe_status {
-       unsigned int    probe_activated : 1;
-       unsigned int    write_probe_failed : 1;
-       unsigned int    read_probe_failed : 1;
-       unsigned int    conn_probe_failed : 1;
+       unsigned int    probe_activated : 1;
+       unsigned int    write_probe_failed : 1;
+       unsigned int    read_probe_failed : 1;
+       unsigned int    conn_probe_failed : 1;
 };
 
-struct necp_extra_tcp_metadata
-{
+struct necp_extra_tcp_metadata {
        struct necp_tcp_probe_status probestatus;
 
-       u_int32_t       sndbufsize;
-       u_int32_t       sndbufused;
-       u_int32_t       txunacked;
-       u_int32_t       txwindow;
-       u_int32_t       txcwindow;
-       u_int32_t       flags;                  // use SOF_*
-       u_int32_t       flags1;                 // use SOF1_*
-       u_int32_t       traffic_mgt_flags;
-       u_int32_t       cc_alg_index;
-       u_int32_t       state;
-       activity_bitmap_t       activity_bitmap;
+       u_int32_t       sndbufsize;
+       u_int32_t       sndbufused;
+       u_int32_t       txunacked;
+       u_int32_t       txwindow;
+       u_int32_t       txcwindow;
+       u_int32_t       flags;                  // use SOF_*
+       u_int32_t       flags1;                 // use SOF1_*
+       u_int32_t       traffic_mgt_flags;
+       u_int32_t       cc_alg_index;
+       u_int32_t       state;
+       activity_bitmap_t       activity_bitmap;
 };
 
 struct necp_stats_hdr {
-       u_int32_t                                       necp_stats_type __attribute__((aligned(8)));
-       u_int32_t                                       necp_stats_ver;
-       u_int64_t                                       __necp_stats_reserved; // Pad the field for future use
+       u_int32_t                                       necp_stats_type __attribute__((aligned(8)));
+       u_int32_t                                       necp_stats_ver;
+       u_int64_t                                       __necp_stats_reserved; // Pad the field for future use
 };
 
-#define        NECP_CLIENT_STATISTICS_TYPE_TCP                         1       // Identifies use of necp_tcp_stats
-#define        NECP_CLIENT_STATISTICS_TYPE_UDP                         2       // Identifies use of necp_udp_stats
-#define        NECP_CLIENT_STATISTICS_TYPE_TCP_VER_1           1       // Currently supported version for TCP
-#define        NECP_CLIENT_STATISTICS_TYPE_UDP_VER_1           1       // Currently supported version for UDP
+#define NECP_CLIENT_STATISTICS_TYPE_TCP                         1       // Identifies use of necp_tcp_stats
+#define NECP_CLIENT_STATISTICS_TYPE_UDP                         2       // Identifies use of necp_udp_stats
+#define NECP_CLIENT_STATISTICS_TYPE_TCP_VER_1           1       // Currently supported version for TCP
+#define NECP_CLIENT_STATISTICS_TYPE_UDP_VER_1           1       // Currently supported version for UDP
 
-#define NECP_CLIENT_STATISTICS_TYPE_TCP_CURRENT_VER            NECP_CLIENT_STATISTICS_TYPE_TCP_VER_1
-#define NECP_CLIENT_STATISTICS_TYPE_UDP_CURRENT_VER            NECP_CLIENT_STATISTICS_TYPE_UDP_VER_1
+#define NECP_CLIENT_STATISTICS_TYPE_TCP_CURRENT_VER             NECP_CLIENT_STATISTICS_TYPE_TCP_VER_1
+#define NECP_CLIENT_STATISTICS_TYPE_UDP_CURRENT_VER             NECP_CLIENT_STATISTICS_TYPE_UDP_VER_1
 
-#define NECP_CLIENT_STATISTICS_EVENT_INIT                      0x00000000              // Register the flow
-#define NECP_CLIENT_STATISTICS_EVENT_TIME_WAIT         0x00000001              // The flow is effectively finished but waiting on timer
+#define NECP_CLIENT_STATISTICS_EVENT_INIT                       0x00000000              // Register the flow
+#define NECP_CLIENT_STATISTICS_EVENT_TIME_WAIT          0x00000001              // The flow is effectively finished but waiting on timer
 
 struct necp_tcp_stats {
-       struct necp_stats_hdr                   necp_tcp_hdr;
-       struct necp_stat_counts                 necp_tcp_counts;
-       struct necp_basic_metadata              necp_tcp_basic;
-       struct necp_extra_tcp_metadata  necp_tcp_extra;
+       struct necp_stats_hdr                   necp_tcp_hdr;
+       struct necp_stat_counts                 necp_tcp_counts;
+       struct necp_basic_metadata              necp_tcp_basic;
+       struct necp_extra_tcp_metadata  necp_tcp_extra;
 };
 
 struct necp_udp_stats {
-       struct necp_stats_hdr           necp_udp_hdr;
-       struct necp_stat_counts         necp_udp_counts;
-       struct necp_basic_metadata      necp_udp_basic;
+       struct necp_stats_hdr           necp_udp_hdr;
+       struct necp_stat_counts         necp_udp_counts;
+       struct necp_basic_metadata      necp_udp_basic;
 };
 
 typedef struct necp_all_stats {
        union {
-               struct necp_tcp_stats   tcp_stats;
-               struct necp_udp_stats   udp_stats;
+               struct necp_tcp_stats   tcp_stats;
+               struct necp_udp_stats   udp_stats;
        } all_stats_u;
 } necp_all_stats;
 
 // Memory for statistics is requested via a necp_stats_bufreq
 //
 struct necp_stats_bufreq {
-       u_int32_t                                       necp_stats_bufreq_id __attribute__((aligned(8)));
-       u_int32_t                                       necp_stats_bufreq_type;         //  NECP_CLIENT_STATISTICS_TYPE_*
-       u_int32_t                                       necp_stats_bufreq_ver;          //  NECP_CLIENT_STATISTICS_TYPE_*_VER
-       u_int32_t                                       necp_stats_bufreq_size;
+       u_int32_t                                       necp_stats_bufreq_id __attribute__((aligned(8)));
+       u_int32_t                                       necp_stats_bufreq_type;         //  NECP_CLIENT_STATISTICS_TYPE_*
+       u_int32_t                                       necp_stats_bufreq_ver;          //  NECP_CLIENT_STATISTICS_TYPE_*_VER
+       u_int32_t                                       necp_stats_bufreq_size;
        union {
-               void                                    *necp_stats_bufreq_addr;
-               mach_vm_address_t               necp_stats_bufreq_uaddr;
+               void                                    *necp_stats_bufreq_addr;
+               mach_vm_address_t               necp_stats_bufreq_uaddr;
        };
 };
 
-#define        NECP_CLIENT_STATISTICS_BUFREQ_ID                                0xbf    // Distinguishes from statistics actions taking a necp_all_stats struct
+#define NECP_CLIENT_STATISTICS_BUFREQ_ID                                0xbf    // Distinguishes from statistics actions taking a necp_all_stats struct
 
 // There is a limit to the number of statistics structures that may be allocated per process, subject to change
 //
-#define NECP_MAX_PER_PROCESS_CLIENT_STATISTICS_STRUCTS 512
+#define NECP_MAX_PER_PROCESS_CLIENT_STATISTICS_STRUCTS  512
 
 #define NECP_TCP_ECN_HEURISTICS_SYN_RST 1
 typedef struct necp_tcp_ecn_cache {
@@ -408,11 +405,11 @@ typedef struct necp_tcp_tfo_cache {
        u_int8_t                necp_tcp_tfo_heuristics_rst_req:1; // Received RST upon SYN with the TFO-option
 } necp_tcp_tfo_cache;
 
-#define        NECP_CLIENT_CACHE_TYPE_ECN                 1       // Identifies use of necp_tcp_ecn_cache
-#define        NECP_CLIENT_CACHE_TYPE_TFO                 2       // Identifies use of necp_tcp_tfo_cache
+#define NECP_CLIENT_CACHE_TYPE_ECN                 1       // Identifies use of necp_tcp_ecn_cache
+#define NECP_CLIENT_CACHE_TYPE_TFO                 2       // Identifies use of necp_tcp_tfo_cache
 
-#define        NECP_CLIENT_CACHE_TYPE_ECN_VER_1           1       // Currently supported version for ECN
-#define        NECP_CLIENT_CACHE_TYPE_TFO_VER_1           1       // Currently supported version for TFO
+#define NECP_CLIENT_CACHE_TYPE_ECN_VER_1           1       // Currently supported version for ECN
+#define NECP_CLIENT_CACHE_TYPE_TFO_VER_1           1       // Currently supported version for TFO
 
 typedef struct necp_cache_buffer {
        u_int8_t                necp_cache_buf_type;    //  NECP_CLIENT_CACHE_TYPE_*
@@ -424,143 +421,143 @@ typedef struct necp_cache_buffer {
 /*
  * NECP Client definitions
  */
-#define NECP_MAX_CLIENT_PARAMETERS_SIZE                                        1024
-#define NECP_MAX_CLIENT_RESULT_SIZE                                            512
-
-#define        NECP_OPEN_FLAG_OBSERVER                                                 0x01 // Observers can query clients they don't own
-#define        NECP_OPEN_FLAG_BACKGROUND                                               0x02 // Mark this fd as backgrounded
-#define        NECP_OPEN_FLAG_PUSH_OBSERVER                                    0x04 // When used with the OBSERVER flag, allows updates to be pushed. Adding clients is not allowed in this mode.
-
-#define        NECP_FD_SUPPORTS_GUARD                                                  1
-
-#define        NECP_CLIENT_ACTION_ADD                                                  1 // Register a new client. Input: parameters in buffer; Output: client_id
-#define        NECP_CLIENT_ACTION_REMOVE                                               2 // Unregister a client. Input: client_id, optional struct ifnet_stats_per_flow
-#define        NECP_CLIENT_ACTION_COPY_PARAMETERS                              3 // Copy client parameters. Input: client_id; Output: parameters in buffer
-#define        NECP_CLIENT_ACTION_COPY_RESULT                                  4 // Copy client result. Input: client_id; Output: result in buffer
-#define        NECP_CLIENT_ACTION_COPY_LIST                                    5 // Copy all client IDs. Output: struct necp_client_list in buffer
-#define        NECP_CLIENT_ACTION_REQUEST_NEXUS_INSTANCE               6 // Request a nexus instance from a nexus provider, optional struct necp_stats_bufreq
-#define        NECP_CLIENT_ACTION_AGENT                                                7 // Interact with agent. Input: client_id, agent parameters
-#define        NECP_CLIENT_ACTION_COPY_AGENT                                   8 // Copy agent content. Input: agent UUID; Output: struct netagent
-#define        NECP_CLIENT_ACTION_COPY_INTERFACE                               9 // Copy interface details. Input: ifindex cast to UUID; Output: struct necp_interface_details
-#define        NECP_CLIENT_ACTION_SET_STATISTICS                               10 // Deprecated
-#define        NECP_CLIENT_ACTION_COPY_ROUTE_STATISTICS                11 // Get route statistics. Input: client_id; Output: struct necp_stat_counts
-#define        NECP_CLIENT_ACTION_AGENT_USE                                    12 // Return the use count and increment the use count. Input/Output: struct necp_agent_use_parameters
-#define        NECP_CLIENT_ACTION_MAP_SYSCTLS                                  13 // Get the read-only sysctls memory location. Output: mach_vm_address_t
-#define        NECP_CLIENT_ACTION_UPDATE_CACHE                                 14 // Update heuristics and cache
-#define        NECP_CLIENT_ACTION_COPY_CLIENT_UPDATE                   15 // Fetch an updated client for push-mode observer. Output: Client id, struct necp_client_observer_update in buffer
-#define        NECP_CLIENT_ACTION_COPY_UPDATED_RESULT                  16 // Copy client result only if changed. Input: client_id; Output: result in buffer
-#define        NECP_CLIENT_ACTION_ADD_FLOW                                             17 // Add a flow. Input: client_id; Output: struct necp_client_add_flow
-#define        NECP_CLIENT_ACTION_REMOVE_FLOW                                  18 // Remove a flow. Input: flow_id, optional struct ifnet_stats_per_flow
-
-
-#define        NECP_CLIENT_PARAMETER_APPLICATION                               NECP_POLICY_CONDITION_APPLICATION               // Requires entitlement
-#define        NECP_CLIENT_PARAMETER_REAL_APPLICATION                  NECP_POLICY_CONDITION_REAL_APPLICATION  // Requires entitlement
-#define        NECP_CLIENT_PARAMETER_DOMAIN                                    NECP_POLICY_CONDITION_DOMAIN
-#define        NECP_CLIENT_PARAMETER_ACCOUNT                                   NECP_POLICY_CONDITION_ACCOUNT
-#define        NECP_CLIENT_PARAMETER_PID                                               NECP_POLICY_CONDITION_PID                               // Requires entitlement
-#define        NECP_CLIENT_PARAMETER_UID                                               NECP_POLICY_CONDITION_UID                               // Requires entitlement
-#define        NECP_CLIENT_PARAMETER_BOUND_INTERFACE                   NECP_POLICY_CONDITION_BOUND_INTERFACE
-#define        NECP_CLIENT_PARAMETER_TRAFFIC_CLASS                             NECP_POLICY_CONDITION_TRAFFIC_CLASS
-#define        NECP_CLIENT_PARAMETER_IP_PROTOCOL                               NECP_POLICY_CONDITION_IP_PROTOCOL
-#define        NECP_CLIENT_PARAMETER_LOCAL_ADDRESS                             NECP_POLICY_CONDITION_LOCAL_ADDR
-#define        NECP_CLIENT_PARAMETER_REMOTE_ADDRESS                    NECP_POLICY_CONDITION_REMOTE_ADDR
-#define NECP_CLIENT_PARAMETER_NEXUS_KEY                                        102
+#define NECP_MAX_CLIENT_PARAMETERS_SIZE                                 1024
+#define NECP_MAX_CLIENT_RESULT_SIZE                                             512
+
+#define NECP_OPEN_FLAG_OBSERVER                                                 0x01 // Observers can query clients they don't own
+#define NECP_OPEN_FLAG_BACKGROUND                                               0x02 // Mark this fd as backgrounded
+#define NECP_OPEN_FLAG_PUSH_OBSERVER                                    0x04 // When used with the OBSERVER flag, allows updates to be pushed. Adding clients is not allowed in this mode.
+
+#define NECP_FD_SUPPORTS_GUARD                                                  1
+
+#define NECP_CLIENT_ACTION_ADD                                                  1 // Register a new client. Input: parameters in buffer; Output: client_id
+#define NECP_CLIENT_ACTION_REMOVE                                               2 // Unregister a client. Input: client_id, optional struct ifnet_stats_per_flow
+#define NECP_CLIENT_ACTION_COPY_PARAMETERS                              3 // Copy client parameters. Input: client_id; Output: parameters in buffer
+#define NECP_CLIENT_ACTION_COPY_RESULT                                  4 // Copy client result. Input: client_id; Output: result in buffer
+#define NECP_CLIENT_ACTION_COPY_LIST                                    5 // Copy all client IDs. Output: struct necp_client_list in buffer
+#define NECP_CLIENT_ACTION_REQUEST_NEXUS_INSTANCE               6 // Request a nexus instance from a nexus provider, optional struct necp_stats_bufreq
+#define NECP_CLIENT_ACTION_AGENT                                                7 // Interact with agent. Input: client_id, agent parameters
+#define NECP_CLIENT_ACTION_COPY_AGENT                                   8 // Copy agent content. Input: agent UUID; Output: struct netagent
+#define NECP_CLIENT_ACTION_COPY_INTERFACE                               9 // Copy interface details. Input: ifindex cast to UUID; Output: struct necp_interface_details
+#define NECP_CLIENT_ACTION_SET_STATISTICS                               10 // Deprecated
+#define NECP_CLIENT_ACTION_COPY_ROUTE_STATISTICS                11 // Get route statistics. Input: client_id; Output: struct necp_stat_counts
+#define NECP_CLIENT_ACTION_AGENT_USE                                    12 // Return the use count and increment the use count. Input/Output: struct necp_agent_use_parameters
+#define NECP_CLIENT_ACTION_MAP_SYSCTLS                                  13 // Get the read-only sysctls memory location. Output: mach_vm_address_t
+#define NECP_CLIENT_ACTION_UPDATE_CACHE                                 14 // Update heuristics and cache
+#define NECP_CLIENT_ACTION_COPY_CLIENT_UPDATE                   15 // Fetch an updated client for push-mode observer. Output: Client id, struct necp_client_observer_update in buffer
+#define NECP_CLIENT_ACTION_COPY_UPDATED_RESULT                  16 // Copy client result only if changed. Input: client_id; Output: result in buffer
+#define NECP_CLIENT_ACTION_ADD_FLOW                                             17 // Add a flow. Input: client_id; Output: struct necp_client_add_flow
+#define NECP_CLIENT_ACTION_REMOVE_FLOW                                  18 // Remove a flow. Input: flow_id, optional struct ifnet_stats_per_flow
+
+
+#define NECP_CLIENT_PARAMETER_APPLICATION                               NECP_POLICY_CONDITION_APPLICATION               // Requires entitlement
+#define NECP_CLIENT_PARAMETER_REAL_APPLICATION                  NECP_POLICY_CONDITION_REAL_APPLICATION  // Requires entitlement
+#define NECP_CLIENT_PARAMETER_DOMAIN                                    NECP_POLICY_CONDITION_DOMAIN
+#define NECP_CLIENT_PARAMETER_ACCOUNT                                   NECP_POLICY_CONDITION_ACCOUNT
+#define NECP_CLIENT_PARAMETER_PID                                               NECP_POLICY_CONDITION_PID                               // Requires entitlement
+#define NECP_CLIENT_PARAMETER_UID                                               NECP_POLICY_CONDITION_UID                               // Requires entitlement
+#define NECP_CLIENT_PARAMETER_BOUND_INTERFACE                   NECP_POLICY_CONDITION_BOUND_INTERFACE
+#define NECP_CLIENT_PARAMETER_TRAFFIC_CLASS                             NECP_POLICY_CONDITION_TRAFFIC_CLASS
+#define NECP_CLIENT_PARAMETER_IP_PROTOCOL                               NECP_POLICY_CONDITION_IP_PROTOCOL
+#define NECP_CLIENT_PARAMETER_LOCAL_ADDRESS                             NECP_POLICY_CONDITION_LOCAL_ADDR
+#define NECP_CLIENT_PARAMETER_REMOTE_ADDRESS                    NECP_POLICY_CONDITION_REMOTE_ADDR
+#define NECP_CLIENT_PARAMETER_NEXUS_KEY                                 102
 
 // "Prohibit" will never choose an interface with that property
-#define        NECP_CLIENT_PARAMETER_PROHIBIT_INTERFACE                100             // String, interface name
-#define        NECP_CLIENT_PARAMETER_PROHIBIT_IF_TYPE                  101             // u_int8_t, see ifru_functional_type in <net/if.h>
-#define        NECP_CLIENT_PARAMETER_PROHIBIT_AGENT                    102             // uuid_t, network agent UUID
-#define        NECP_CLIENT_PARAMETER_PROHIBIT_AGENT_TYPE               103             // struct necp_client_parameter_netagent_type
+#define NECP_CLIENT_PARAMETER_PROHIBIT_INTERFACE                100             // String, interface name
+#define NECP_CLIENT_PARAMETER_PROHIBIT_IF_TYPE                  101             // u_int8_t, see ifru_functional_type in <net/if.h>
+#define NECP_CLIENT_PARAMETER_PROHIBIT_AGENT                    102             // uuid_t, network agent UUID
+#define NECP_CLIENT_PARAMETER_PROHIBIT_AGENT_TYPE               103             // struct necp_client_parameter_netagent_type
 
 // "Require" will choose an interface with that property, or none if not found
-#define        NECP_CLIENT_PARAMETER_REQUIRE_IF_TYPE                   111             // u_int8_t, see ifru_functional_type in <net/if.h>
-#define        NECP_CLIENT_PARAMETER_REQUIRE_AGENT                             112             // uuid_t, network agent UUID
-#define        NECP_CLIENT_PARAMETER_REQUIRE_AGENT_TYPE                113             // struct necp_client_parameter_netagent_type
+#define NECP_CLIENT_PARAMETER_REQUIRE_IF_TYPE                   111             // u_int8_t, see ifru_functional_type in <net/if.h>
+#define NECP_CLIENT_PARAMETER_REQUIRE_AGENT                             112             // uuid_t, network agent UUID
+#define NECP_CLIENT_PARAMETER_REQUIRE_AGENT_TYPE                113             // struct necp_client_parameter_netagent_type
 
 // "Prefer" will choose an interface with an agent, or best otherwise if not found
-#define        NECP_CLIENT_PARAMETER_PREFER_AGENT                              122             // uuid_t, network agent UUID
-#define        NECP_CLIENT_PARAMETER_PREFER_AGENT_TYPE                 123             // struct necp_client_parameter_netagent_type
+#define NECP_CLIENT_PARAMETER_PREFER_AGENT                              122             // uuid_t, network agent UUID
+#define NECP_CLIENT_PARAMETER_PREFER_AGENT_TYPE                 123             // struct necp_client_parameter_netagent_type
 
 // "Avoid" will choose an interface without an agent, or best otherwise if unavoidable
-#define        NECP_CLIENT_PARAMETER_AVOID_AGENT                               124             // uuid_t, network agent UUID
-#define        NECP_CLIENT_PARAMETER_AVOID_AGENT_TYPE                  125             // struct necp_client_parameter_netagent_type
+#define NECP_CLIENT_PARAMETER_AVOID_AGENT                               124             // uuid_t, network agent UUID
+#define NECP_CLIENT_PARAMETER_AVOID_AGENT_TYPE                  125             // struct necp_client_parameter_netagent_type
 
 // Use actions with NECP_CLIENT_ACTION_AGENT
-#define        NECP_CLIENT_PARAMETER_TRIGGER_AGENT                             130             // uuid_t, network agent UUID
-#define        NECP_CLIENT_PARAMETER_ASSERT_AGENT                              131             // uuid_t, network agent UUID
-#define        NECP_CLIENT_PARAMETER_UNASSERT_AGENT                    132             // uuid_t, network agent UUID
-
-#define        NECP_CLIENT_PARAMETER_LOCAL_ENDPOINT                    200             // struct necp_client_endpoint
-#define        NECP_CLIENT_PARAMETER_REMOTE_ENDPOINT                   201             // struct necp_client_endpoint
-#define        NECP_CLIENT_PARAMETER_BROWSE_CATEGORY                   202             // struct necp_client_endpoint
-
-#define        NECP_CLIENT_PARAMETER_FLAGS                                             250             // u_int32_t, see NECP_CLIENT_PAREMETER_FLAG_* values
-
-#define        NECP_CLIENT_PARAMETER_FLAG_MULTIPATH                    0x0001  // Get multipath interface results
-#define        NECP_CLIENT_PARAMETER_FLAG_BROWSE                               0x0002  // Agent assertions on nexuses are requests to browse
-#define        NECP_CLIENT_PARAMETER_FLAG_PROHIBIT_EXPENSIVE   0x0004  // Prohibit expensive interfaces
-#define        NECP_CLIENT_PARAMETER_FLAG_LISTENER                             0x0008  // Client is interested in listening for inbound connections
-#define        NECP_CLIENT_PARAMETER_FLAG_DISCRETIONARY                0x0010  // Client's traffic is discretionary, and eligible for early defuncting
-#define        NECP_CLIENT_PARAMETER_FLAG_ECN_ENABLE                   0x0020  // Client is requesting to enable ECN
-#define        NECP_CLIENT_PARAMETER_FLAG_ECN_DISABLE                  0x0040  // Client is requesting to disable ECN
-#define        NECP_CLIENT_PARAMETER_FLAG_TFO_ENABLE                   0x0080  // Client is requesting to enable TFO
-#define        NECP_CLIENT_PARAMETER_FLAG_ONLY_PRIMARY_REQUIRES_TYPE 0x0100    // Interpret NECP_CLIENT_PARAMETER_REQUIRE_IF_TYPE only for primary
-                                                                                                                                       // interface, and allow exceptions for multipath or listeners
-
-#define        NECP_CLIENT_RESULT_CLIENT_ID                                    1               // uuid_t
-#define        NECP_CLIENT_RESULT_POLICY_RESULT                                2               // u_int32_t
-#define        NECP_CLIENT_RESULT_POLICY_RESULT_PARAMETER              3               // u_int32_t
-#define        NECP_CLIENT_RESULT_FILTER_CONTROL_UNIT                  4               // u_int32_t
-#define        NECP_CLIENT_RESULT_INTERFACE_INDEX                              5               // u_int32_t
-#define        NECP_CLIENT_RESULT_NETAGENT                                             6               // struct necp_client_result_netagent
-#define        NECP_CLIENT_RESULT_FLAGS                                                7               // u_int32_t, see NECP_CLIENT_RESULT_FLAG_* values
-#define        NECP_CLIENT_RESULT_INTERFACE                                    8               // struct necp_client_result_interface
-#define        NECP_CLIENT_RESULT_INTERFACE_OPTION                             9               // struct necp_client_interface_option
-#define        NECP_CLIENT_RESULT_EFFECTIVE_MTU                                10              // u_int32_t
-#define        NECP_CLIENT_RESULT_FLOW                                                 11              // TLV array of a single flow's state
-#define        NECP_CLIENT_RESULT_PROTO_CTL_EVENT                              12
-#define        NECP_CLIENT_RESULT_TFO_COOKIE                                   13              // NECP_TFO_COOKIE_LEN_MAX
-#define        NECP_CLIENT_RESULT_TFO_FLAGS                                    14              // u_int8_t
-#define        NECP_CLIENT_RESULT_RECOMMENDED_MSS                              15              // u_int8_t
-#define        NECP_CLIENT_RESULT_FLOW_ID                                              16              // uuid_t
-#define        NECP_CLIENT_RESULT_INTERFACE_TIME_DELTA                 17              // u_int32_t, seconds since interface up/down
-
-#define        NECP_CLIENT_RESULT_NEXUS_INSTANCE                               100             // uuid_t
-#define        NECP_CLIENT_RESULT_NEXUS_PORT                                   101             // u_int16_t
-#define        NECP_CLIENT_RESULT_NEXUS_KEY                                    102             // uuid_t
-#define        NECP_CLIENT_RESULT_NEXUS_PORT_FLOW_INDEX                103             // u_int32_t
-#define        NECP_CLIENT_RESULT_NEXUS_FLOW_STATS                             104             // struct sk_stats_flow *
-
-#define        NECP_CLIENT_RESULT_LOCAL_ENDPOINT                               200             // struct necp_client_endpoint
-#define        NECP_CLIENT_RESULT_REMOTE_ENDPOINT                              201             // struct necp_client_endpoint
-#define        NECP_CLIENT_RESULT_DISCOVERED_ENDPOINT                  202             // struct necp_client_endpoint, result of browse
-#define        NECP_CLIENT_RESULT_EFFECTIVE_TRAFFIC_CLASS              210             // u_int32_t
-#define        NECP_CLIENT_RESULT_TRAFFIC_MGMT_BG                              211             // u_int32_t, 1: background, 0: not background
-
-#define        NECP_CLIENT_RESULT_FLAG_IS_LOCAL                                0x0001  // Routes to this device
-#define        NECP_CLIENT_RESULT_FLAG_IS_DIRECT                               0x0002  // Routes to directly accessible peer
-#define        NECP_CLIENT_RESULT_FLAG_HAS_IPV4                                0x0004  // Supports IPv4
-#define        NECP_CLIENT_RESULT_FLAG_HAS_IPV6                                0x0008  // Supports IPv6
-#define        NECP_CLIENT_RESULT_FLAG_DEFUNCT                                 0x0010  // Defunct
-#define        NECP_CLIENT_RESULT_FLAG_SATISFIED                               0x0020  // Satisfied path
-#define        NECP_CLIENT_RESULT_FLAG_FLOW_ASSIGNED                   0x0040  // Assigned, the flow is active
-#define        NECP_CLIENT_RESULT_FLAG_FLOW_VIABLE                             0x0080  // Viable, the flow has a valid route
-#define        NECP_CLIENT_RESULT_FLAG_PROBE_CONNECTIVITY              0x0100  // Flow should probe connectivity
-#define        NECP_CLIENT_RESULT_FLAG_ECN_ENABLED                             0x0200  // ECN should be used
-#define        NECP_CLIENT_RESULT_FLAG_FAST_OPEN_BLOCKED               0x0400  // Fast open should not be used
-#define        NECP_CLIENT_RESULT_FLAG_LINK_QUALITY_ABORT              0x0800  // Link quality is very bad, recommend close connections
-#define        NECP_CLIENT_RESULT_FLAG_ALLOW_QOS_MARKING               0x1000  // QoS marking is allowed
-#define        NECP_CLIENT_RESULT_FLAG_HAS_NAT64                       0x2000  // Has NAT64 prefix
-#define        NECP_CLIENT_RESULT_FLAG_INTERFACE_LOW_POWER             0x4000  // Interface is in low-power mode
+#define NECP_CLIENT_PARAMETER_TRIGGER_AGENT                             130             // uuid_t, network agent UUID
+#define NECP_CLIENT_PARAMETER_ASSERT_AGENT                              131             // uuid_t, network agent UUID
+#define NECP_CLIENT_PARAMETER_UNASSERT_AGENT                    132             // uuid_t, network agent UUID
+
+#define NECP_CLIENT_PARAMETER_LOCAL_ENDPOINT                    200             // struct necp_client_endpoint
+#define NECP_CLIENT_PARAMETER_REMOTE_ENDPOINT                   201             // struct necp_client_endpoint
+#define NECP_CLIENT_PARAMETER_BROWSE_CATEGORY                   202             // struct necp_client_endpoint
+
+#define NECP_CLIENT_PARAMETER_FLAGS                                             250             // u_int32_t, see NECP_CLIENT_PAREMETER_FLAG_* values
+
+#define NECP_CLIENT_PARAMETER_FLAG_MULTIPATH                    0x0001  // Get multipath interface results
+#define NECP_CLIENT_PARAMETER_FLAG_BROWSE                               0x0002  // Agent assertions on nexuses are requests to browse
+#define NECP_CLIENT_PARAMETER_FLAG_PROHIBIT_EXPENSIVE   0x0004  // Prohibit expensive interfaces
+#define NECP_CLIENT_PARAMETER_FLAG_LISTENER                             0x0008  // Client is interested in listening for inbound connections
+#define NECP_CLIENT_PARAMETER_FLAG_DISCRETIONARY                0x0010  // Client's traffic is discretionary, and eligible for early defuncting
+#define NECP_CLIENT_PARAMETER_FLAG_ECN_ENABLE                   0x0020  // Client is requesting to enable ECN
+#define NECP_CLIENT_PARAMETER_FLAG_ECN_DISABLE                  0x0040  // Client is requesting to disable ECN
+#define NECP_CLIENT_PARAMETER_FLAG_TFO_ENABLE                   0x0080  // Client is requesting to enable TFO
+#define NECP_CLIENT_PARAMETER_FLAG_ONLY_PRIMARY_REQUIRES_TYPE 0x0100    // Interpret NECP_CLIENT_PARAMETER_REQUIRE_IF_TYPE only for primary
+// interface, and allow exceptions for multipath or listeners
+
+#define NECP_CLIENT_RESULT_CLIENT_ID                                    1               // uuid_t
+#define NECP_CLIENT_RESULT_POLICY_RESULT                                2               // u_int32_t
+#define NECP_CLIENT_RESULT_POLICY_RESULT_PARAMETER              3               // u_int32_t
+#define NECP_CLIENT_RESULT_FILTER_CONTROL_UNIT                  4               // u_int32_t
+#define NECP_CLIENT_RESULT_INTERFACE_INDEX                              5               // u_int32_t
+#define NECP_CLIENT_RESULT_NETAGENT                                             6               // struct necp_client_result_netagent
+#define NECP_CLIENT_RESULT_FLAGS                                                7               // u_int32_t, see NECP_CLIENT_RESULT_FLAG_* values
+#define NECP_CLIENT_RESULT_INTERFACE                                    8               // struct necp_client_result_interface
+#define NECP_CLIENT_RESULT_INTERFACE_OPTION                             9               // struct necp_client_interface_option
+#define NECP_CLIENT_RESULT_EFFECTIVE_MTU                                10              // u_int32_t
+#define NECP_CLIENT_RESULT_FLOW                                                 11              // TLV array of a single flow's state
+#define NECP_CLIENT_RESULT_PROTO_CTL_EVENT                              12
+#define NECP_CLIENT_RESULT_TFO_COOKIE                                   13              // NECP_TFO_COOKIE_LEN_MAX
+#define NECP_CLIENT_RESULT_TFO_FLAGS                                    14              // u_int8_t
+#define NECP_CLIENT_RESULT_RECOMMENDED_MSS                              15              // u_int8_t
+#define NECP_CLIENT_RESULT_FLOW_ID                                              16              // uuid_t
+#define NECP_CLIENT_RESULT_INTERFACE_TIME_DELTA                 17              // u_int32_t, seconds since interface up/down
+
+#define NECP_CLIENT_RESULT_NEXUS_INSTANCE                               100             // uuid_t
+#define NECP_CLIENT_RESULT_NEXUS_PORT                                   101             // u_int16_t
+#define NECP_CLIENT_RESULT_NEXUS_KEY                                    102             // uuid_t
+#define NECP_CLIENT_RESULT_NEXUS_PORT_FLOW_INDEX                103             // u_int32_t
+#define NECP_CLIENT_RESULT_NEXUS_FLOW_STATS                             104             // struct sk_stats_flow *
+
+#define NECP_CLIENT_RESULT_LOCAL_ENDPOINT                               200             // struct necp_client_endpoint
+#define NECP_CLIENT_RESULT_REMOTE_ENDPOINT                              201             // struct necp_client_endpoint
+#define NECP_CLIENT_RESULT_DISCOVERED_ENDPOINT                  202             // struct necp_client_endpoint, result of browse
+#define NECP_CLIENT_RESULT_EFFECTIVE_TRAFFIC_CLASS              210             // u_int32_t
+#define NECP_CLIENT_RESULT_TRAFFIC_MGMT_BG                              211             // u_int32_t, 1: background, 0: not background
+
+#define NECP_CLIENT_RESULT_FLAG_IS_LOCAL                                0x0001  // Routes to this device
+#define NECP_CLIENT_RESULT_FLAG_IS_DIRECT                               0x0002  // Routes to directly accessible peer
+#define NECP_CLIENT_RESULT_FLAG_HAS_IPV4                                0x0004  // Supports IPv4
+#define NECP_CLIENT_RESULT_FLAG_HAS_IPV6                                0x0008  // Supports IPv6
+#define NECP_CLIENT_RESULT_FLAG_DEFUNCT                                 0x0010  // Defunct
+#define NECP_CLIENT_RESULT_FLAG_SATISFIED                               0x0020  // Satisfied path
+#define NECP_CLIENT_RESULT_FLAG_FLOW_ASSIGNED                   0x0040  // Assigned, the flow is active
+#define NECP_CLIENT_RESULT_FLAG_FLOW_VIABLE                             0x0080  // Viable, the flow has a valid route
+#define NECP_CLIENT_RESULT_FLAG_PROBE_CONNECTIVITY              0x0100  // Flow should probe connectivity
+#define NECP_CLIENT_RESULT_FLAG_ECN_ENABLED                             0x0200  // ECN should be used
+#define NECP_CLIENT_RESULT_FLAG_FAST_OPEN_BLOCKED               0x0400  // Fast open should not be used
+#define NECP_CLIENT_RESULT_FLAG_LINK_QUALITY_ABORT              0x0800  // Link quality is very bad, recommend close connections
+#define NECP_CLIENT_RESULT_FLAG_ALLOW_QOS_MARKING               0x1000  // QoS marking is allowed
+#define NECP_CLIENT_RESULT_FLAG_HAS_NAT64                       0x2000  // Has NAT64 prefix
+#define NECP_CLIENT_RESULT_FLAG_INTERFACE_LOW_POWER             0x4000  // Interface is in low-power mode
 
 #define NECP_CLIENT_RESULT_FLAG_FORCE_UPDATE (NECP_CLIENT_RESULT_FLAG_HAS_IPV4 | NECP_CLIENT_RESULT_FLAG_HAS_IPV6 | NECP_CLIENT_RESULT_FLAG_HAS_NAT64 | NECP_CLIENT_RESULT_FLAG_INTERFACE_LOW_POWER)
 
-#define        NECP_CLIENT_RESULT_FAST_OPEN_SND_PROBE                  0x01    // DEPRECATED - Fast open send probe
-#define        NECP_CLIENT_RESULT_FAST_OPEN_RCV_PROBE                  0x02    // DEPRECATED - Fast open receive probe
+#define NECP_CLIENT_RESULT_FAST_OPEN_SND_PROBE                  0x01    // DEPRECATED - Fast open send probe
+#define NECP_CLIENT_RESULT_FAST_OPEN_RCV_PROBE                  0x02    // DEPRECATED - Fast open receive probe
 
-#define        NECP_CLIENT_RESULT_RECOMMENDED_MSS_NONE                 0x01
-#define        NECP_CLIENT_RESULT_RECOMMENDED_MSS_LOW                  0x02
-#define        NECP_CLIENT_RESULT_RECOMMENDED_MSS_MEDIUM               0x04
+#define NECP_CLIENT_RESULT_RECOMMENDED_MSS_NONE                 0x01
+#define NECP_CLIENT_RESULT_RECOMMENDED_MSS_LOW                  0x02
+#define NECP_CLIENT_RESULT_RECOMMENDED_MSS_MEDIUM               0x04
 
 struct necp_interface_signature {
        u_int8_t signature[IFNET_SIGNATURELEN];
@@ -579,11 +576,11 @@ struct necp_interface_details {
        struct necp_interface_signature ipv6_signature;
 };
 
-#define        NECP_INTERFACE_FLAG_EXPENSIVE                                   0x0001
-#define        NECP_INTERFACE_FLAG_TXSTART                                     0X0002
-#define        NECP_INTERFACE_FLAG_NOACKPRI                                    0x0004
-#define        NECP_INTERFACE_FLAG_3CARRIERAGG                                 0x0008
-#define        NECP_INTERFACE_FLAG_IS_LOW_POWER                                0x0010
+#define NECP_INTERFACE_FLAG_EXPENSIVE                                   0x0001
+#define NECP_INTERFACE_FLAG_TXSTART                                     0X0002
+#define NECP_INTERFACE_FLAG_NOACKPRI                                    0x0004
+#define NECP_INTERFACE_FLAG_3CARRIERAGG                                 0x0008
+#define NECP_INTERFACE_FLAG_IS_LOW_POWER                                0x0010
 
 struct necp_client_parameter_netagent_type {
        char netagent_domain[32];
@@ -627,11 +624,11 @@ struct necp_client_list {
 };
 
 struct kev_necp_policies_changed_data {
-       u_int32_t               changed_count;  // Defaults to 0.
+       u_int32_t               changed_count;  // Defaults to 0.
 };
 
-#define        NECP_CLIENT_FLOW_FLAGS_ALLOW_NEXUS                      0x01    // Request a nexus instance upon adding a flow
-#define        NECP_CLIENT_FLOW_FLAGS_USE_CLIENT_ID            0x02    // Register the client ID rather than the flow registration ID with network agents
+#define NECP_CLIENT_FLOW_FLAGS_ALLOW_NEXUS                      0x01    // Request a nexus instance upon adding a flow
+#define NECP_CLIENT_FLOW_FLAGS_USE_CLIENT_ID            0x02    // Register the client ID rather than the flow registration ID with network agents
 
 struct necp_client_flow_stats {
        u_int32_t stats_type; // NECP_CLIENT_STATISTICS_TYPE_*
@@ -654,15 +651,15 @@ struct necp_agent_use_parameters {
 };
 
 struct necp_client_flow_protoctl_event {
-       uint32_t        protoctl_event_code;
-       uint32_t        protoctl_event_val;
+       uint32_t        protoctl_event_code;
+       uint32_t        protoctl_event_val;
        /* TCP seq number is in host byte order */
-       uint32_t        protoctl_event_tcp_seq_num;
+       uint32_t        protoctl_event_tcp_seq_num;
 };
 
-#define        NECP_CLIENT_UPDATE_TYPE_PARAMETERS              1       // Parameters, for a new client
-#define        NECP_CLIENT_UPDATE_TYPE_RESULT                  2       // Result, for a udpated client
-#define        NECP_CLIENT_UPDATE_TYPE_REMOVE                  3       // Empty, for a removed client
+#define NECP_CLIENT_UPDATE_TYPE_PARAMETERS              1       // Parameters, for a new client
+#define NECP_CLIENT_UPDATE_TYPE_RESULT                  2       // Result, for a udpated client
+#define NECP_CLIENT_UPDATE_TYPE_REMOVE                  3       // Empty, for a removed client
 
 struct necp_client_observer_update {
        u_int32_t update_type;  // NECP_CLIENT_UPDATE_TYPE_*
@@ -681,12 +678,12 @@ struct necp_client_observer_update {
 
 SYSCTL_DECL(_net_necp);
 
-#define        NECPLOG(level, format, ...) do {                                                                                        \
-       log((level > LOG_NOTICE ? LOG_NOTICE : level), "%s: " format "\n", __FUNCTION__, __VA_ARGS__);  \
+#define NECPLOG(level, format, ...) do {                                                                                        \
+       log((level > LOG_NOTICE ? LOG_NOTICE : level), "%s: " format "\n", __FUNCTION__, __VA_ARGS__);  \
 } while (0)
 
-#define        NECPLOG0(level, msg) do {                                                                                       \
-       log((level > LOG_NOTICE ? LOG_NOTICE : level), "%s: %s\n", __FUNCTION__, msg);  \
+#define NECPLOG0(level, msg) do {                                                                                       \
+       log((level > LOG_NOTICE ? LOG_NOTICE : level), "%s: %s\n", __FUNCTION__, msg);  \
 } while (0)
 
 enum necp_fd_type_t {
@@ -696,9 +693,9 @@ enum necp_fd_type_t {
 };
 
 union necp_sockaddr_union {
-       struct sockaddr                 sa;
-       struct sockaddr_in              sin;
-       struct sockaddr_in6             sin6;
+       struct sockaddr                 sa;
+       struct sockaddr_in              sin;
+       struct sockaddr_in6             sin6;
 };
 
 /*
@@ -709,17 +706,17 @@ union necp_sockaddr_union {
  * ustats object
  */
 struct necp_all_kstats {
-       struct necp_all_stats           necp_stats_comm;        /* kernel private stats snapshot */
-       struct necp_all_stats           *necp_stats_ustats;     /* points to user-visible stats (in shared ustats region) */
+       struct necp_all_stats           necp_stats_comm;        /* kernel private stats snapshot */
+       struct necp_all_stats           *necp_stats_ustats;     /* points to user-visible stats (in shared ustats region) */
 };
 
 extern errno_t necp_client_init(void);
 extern int necp_application_find_policy_match_internal(proc_t proc, u_int8_t *parameters, u_int32_t parameters_size,
-                                                                                                          struct necp_aggregate_result *returned_result,
-                                                                                                          u_int32_t *flags, u_int required_interface_index,
-                                                                                                          const union necp_sockaddr_union *override_local_addr,
-                                                                                                          const union necp_sockaddr_union *override_remote_addr,
-                                                                                                          struct rtentry **returned_route, bool ignore_address);
+    struct necp_aggregate_result *returned_result,
+    u_int32_t *flags, u_int required_interface_index,
+    const union necp_sockaddr_union *override_local_addr,
+    const union necp_sockaddr_union *override_remote_addr,
+    struct rtentry **returned_route, bool ignore_address);
 /*
  * TLV utilities
  *
@@ -732,66 +729,66 @@ struct necp_tlv_header {
 } __attribute__((__packed__));
 
 extern u_int8_t *necp_buffer_write_tlv(u_int8_t *cursor, u_int8_t type, u_int32_t length, const void *value,
-                                                                          u_int8_t *buffer, u_int32_t buffer_length);
+    u_int8_t *buffer, u_int32_t buffer_length);
 extern u_int8_t *necp_buffer_write_tlv_if_different(u_int8_t *cursor, u_int8_t type,
-                                                                                                       u_int32_t length, const void *value, bool *updated,
-                                                                                                       u_int8_t *buffer, u_int32_t buffer_length);
+    u_int32_t length, const void *value, bool *updated,
+    u_int8_t *buffer, u_int32_t buffer_length);
 extern u_int8_t necp_buffer_get_tlv_type(u_int8_t *buffer, int tlv_offset);
 extern u_int32_t necp_buffer_get_tlv_length(u_int8_t *buffer, int tlv_offset);
 extern u_int8_t *necp_buffer_get_tlv_value(u_int8_t *buffer, int tlv_offset, u_int32_t *value_size);
 extern int necp_buffer_find_tlv(u_int8_t *buffer, u_int32_t buffer_length, int offset, u_int8_t type, int next);
 
-#define        NECPCTL_DROP_ALL_LEVEL                          1       /* Drop all packets if no policy matches above this level */
-#define        NECPCTL_DEBUG                                           2       /* Log all kernel policy matches */
-#define        NECPCTL_PASS_LOOPBACK                           3       /* Pass all loopback traffic */
-#define        NECPCTL_PASS_KEEPALIVES                         4       /* Pass all kernel-generated keepalive traffic */
-#define        NECPCTL_SOCKET_POLICY_COUNT                     5       /* Count of all socket-level policies */
-#define        NECPCTL_SOCKET_NON_APP_POLICY_COUNT     6       /* Count of non-per-app socket-level policies */
-#define        NECPCTL_IP_POLICY_COUNT                         7       /* Count of all ip-level policies */
-#define        NECPCTL_SESSION_COUNT                           8       /* Count of NECP sessions */
-#define        NECPCTL_CLIENT_FD_COUNT                         9       /* Count of NECP client fds */
-#define        NECPCTL_CLIENT_COUNT                            10      /* Count of NECP clients */
-#define        NECPCTL_ARENA_COUNT                                     11      /* Count of NECP arenas (stats, etc) */
-#define        NECPCTL_NEXUS_FLOW_COUNT                        12      /* Count of NECP nexus flows */
-#define        NECPCTL_SOCKET_FLOW_COUNT                       13      /* Count of NECP socket flows */
-#define        NECPCTL_IF_FLOW_COUNT                           14      /* Count of NECP socket flows */
-#define        NECPCTL_OBSERVER_FD_COUNT                       15      /* Count of NECP observer fds */
-#define        NECPCTL_OBSERVER_MESSAGE_LIMIT          16      /* Number of of NECP observer messages allowed to be queued */
-#define        NECPCTL_SYSCTL_ARENA_COUNT                      17      /* Count of sysctl arenas */
-
-#define        NECPCTL_NAMES {                                 \
-       { 0, 0 },                                                       \
-       { "drop_all_level", CTLTYPE_INT },      \
-       { "debug", CTLTYPE_INT },                       \
-       { "pass_loopback", CTLTYPE_INT },       \
-       { "pass_keepalives", CTLTYPE_INT },     \
+#define NECPCTL_DROP_ALL_LEVEL                          1       /* Drop all packets if no policy matches above this level */
+#define NECPCTL_DEBUG                                           2       /* Log all kernel policy matches */
+#define NECPCTL_PASS_LOOPBACK                           3       /* Pass all loopback traffic */
+#define NECPCTL_PASS_KEEPALIVES                         4       /* Pass all kernel-generated keepalive traffic */
+#define NECPCTL_SOCKET_POLICY_COUNT                     5       /* Count of all socket-level policies */
+#define NECPCTL_SOCKET_NON_APP_POLICY_COUNT     6       /* Count of non-per-app socket-level policies */
+#define NECPCTL_IP_POLICY_COUNT                         7       /* Count of all ip-level policies */
+#define NECPCTL_SESSION_COUNT                           8       /* Count of NECP sessions */
+#define NECPCTL_CLIENT_FD_COUNT                         9       /* Count of NECP client fds */
+#define NECPCTL_CLIENT_COUNT                            10      /* Count of NECP clients */
+#define NECPCTL_ARENA_COUNT                                     11      /* Count of NECP arenas (stats, etc) */
+#define NECPCTL_NEXUS_FLOW_COUNT                        12      /* Count of NECP nexus flows */
+#define NECPCTL_SOCKET_FLOW_COUNT                       13      /* Count of NECP socket flows */
+#define NECPCTL_IF_FLOW_COUNT                           14      /* Count of NECP socket flows */
+#define NECPCTL_OBSERVER_FD_COUNT                       15      /* Count of NECP observer fds */
+#define NECPCTL_OBSERVER_MESSAGE_LIMIT          16      /* Number of of NECP observer messages allowed to be queued */
+#define NECPCTL_SYSCTL_ARENA_COUNT                      17      /* Count of sysctl arenas */
+
+#define NECPCTL_NAMES {                                 \
+       { 0, 0 },                                                       \
+       { "drop_all_level", CTLTYPE_INT },      \
+       { "debug", CTLTYPE_INT },                       \
+       { "pass_loopback", CTLTYPE_INT },       \
+       { "pass_keepalives", CTLTYPE_INT },     \
 }
 
 typedef u_int32_t necp_kernel_policy_id;
-#define        NECP_KERNEL_POLICY_ID_NONE                      0
-#define        NECP_KERNEL_POLICY_ID_NO_MATCH          1
-#define NECP_KERNEL_POLICY_ID_FIRST_VALID_SOCKET       2
-#define NECP_KERNEL_POLICY_ID_FIRST_VALID_IP           UINT16_MAX
+#define NECP_KERNEL_POLICY_ID_NONE                      0
+#define NECP_KERNEL_POLICY_ID_NO_MATCH          1
+#define NECP_KERNEL_POLICY_ID_FIRST_VALID_SOCKET        2
+#define NECP_KERNEL_POLICY_ID_FIRST_VALID_IP            UINT16_MAX
 
 typedef u_int32_t necp_app_id;
 
-#define        NECP_KERNEL_POLICY_RESULT_NONE                                  0
-#define        NECP_KERNEL_POLICY_RESULT_PASS                                  NECP_POLICY_RESULT_PASS
-#define        NECP_KERNEL_POLICY_RESULT_SKIP                                  NECP_POLICY_RESULT_SKIP
-#define        NECP_KERNEL_POLICY_RESULT_DROP                                  NECP_POLICY_RESULT_DROP
-#define        NECP_KERNEL_POLICY_RESULT_SOCKET_DIVERT                 NECP_POLICY_RESULT_SOCKET_DIVERT
-#define        NECP_KERNEL_POLICY_RESULT_SOCKET_FILTER                 NECP_POLICY_RESULT_SOCKET_FILTER
-#define        NECP_KERNEL_POLICY_RESULT_IP_TUNNEL                             NECP_POLICY_RESULT_IP_TUNNEL
-#define        NECP_KERNEL_POLICY_RESULT_IP_FILTER                             NECP_POLICY_RESULT_IP_FILTER
-#define        NECP_KERNEL_POLICY_RESULT_TRIGGER                               NECP_POLICY_RESULT_TRIGGER
-#define        NECP_KERNEL_POLICY_RESULT_TRIGGER_IF_NEEDED             NECP_POLICY_RESULT_TRIGGER_IF_NEEDED
-#define        NECP_KERNEL_POLICY_RESULT_TRIGGER_SCOPED                NECP_POLICY_RESULT_TRIGGER_SCOPED
-#define        NECP_KERNEL_POLICY_RESULT_NO_TRIGGER_SCOPED             NECP_POLICY_RESULT_NO_TRIGGER_SCOPED
-#define        NECP_KERNEL_POLICY_RESULT_SOCKET_SCOPED                 NECP_POLICY_RESULT_SOCKET_SCOPED
-#define        NECP_KERNEL_POLICY_RESULT_ROUTE_RULES                   NECP_POLICY_RESULT_ROUTE_RULES
-#define        NECP_KERNEL_POLICY_RESULT_USE_NETAGENT                  NECP_POLICY_RESULT_USE_NETAGENT
-#define        NECP_KERNEL_POLICY_RESULT_NETAGENT_SCOPED               NECP_POLICY_RESULT_NETAGENT_SCOPED
-#define        NECP_KERNEL_POLICY_RESULT_SCOPED_DIRECT                 NECP_POLICY_RESULT_SCOPED_DIRECT
+#define NECP_KERNEL_POLICY_RESULT_NONE                                  0
+#define NECP_KERNEL_POLICY_RESULT_PASS                                  NECP_POLICY_RESULT_PASS
+#define NECP_KERNEL_POLICY_RESULT_SKIP                                  NECP_POLICY_RESULT_SKIP
+#define NECP_KERNEL_POLICY_RESULT_DROP                                  NECP_POLICY_RESULT_DROP
+#define NECP_KERNEL_POLICY_RESULT_SOCKET_DIVERT                 NECP_POLICY_RESULT_SOCKET_DIVERT
+#define NECP_KERNEL_POLICY_RESULT_SOCKET_FILTER                 NECP_POLICY_RESULT_SOCKET_FILTER
+#define NECP_KERNEL_POLICY_RESULT_IP_TUNNEL                             NECP_POLICY_RESULT_IP_TUNNEL
+#define NECP_KERNEL_POLICY_RESULT_IP_FILTER                             NECP_POLICY_RESULT_IP_FILTER
+#define NECP_KERNEL_POLICY_RESULT_TRIGGER                               NECP_POLICY_RESULT_TRIGGER
+#define NECP_KERNEL_POLICY_RESULT_TRIGGER_IF_NEEDED             NECP_POLICY_RESULT_TRIGGER_IF_NEEDED
+#define NECP_KERNEL_POLICY_RESULT_TRIGGER_SCOPED                NECP_POLICY_RESULT_TRIGGER_SCOPED
+#define NECP_KERNEL_POLICY_RESULT_NO_TRIGGER_SCOPED             NECP_POLICY_RESULT_NO_TRIGGER_SCOPED
+#define NECP_KERNEL_POLICY_RESULT_SOCKET_SCOPED                 NECP_POLICY_RESULT_SOCKET_SCOPED
+#define NECP_KERNEL_POLICY_RESULT_ROUTE_RULES                   NECP_POLICY_RESULT_ROUTE_RULES
+#define NECP_KERNEL_POLICY_RESULT_USE_NETAGENT                  NECP_POLICY_RESULT_USE_NETAGENT
+#define NECP_KERNEL_POLICY_RESULT_NETAGENT_SCOPED               NECP_POLICY_RESULT_NETAGENT_SCOPED
+#define NECP_KERNEL_POLICY_RESULT_SCOPED_DIRECT                 NECP_POLICY_RESULT_SCOPED_DIRECT
 
 typedef struct {
        u_int32_t identifier;
@@ -799,14 +796,14 @@ typedef struct {
 } necp_kernel_policy_service;
 
 typedef union {
-       u_int                                           tunnel_interface_index;
-       u_int                                           scoped_interface_index;
-       u_int32_t                                       flow_divert_control_unit;
-       u_int32_t                                       filter_control_unit;
-       u_int32_t                                       skip_policy_order;
-       u_int32_t                                       route_rule_id;
-       u_int32_t                                       netagent_id;
-       necp_kernel_policy_service      service;
+       u_int                                           tunnel_interface_index;
+       u_int                                           scoped_interface_index;
+       u_int32_t                                       flow_divert_control_unit;
+       u_int32_t                                       filter_control_unit;
+       u_int32_t                                       skip_policy_order;
+       u_int32_t                                       route_rule_id;
+       u_int32_t                                       netagent_id;
+       necp_kernel_policy_service      service;
 } necp_kernel_policy_result_parameter;
 
 enum necp_boolean_state {
@@ -816,107 +813,107 @@ enum necp_boolean_state {
 };
 
 struct necp_kernel_socket_policy {
-       LIST_ENTRY(necp_kernel_socket_policy)   chain;
-       necp_kernel_policy_id           id;
-       necp_policy_order                       order;
-       u_int32_t                                       session_order;
-       int                                                     session_pid;
-
-       u_int32_t                                       condition_mask;
-       u_int32_t                                       condition_negated_mask;
-       necp_kernel_policy_id           cond_policy_id;
-       u_int32_t                                       cond_app_id;                                    // Locally assigned ID value stored
-       u_int32_t                                       cond_real_app_id;                               // Locally assigned ID value stored
-       char                                            *cond_custom_entitlement;               // String
-       u_int8_t                                        cond_custom_entitlement_matched;// Boolean if entitlement matched app
-       u_int32_t                                       cond_account_id;                                // Locally assigned ID value stored
-       char                                            *cond_domain;                                   // String
-       u_int8_t                                        cond_domain_dot_count;                  // Number of dots in cond_domain
-       pid_t                                           cond_pid;
-       uid_t                                           cond_uid;
-       ifnet_t                                         cond_bound_interface;                   // Matches specific binding only
-       struct necp_policy_condition_tc_range cond_traffic_class;       // Matches traffic class in range
-       u_int16_t                                       cond_protocol;                                  // Matches IP protcol number
-       union necp_sockaddr_union       cond_local_start;                               // Matches local IP address (or start)
-       union necp_sockaddr_union       cond_local_end;                                 // Matches IP address range
-       u_int8_t                                        cond_local_prefix;                              // Defines subnet
-       union necp_sockaddr_union       cond_remote_start;                              // Matches remote IP address (or start)
-       union necp_sockaddr_union       cond_remote_end;                                // Matches IP address range
-       u_int8_t                                        cond_remote_prefix;                             // Defines subnet
+       LIST_ENTRY(necp_kernel_socket_policy)   chain;
+       necp_kernel_policy_id           id;
+       necp_policy_order                       order;
+       u_int32_t                                       session_order;
+       int                                                     session_pid;
+
+       u_int32_t                                       condition_mask;
+       u_int32_t                                       condition_negated_mask;
+       necp_kernel_policy_id           cond_policy_id;
+       u_int32_t                                       cond_app_id;                                    // Locally assigned ID value stored
+       u_int32_t                                       cond_real_app_id;                               // Locally assigned ID value stored
+       char                                            *cond_custom_entitlement;               // String
+       u_int8_t                                        cond_custom_entitlement_matched;// Boolean if entitlement matched app
+       u_int32_t                                       cond_account_id;                                // Locally assigned ID value stored
+       char                                            *cond_domain;                                   // String
+       u_int8_t                                        cond_domain_dot_count;                  // Number of dots in cond_domain
+       pid_t                                           cond_pid;
+       uid_t                                           cond_uid;
+       ifnet_t                                         cond_bound_interface;                   // Matches specific binding only
+       struct necp_policy_condition_tc_range cond_traffic_class;       // Matches traffic class in range
+       u_int16_t                                       cond_protocol;                                  // Matches IP protcol number
+       union necp_sockaddr_union       cond_local_start;                               // Matches local IP address (or start)
+       union necp_sockaddr_union       cond_local_end;                                 // Matches IP address range
+       u_int8_t                                        cond_local_prefix;                              // Defines subnet
+       union necp_sockaddr_union       cond_remote_start;                              // Matches remote IP address (or start)
+       union necp_sockaddr_union       cond_remote_end;                                // Matches IP address range
+       u_int8_t                                        cond_remote_prefix;                             // Defines subnet
        struct necp_policy_condition_agent_type cond_agent_type;
 
-       necp_kernel_policy_result       result;
-       necp_kernel_policy_result_parameter     result_parameter;
+       necp_kernel_policy_result       result;
+       necp_kernel_policy_result_parameter     result_parameter;
 };
 
 struct necp_kernel_ip_output_policy {
-       LIST_ENTRY(necp_kernel_ip_output_policy)        chain;
-       necp_kernel_policy_id           id;
-       necp_policy_order                       suborder;
-       necp_policy_order                       order;
-       u_int32_t                                       session_order;
-       int                                                     session_pid;
-
-       u_int32_t                                       condition_mask;
-       u_int32_t                                       condition_negated_mask;
-       necp_kernel_policy_id           cond_policy_id;
-       ifnet_t                                         cond_bound_interface;                   // Matches specific binding only
-       u_int16_t                                       cond_protocol;                                  // Matches IP protcol number
-       union necp_sockaddr_union       cond_local_start;                               // Matches local IP address (or start)
-       union necp_sockaddr_union       cond_local_end;                                 // Matches IP address range
-       u_int8_t                                        cond_local_prefix;                              // Defines subnet
-       union necp_sockaddr_union       cond_remote_start;                              // Matches remote IP address (or start)
-       union necp_sockaddr_union       cond_remote_end;                                // Matches IP address range
-       u_int8_t                                        cond_remote_prefix;                             // Defines subnet
-       u_int32_t                                       cond_last_interface_index;
-
-       necp_kernel_policy_result       result;
-       necp_kernel_policy_result_parameter     result_parameter;
+       LIST_ENTRY(necp_kernel_ip_output_policy)        chain;
+       necp_kernel_policy_id           id;
+       necp_policy_order                       suborder;
+       necp_policy_order                       order;
+       u_int32_t                                       session_order;
+       int                                                     session_pid;
+
+       u_int32_t                                       condition_mask;
+       u_int32_t                                       condition_negated_mask;
+       necp_kernel_policy_id           cond_policy_id;
+       ifnet_t                                         cond_bound_interface;                   // Matches specific binding only
+       u_int16_t                                       cond_protocol;                                  // Matches IP protcol number
+       union necp_sockaddr_union       cond_local_start;                               // Matches local IP address (or start)
+       union necp_sockaddr_union       cond_local_end;                                 // Matches IP address range
+       u_int8_t                                        cond_local_prefix;                              // Defines subnet
+       union necp_sockaddr_union       cond_remote_start;                              // Matches remote IP address (or start)
+       union necp_sockaddr_union       cond_remote_end;                                // Matches IP address range
+       u_int8_t                                        cond_remote_prefix;                             // Defines subnet
+       u_int32_t                                       cond_last_interface_index;
+
+       necp_kernel_policy_result       result;
+       necp_kernel_policy_result_parameter     result_parameter;
 };
 
-#define        MAX_KERNEL_SOCKET_POLICIES                      1
-#define        MAX_KERNEL_IP_OUTPUT_POLICIES           4
+#define MAX_KERNEL_SOCKET_POLICIES                      1
+#define MAX_KERNEL_IP_OUTPUT_POLICIES           4
 struct necp_session_policy {
        LIST_ENTRY(necp_session_policy) chain;
-       bool                            applied;                        // Applied into the kernel table
-       bool                            pending_deletion;       // Waiting to be removed from kernel table
-       bool                            pending_update;         // Policy has been modified since creation/last application
-       necp_policy_id          local_id;
-       necp_policy_order       order;
-       u_int8_t                        *result;
-       u_int32_t                       result_size;
-       u_int8_t                        *conditions; // Array of conditions, each with a u_int32_t length at start
-       u_int32_t                       conditions_size;
-       u_int8_t                        *route_rules; // Array of route rules, each with a u_int32_t length at start
-       u_int32_t                       route_rules_size;
-
-       uuid_t                          applied_app_uuid;
-       uuid_t                          applied_real_app_uuid;
-       char                            *applied_account;
-
-       uuid_t                          applied_result_uuid;
-
-       u_int32_t                       applied_route_rules_id;
-
-       necp_kernel_policy_id   kernel_socket_policies[MAX_KERNEL_SOCKET_POLICIES];
-       necp_kernel_policy_id   kernel_ip_output_policies[MAX_KERNEL_IP_OUTPUT_POLICIES];
+       bool                            applied;                        // Applied into the kernel table
+       bool                            pending_deletion;       // Waiting to be removed from kernel table
+       bool                            pending_update;         // Policy has been modified since creation/last application
+       necp_policy_id          local_id;
+       necp_policy_order       order;
+       u_int8_t                        *result;
+       u_int32_t                       result_size;
+       u_int8_t                        *conditions; // Array of conditions, each with a u_int32_t length at start
+       u_int32_t                       conditions_size;
+       u_int8_t                        *route_rules; // Array of route rules, each with a u_int32_t length at start
+       u_int32_t                       route_rules_size;
+
+       uuid_t                          applied_app_uuid;
+       uuid_t                          applied_real_app_uuid;
+       char                            *applied_account;
+
+       uuid_t                          applied_result_uuid;
+
+       u_int32_t                       applied_route_rules_id;
+
+       necp_kernel_policy_id   kernel_socket_policies[MAX_KERNEL_SOCKET_POLICIES];
+       necp_kernel_policy_id   kernel_ip_output_policies[MAX_KERNEL_IP_OUTPUT_POLICIES];
 };
 
 struct necp_aggregate_socket_result {
-       necp_kernel_policy_result                       result;
-       necp_kernel_policy_result_parameter     result_parameter;
-       necp_kernel_policy_filter                       filter_control_unit;
-       u_int32_t                                                       route_rule_id;
-       int32_t                                         qos_marking_gencount;
+       necp_kernel_policy_result                       result;
+       necp_kernel_policy_result_parameter     result_parameter;
+       necp_kernel_policy_filter                       filter_control_unit;
+       u_int32_t                                                       route_rule_id;
+       int32_t                                         qos_marking_gencount;
 };
 
 struct necp_inpcb_result {
-       u_int32_t                                                       app_id;
-       necp_kernel_policy_id                           policy_id;
-       necp_kernel_policy_id                           skip_policy_id;
-       int32_t                                                         policy_gencount;
-       u_int32_t                                                       flowhash;
-       struct necp_aggregate_socket_result     results;
+       u_int32_t                                                       app_id;
+       necp_kernel_policy_id                           policy_id;
+       necp_kernel_policy_id                           skip_policy_id;
+       int32_t                                                         policy_gencount;
+       u_int32_t                                                       flowhash;
+       struct necp_aggregate_socket_result     results;
 };
 
 extern errno_t necp_init(void);
@@ -936,36 +933,36 @@ extern u_int necp_socket_get_rescope_if_index(struct inpcb *inp);
 extern u_int32_t necp_socket_get_effective_mtu(struct inpcb *inp, u_int32_t current_mtu);
 
 extern bool necp_socket_is_allowed_to_send_recv(struct inpcb *inp, necp_kernel_policy_id *return_policy_id,
-                                                                                               u_int32_t *return_route_rule_id,
-                                                                                               necp_kernel_policy_id *return_skip_policy_id);
+    u_int32_t *return_route_rule_id,
+    necp_kernel_policy_id *return_skip_policy_id);
 extern bool necp_socket_is_allowed_to_send_recv_v4(struct inpcb *inp, u_int16_t local_port,
-                                                                                                  u_int16_t remote_port, struct in_addr *local_addr,
-                                                                                                  struct in_addr *remote_addr, ifnet_t interface,
-                                                                                                  necp_kernel_policy_id *return_policy_id, u_int32_t *return_route_rule_id,
-                                                                                                  necp_kernel_policy_id *return_skip_policy_id);
+    u_int16_t remote_port, struct in_addr *local_addr,
+    struct in_addr *remote_addr, ifnet_t interface,
+    necp_kernel_policy_id *return_policy_id, u_int32_t *return_route_rule_id,
+    necp_kernel_policy_id *return_skip_policy_id);
 extern bool necp_socket_is_allowed_to_send_recv_v6(struct inpcb *inp, u_int16_t local_port,
-                                                                                                  u_int16_t remote_port, struct in6_addr *local_addr,
-                                                                                                  struct in6_addr *remote_addr, ifnet_t interface,
-                                                                                                  necp_kernel_policy_id *return_policy_id, u_int32_t *return_route_rule_id,
-                                                                                                  necp_kernel_policy_id *return_skip_policy_id);
+    u_int16_t remote_port, struct in6_addr *local_addr,
+    struct in6_addr *remote_addr, ifnet_t interface,
+    necp_kernel_policy_id *return_policy_id, u_int32_t *return_route_rule_id,
+    necp_kernel_policy_id *return_skip_policy_id);
 extern void necp_socket_update_qos_marking(struct inpcb *inp, struct rtentry *route, struct ifnet *interface, u_int32_t route_rule_id);
 extern int necp_mark_packet_from_socket(struct mbuf *packet, struct inpcb *inp, necp_kernel_policy_id policy_id,
-                                                                               u_int32_t route_rule_id, necp_kernel_policy_id skip_policy_id);
+    u_int32_t route_rule_id, necp_kernel_policy_id skip_policy_id);
 extern necp_kernel_policy_id necp_get_policy_id_from_packet(struct mbuf *packet);
 extern necp_kernel_policy_id necp_get_skip_policy_id_from_packet(struct mbuf *packet);
 extern u_int32_t necp_get_last_interface_index_from_packet(struct mbuf *packet);
 extern u_int32_t necp_get_route_rule_id_from_packet(struct mbuf *packet);
 extern int necp_get_app_uuid_from_packet(struct mbuf *packet,
-                                                                                uuid_t app_uuid);
+    uuid_t app_uuid);
 
 extern necp_kernel_policy_id necp_socket_find_policy_match(struct inpcb *inp, struct sockaddr *override_local_addr,
-                                                                                                                  struct sockaddr *override_remote_addr, u_int32_t override_bound_interface);
+    struct sockaddr *override_remote_addr, u_int32_t override_bound_interface);
 extern necp_kernel_policy_id necp_ip_output_find_policy_match(struct mbuf *packet, int flags, struct ip_out_args *ipoa,
-                                                                                                                         necp_kernel_policy_result *result,
-                                                                                                                         necp_kernel_policy_result_parameter *result_parameter);
+    necp_kernel_policy_result *result,
+    necp_kernel_policy_result_parameter *result_parameter);
 extern necp_kernel_policy_id necp_ip6_output_find_policy_match(struct mbuf *packet, int flags, struct ip6_out_args *ip6oa,
-                                                                                                                          necp_kernel_policy_result *result,
-                                                                                                                          necp_kernel_policy_result_parameter *result_parameter);
+    necp_kernel_policy_result *result,
+    necp_kernel_policy_result_parameter *result_parameter);
 
 extern int necp_mark_packet_from_ip(struct mbuf *packet, necp_kernel_policy_id policy_id);
 extern int necp_mark_packet_from_interface(struct mbuf *packet, ifnet_t interface);
@@ -995,8 +992,8 @@ extern int necp_client_assert_bb_radio_manager(uuid_t client_id, bool assert);
 extern int necp_client_assign_from_socket(pid_t pid, uuid_t client_id, struct inpcb *inp);
 
 extern int necp_assign_client_result(uuid_t netagent_uuid, uuid_t client_id,
-                                                                        u_int8_t *assigned_results, size_t assigned_results_length);
-struct skmem_obj_info; // forward declaration
+    u_int8_t *assigned_results, size_t assigned_results_length);
+struct skmem_obj_info;  // forward declaration
 extern int necp_stats_ctor(struct skmem_obj_info *oi, struct skmem_obj_info *oim, void *arg, uint32_t skmflag);
 extern int necp_stats_dtor(void *addr, void *arg);
 
@@ -1007,10 +1004,10 @@ necp_update_flow_protoctl_event(uuid_t netagent_uuid, uuid_t client_id,
     uint32_t protoctl_event_code, uint32_t protoctl_event_val,
     uint32_t protoctl_event_tcp_seq_num);
 
-#define        NECP_FLOWADV_IDX_INVALID        UINT32_MAX
+#define NECP_FLOWADV_IDX_INVALID        UINT32_MAX
 extern void *necp_create_nexus_assign_message(uuid_t nexus_instance, u_int32_t nexus_port, void *key, uint32_t key_length,
-                                                                                         struct necp_client_endpoint *local_endpoint, struct necp_client_endpoint *remote_endpoint,
-                                                                                         u_int32_t flow_adv_index, void *flow_stats, size_t *message_length);
+    struct necp_client_endpoint *local_endpoint, struct necp_client_endpoint *remote_endpoint,
+    u_int32_t flow_adv_index, void *flow_stats, size_t *message_length);
 
 struct necp_client_nexus_parameters {
        pid_t pid;
@@ -1025,9 +1022,9 @@ struct necp_client_nexus_parameters {
        unsigned allow_qos_marking:1;
 };
 
-#define        NECP_CLIENT_CBACTION_NONVIABLE  1
-#define        NECP_CLIENT_CBACTION_VIABLE     2
-#define        NECP_CLIENT_CBACTION_INITIAL    3
+#define NECP_CLIENT_CBACTION_NONVIABLE  1
+#define NECP_CLIENT_CBACTION_VIABLE     2
+#define NECP_CLIENT_CBACTION_INITIAL    3
 
 struct necp_client_add_flow_default {
        uuid_t agent_uuid;
@@ -1050,13 +1047,13 @@ extern int necp_match_policy(const uint8_t *parameters, size_t parameters_size,
 extern int necp_open(int flags);
 
 extern int necp_client_action(int necp_fd, uint32_t action, uuid_t client_id,
-                                                         size_t client_id_len, uint8_t *buffer, size_t buffer_size);
+    size_t client_id_len, uint8_t *buffer, size_t buffer_size);
 
 extern int necp_session_open(int flags);
 
 extern int necp_session_action(int necp_fd, uint32_t action,
-                                                          uint8_t *in_buffer, size_t in_buffer_length,
-                                                          uint8_t *out_buffer, size_t out_buffer_length);
+    uint8_t *in_buffer, size_t in_buffer_length,
+    uint8_t *out_buffer, size_t out_buffer_length);
 
 #endif /* !KERNEL */