xnu-6153.61.1.tar.gz

[apple/xnu.git] / bsd / netinet / in_proto.c

diff --git a/bsd/netinet/in_proto.c b/bsd/netinet/in_proto.c
index 6e3507bec03aa2b10f5d2ca60fb6d8a9cd54a8f8..340f31f65f02a23664105d9000ff48ac61822abf 100644 (file)
--- a/bsd/netinet/in_proto.c
+++ b/bsd/netinet/in_proto.c
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (c) 2000-2013 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2019 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


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

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*


@@ -73,6 +73,7 @@
 
 #include <net/if.h>
 #include <net/route.h>
 
 #include <net/if.h>
 #include <net/route.h>

+#include <net/kpi_protocol.h>

 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>


@@ -101,7 +102,6 @@
 #if IPSEC_ESP
 #include <netinet6/esp.h>
 #endif
 #if IPSEC_ESP
 #include <netinet6/esp.h>
 #endif

-#include <netinet6/ipcomp.h>

 #endif /* IPSEC */
 
 static void in_dinit(struct domain *);
 #endif /* IPSEC */
 
 static void in_dinit(struct domain *);


@@ -115,188 +115,191 @@ extern int icmp_dgram_ctloutput(struct socket *, struct sockopt *);
 struct domain *inetdomain = NULL;
 
 /* Thanks to PPP, this still needs to be exported */
 struct domain *inetdomain = NULL;
 
 /* Thanks to PPP, this still needs to be exported */

-lck_mtx_t      *inet_domain_mutex;
+lck_mtx_t       *inet_domain_mutex;

 
 static struct protosw inetsw[] = {
 
 static struct protosw inetsw[] = {

-{
-       .pr_type =              0,
-       .pr_protocol =          0,
-       .pr_init =              ip_init,
-       .pr_drain =             ip_drain,
-       .pr_usrreqs =           &nousrreqs,
-},
-{
-       .pr_type =              SOCK_DGRAM,
-       .pr_protocol =          IPPROTO_UDP,
-       .pr_flags =             PR_ATOMIC|PR_ADDR|PR_PROTOLOCK|PR_PCBLOCK|
-                               PR_EVCONNINFO,
-       .pr_input =             udp_input,
-       .pr_ctlinput =          udp_ctlinput,
-       .pr_ctloutput =         udp_ctloutput,
-       .pr_init =              udp_init,
-       .pr_usrreqs =           &udp_usrreqs,
-       .pr_lock =              udp_lock,
-       .pr_unlock =            udp_unlock,
-       .pr_getlock =           udp_getlock,
-},
-{
-       .pr_type =              SOCK_STREAM,
-       .pr_protocol =          IPPROTO_TCP,
-       .pr_flags =             PR_CONNREQUIRED|PR_WANTRCVD|PR_PCBLOCK|
-                               PR_PROTOLOCK|PR_DISPOSE|PR_EVCONNINFO,
-       .pr_input =             tcp_input,
-       .pr_ctlinput =          tcp_ctlinput,
-       .pr_ctloutput =         tcp_ctloutput,
-       .pr_init =              tcp_init,
-       .pr_drain =             tcp_drain,
-       .pr_usrreqs =           &tcp_usrreqs,
-       .pr_lock =              tcp_lock,
-       .pr_unlock =            tcp_unlock,
-       .pr_getlock =           tcp_getlock,
-},
-{
-       .pr_type =              SOCK_RAW,
-       .pr_protocol =          IPPROTO_RAW,
-       .pr_flags =             PR_ATOMIC|PR_ADDR,
-       .pr_input =             rip_input,
-       .pr_ctlinput =          rip_ctlinput,
-       .pr_ctloutput =         rip_ctloutput,
-       .pr_usrreqs =           &rip_usrreqs,
-       .pr_unlock =            rip_unlock,
-},
-{
-       .pr_type =              SOCK_RAW,
-       .pr_protocol =          IPPROTO_ICMP,
-       .pr_flags =             PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-       .pr_input =             icmp_input,
-       .pr_ctloutput =         rip_ctloutput,
-       .pr_usrreqs =           &rip_usrreqs,
-       .pr_unlock =            rip_unlock,
-},
-{
-       .pr_type =              SOCK_DGRAM,
-       .pr_protocol =          IPPROTO_ICMP,
-       .pr_flags =             PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-       .pr_input =             icmp_input,
-       .pr_ctloutput =         icmp_dgram_ctloutput,
-       .pr_usrreqs =           &icmp_dgram_usrreqs,
-       .pr_unlock =            rip_unlock,
-},
-{
-       .pr_type =              SOCK_RAW,
-       .pr_protocol =          IPPROTO_IGMP,
-       .pr_flags =             PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-       .pr_input =             igmp_input,
-       .pr_ctloutput =         rip_ctloutput,
-       .pr_init =              igmp_init,
-       .pr_usrreqs =           &rip_usrreqs,
-       .pr_unlock =            rip_unlock,
-},
-#if MROUTING
-{
-       .pr_type =              SOCK_RAW,
-       .pr_protocol =          IPPROTO_RSVP,
-       .pr_flags =             PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-       .pr_input =             rsvp_input,
-       .pr_ctloutput =         rip_ctloutput,
-       .pr_usrreqs =           &rip_usrreqs,
-       .pr_unlock =            rip_unlock,
-},
-#endif /* MROUTING */
-{
-       .pr_type =              SOCK_RAW,
-       .pr_protocol =          IPPROTO_GRE,
-       .pr_flags =             PR_ATOMIC|PR_ADDR,
-       .pr_input =             gre_input,
-       .pr_ctlinput =          rip_ctlinput,
-       .pr_ctloutput =         rip_ctloutput,
-       .pr_usrreqs =           &rip_usrreqs,
-       .pr_unlock =            rip_unlock,
-},
+       {
+               .pr_type =              0,
+               .pr_protocol =          0,
+               .pr_init =              ip_init,
+               .pr_drain =             ip_drain,
+               .pr_usrreqs =           &nousrreqs,
+       },
+       {
+               .pr_type =              SOCK_DGRAM,
+               .pr_protocol =          IPPROTO_UDP,
+               .pr_flags =             PR_ATOMIC | PR_ADDR | PR_PROTOLOCK | PR_PCBLOCK |
+    PR_EVCONNINFO | PR_PRECONN_WRITE,
+               .pr_input =             udp_input,
+               .pr_ctlinput =          udp_ctlinput,
+               .pr_ctloutput =         udp_ctloutput,
+               .pr_init =              udp_init,
+               .pr_usrreqs =           &udp_usrreqs,
+               .pr_lock =              udp_lock,
+               .pr_unlock =            udp_unlock,
+               .pr_getlock =           udp_getlock,
+               .pr_update_last_owner = inp_update_last_owner,
+               .pr_copy_last_owner =   inp_copy_last_owner,
+       },
+       {
+               .pr_type =              SOCK_STREAM,
+               .pr_protocol =          IPPROTO_TCP,
+               .pr_flags =             PR_CONNREQUIRED | PR_WANTRCVD | PR_PCBLOCK |
+    PR_PROTOLOCK | PR_DISPOSE | PR_EVCONNINFO |
+    PR_PRECONN_WRITE | PR_DATA_IDEMPOTENT,
+               .pr_input =             tcp_input,
+               .pr_ctlinput =          tcp_ctlinput,
+               .pr_ctloutput =         tcp_ctloutput,
+               .pr_init =              tcp_init,
+               .pr_drain =             tcp_drain,
+               .pr_usrreqs =           &tcp_usrreqs,
+               .pr_lock =              tcp_lock,
+               .pr_unlock =            tcp_unlock,
+               .pr_getlock =           tcp_getlock,
+               .pr_update_last_owner = inp_update_last_owner,
+               .pr_copy_last_owner =   inp_copy_last_owner,
+       },
+       {
+               .pr_type =              SOCK_RAW,
+               .pr_protocol =          IPPROTO_RAW,
+               .pr_flags =             PR_ATOMIC | PR_ADDR,
+               .pr_input =             rip_input,
+               .pr_ctlinput =          rip_ctlinput,
+               .pr_ctloutput =         rip_ctloutput,
+               .pr_usrreqs =           &rip_usrreqs,
+               .pr_unlock =            rip_unlock,
+               .pr_update_last_owner = inp_update_last_owner,
+               .pr_copy_last_owner =   inp_copy_last_owner,
+       },
+       {
+               .pr_type =              SOCK_RAW,
+               .pr_protocol =          IPPROTO_ICMP,
+               .pr_flags =             PR_ATOMIC | PR_ADDR | PR_LASTHDR,
+               .pr_input =             icmp_input,
+               .pr_ctloutput =         rip_ctloutput,
+               .pr_usrreqs =           &rip_usrreqs,
+               .pr_unlock =            rip_unlock,
+               .pr_update_last_owner = inp_update_last_owner,
+               .pr_copy_last_owner =   inp_copy_last_owner,
+       },
+       {
+               .pr_type =              SOCK_DGRAM,
+               .pr_protocol =          IPPROTO_ICMP,
+               .pr_flags =             PR_ATOMIC | PR_ADDR | PR_LASTHDR,
+               .pr_input =             icmp_input,
+               .pr_ctloutput =         icmp_dgram_ctloutput,
+               .pr_usrreqs =           &icmp_dgram_usrreqs,
+               .pr_unlock =            rip_unlock,
+               .pr_update_last_owner = inp_update_last_owner,
+               .pr_copy_last_owner =   inp_copy_last_owner,
+       },
+       {
+               .pr_type =              SOCK_RAW,
+               .pr_protocol =          IPPROTO_IGMP,
+               .pr_flags =             PR_ATOMIC | PR_ADDR | PR_LASTHDR,
+               .pr_input =             igmp_input,
+               .pr_ctloutput =         rip_ctloutput,
+               .pr_init =              igmp_init,
+               .pr_usrreqs =           &rip_usrreqs,
+               .pr_unlock =            rip_unlock,
+               .pr_update_last_owner = inp_update_last_owner,
+               .pr_copy_last_owner =   inp_copy_last_owner,
+       },
+       {
+               .pr_type =              SOCK_RAW,
+               .pr_protocol =          IPPROTO_GRE,
+               .pr_flags =             PR_ATOMIC | PR_ADDR,
+               .pr_input =             gre_input,
+               .pr_ctlinput =          rip_ctlinput,
+               .pr_ctloutput =         rip_ctloutput,
+               .pr_usrreqs =           &rip_usrreqs,
+               .pr_unlock =            rip_unlock,
+               .pr_update_last_owner = inp_update_last_owner,
+               .pr_copy_last_owner =   inp_copy_last_owner,
+       },

 #if IPSEC
 #if IPSEC

-{
-       .pr_type =              SOCK_RAW,
-       .pr_protocol =          IPPROTO_AH,
-       .pr_flags =             PR_ATOMIC|PR_ADDR|PR_PROTOLOCK,
-       .pr_input =             ah4_input,
-       .pr_usrreqs =           &nousrreqs,
-},
+       {
+               .pr_type =              SOCK_RAW,
+               .pr_protocol =          IPPROTO_AH,
+               .pr_flags =             PR_ATOMIC | PR_ADDR | PR_PROTOLOCK,
+               .pr_input =             ah4_input,
+               .pr_usrreqs =           &nousrreqs,
+       },

 #if IPSEC_ESP
 #if IPSEC_ESP

-{
-       .pr_type =              SOCK_RAW,
-       .pr_protocol =          IPPROTO_ESP,
-       .pr_flags =             PR_ATOMIC|PR_ADDR|PR_PROTOLOCK,
-       .pr_input =             esp4_input,
-       .pr_usrreqs =           &nousrreqs,
-},
+       {
+               .pr_type =              SOCK_RAW,
+               .pr_protocol =          IPPROTO_ESP,
+               .pr_flags =             PR_ATOMIC | PR_ADDR | PR_PROTOLOCK,
+               .pr_input =             esp4_input,
+               .pr_usrreqs =           &nousrreqs,
+       },

 #endif /* IPSEC_ESP */
 #endif /* IPSEC_ESP */

-{
-       .pr_type =              SOCK_RAW,
-       .pr_protocol =          IPPROTO_IPCOMP,
-       .pr_flags =             PR_ATOMIC|PR_ADDR|PR_PROTOLOCK,
-       .pr_input =             ipcomp4_input,
-       .pr_usrreqs =           &nousrreqs,
-},

 #endif /* IPSEC */
 #endif /* IPSEC */

-{
-       .pr_type =              SOCK_RAW,
-       .pr_protocol =          IPPROTO_IPV4,
-       .pr_flags =             PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-       .pr_input =             encap4_input,
-       .pr_ctloutput =         rip_ctloutput,
-       .pr_init =              encap4_init,
-       .pr_usrreqs =           &rip_usrreqs,
-       .pr_unlock =            rip_unlock,
-},
+       {
+               .pr_type =              SOCK_RAW,
+               .pr_protocol =          IPPROTO_IPV4,
+               .pr_flags =             PR_ATOMIC | PR_ADDR | PR_LASTHDR,
+               .pr_input =             encap4_input,
+               .pr_ctloutput =         rip_ctloutput,
+               .pr_init =              encap4_init,
+               .pr_usrreqs =           &rip_usrreqs,
+               .pr_unlock =            rip_unlock,
+               .pr_update_last_owner = inp_update_last_owner,
+               .pr_copy_last_owner =   inp_copy_last_owner,
+       },

 #if INET6
 #if INET6

-{
-       .pr_type =              SOCK_RAW,
-       .pr_protocol =          IPPROTO_IPV6,
-       .pr_flags =             PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-       .pr_input =             encap4_input,
-       .pr_ctloutput =         rip_ctloutput,
-       .pr_init =              encap4_init,
-       .pr_usrreqs =           &rip_usrreqs,
-       .pr_unlock =            rip_unlock,
-},
+       {
+               .pr_type =              SOCK_RAW,
+               .pr_protocol =          IPPROTO_IPV6,
+               .pr_flags =             PR_ATOMIC | PR_ADDR | PR_LASTHDR,
+               .pr_input =             encap4_input,
+               .pr_ctloutput =         rip_ctloutput,
+               .pr_init =              encap4_init,
+               .pr_usrreqs =           &rip_usrreqs,
+               .pr_unlock =            rip_unlock,
+               .pr_update_last_owner = inp_update_last_owner,
+               .pr_copy_last_owner =   inp_copy_last_owner,
+       },

 #endif /* INET6 */
 #if IPDIVERT
 #endif /* INET6 */
 #if IPDIVERT

-{
-       .pr_type =              SOCK_RAW,
-       .pr_protocol =          IPPROTO_DIVERT,
-       .pr_flags =             PR_ATOMIC|PR_ADDR|PR_PCBLOCK,
-       .pr_input =             div_input,
-       .pr_ctloutput =         ip_ctloutput,
-       .pr_init =              div_init,
-       .pr_usrreqs =           &div_usrreqs,
-       .pr_lock =              div_lock,
-       .pr_unlock =            div_unlock,
-       .pr_getlock =           div_getlock,
-},
+       {
+               .pr_type =              SOCK_RAW,
+               .pr_protocol =          IPPROTO_DIVERT,
+               .pr_flags =             PR_ATOMIC | PR_ADDR | PR_PCBLOCK,
+               .pr_input =             div_input,
+               .pr_ctloutput =         ip_ctloutput,
+               .pr_init =              div_init,
+               .pr_usrreqs =           &div_usrreqs,
+               .pr_lock =              div_lock,
+               .pr_unlock =            div_unlock,
+               .pr_getlock =           div_getlock,
+       },

 #endif /* IPDIVERT */
 /* raw wildcard */
 #endif /* IPDIVERT */
 /* raw wildcard */

-{
-       .pr_type =              SOCK_RAW,
-       .pr_flags =             PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-       .pr_input =             rip_input,
-       .pr_ctloutput =         rip_ctloutput,
-       .pr_init =              rip_init,
-       .pr_usrreqs =           &rip_usrreqs,
-       .pr_unlock =            rip_unlock,
-},
+       {
+               .pr_type =              SOCK_RAW,
+               .pr_flags =             PR_ATOMIC | PR_ADDR | PR_LASTHDR,
+               .pr_input =             rip_input,
+               .pr_ctloutput =         rip_ctloutput,
+               .pr_init =              rip_init,
+               .pr_usrreqs =           &rip_usrreqs,
+               .pr_unlock =            rip_unlock,
+               .pr_update_last_owner = inp_update_last_owner,
+               .pr_copy_last_owner =   inp_copy_last_owner,
+       },

 };
 
 };
 

-static int in_proto_count = (sizeof (inetsw) / sizeof (struct protosw));
+static int in_proto_count = (sizeof(inetsw) / sizeof(struct protosw));

 
 struct domain inetdomain_s = {
 
 struct domain inetdomain_s = {

-       .dom_family =           PF_INET,
-       .dom_flags =            DOM_REENTRANT,
-       .dom_name =             "internet",
-       .dom_init =             in_dinit,
-       .dom_rtattach =         in_inithead,
-       .dom_rtoffset =         32,
-       .dom_maxrtkey =         sizeof (struct sockaddr_in),
-       .dom_protohdrlen =      sizeof (struct tcpiphdr),
+       .dom_family =           PF_INET,
+       .dom_flags =            DOM_REENTRANT,
+       .dom_name =             "internet",
+       .dom_init =             in_dinit,
+       .dom_rtattach =         in_inithead,
+       .dom_rtoffset =         32,
+       .dom_maxrtkey =         sizeof(struct sockaddr_in),
+       .dom_protohdrlen =      sizeof(struct tcpiphdr),

 };
 
 /* Initialize the PF_INET domain, and add in the pre-defined protos */
 };
 
 /* Initialize the PF_INET domain, and add in the pre-defined protos */


@@ -312,13 +315,22 @@ in_dinit(struct domain *dp)
 
        inetdomain = dp;
 
 
        inetdomain = dp;
 

+       /*
+        * Verify that the maximum possible tcp/ip header will still
+        * fit in a small mbuf because m_pullup only puls into 256
+        * byte mbuf
+        */
+       _CASSERT((sizeof(struct tcpiphdr) + TCP_MAXOLEN) <= _MHLEN);
+

        /*
         * Attach first, then initialize; ip_init() needs raw IP handler.
         */
        /*
         * Attach first, then initialize; ip_init() needs raw IP handler.
         */

-       for (i = 0, pr = &inetsw[0]; i < in_proto_count; i++, pr++)
+       for (i = 0, pr = &inetsw[0]; i < in_proto_count; i++, pr++) {

                net_add_proto(pr, dp, 0);
                net_add_proto(pr, dp, 0);

-       for (i = 0, pr = &inetsw[0]; i < in_proto_count; i++, pr++)
+       }
+       for (i = 0, pr = &inetsw[0]; i < in_proto_count; i++, pr++) {

                net_init_proto(pr, dp);
                net_init_proto(pr, dp);

+       }

 
        inet_domain_mutex = dp->dom_mtx;
 
 
        inet_domain_mutex = dp->dom_mtx;
 


@@ -336,38 +348,38 @@ static void
 ip_proto_input(protocol_family_t protocol, mbuf_t packet_list)
 {
 #pragma unused(protocol)
 ip_proto_input(protocol_family_t protocol, mbuf_t packet_list)
 {
 #pragma unused(protocol)

-       mbuf_t  packet;
-       int how_many = 0 ;

 
 

-       /* ip_input should handle a list of packets but does not yet */
-       for (packet = packet_list; packet; packet = packet_list) {
-               how_many++;
-               packet_list = mbuf_nextpkt(packet);
-               mbuf_setnextpkt(packet, NULL);
-               ip_input(packet);
+       if (packet_list->m_nextpkt != NULL) {
+               ip_input_process_list(packet_list);
+       } else {
+               /*
+                * XXX remove this path if ip_input_process_list is proven
+                * to be stable and has minimum overhead on most platforms.
+                */
+               ip_input(packet_list);

        }
 }
 
 SYSCTL_NODE(_net, PF_INET, inet,
        }
 }
 
 SYSCTL_NODE(_net, PF_INET, inet,

-       CTLFLAG_RW|CTLFLAG_LOCKED, 0, "Internet Family");
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "Internet Family");

 
 SYSCTL_NODE(_net_inet, IPPROTO_IP, ip,
 
 SYSCTL_NODE(_net_inet, IPPROTO_IP, ip,

-       CTLFLAG_RW|CTLFLAG_LOCKED, 0, "IP");
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "IP");

 SYSCTL_NODE(_net_inet, IPPROTO_ICMP, icmp,
 SYSCTL_NODE(_net_inet, IPPROTO_ICMP, icmp,

-       CTLFLAG_RW|CTLFLAG_LOCKED, 0, "ICMP");
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "ICMP");

 SYSCTL_NODE(_net_inet, IPPROTO_UDP, udp,
 SYSCTL_NODE(_net_inet, IPPROTO_UDP, udp,

-       CTLFLAG_RW|CTLFLAG_LOCKED, 0, "UDP");
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "UDP");

 SYSCTL_NODE(_net_inet, IPPROTO_TCP, tcp,
 SYSCTL_NODE(_net_inet, IPPROTO_TCP, tcp,

-       CTLFLAG_RW|CTLFLAG_LOCKED, 0, "TCP");
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "TCP");

 SYSCTL_NODE(_net_inet, IPPROTO_IGMP, igmp,
 SYSCTL_NODE(_net_inet, IPPROTO_IGMP, igmp,

-       CTLFLAG_RW|CTLFLAG_LOCKED, 0, "IGMP");
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "IGMP");

 #if IPSEC
 SYSCTL_NODE(_net_inet, IPPROTO_AH, ipsec,
 #if IPSEC
 SYSCTL_NODE(_net_inet, IPPROTO_AH, ipsec,

-       CTLFLAG_RW|CTLFLAG_LOCKED, 0, "IPSEC");
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "IPSEC");

 #endif /* IPSEC */
 SYSCTL_NODE(_net_inet, IPPROTO_RAW, raw,
 #endif /* IPSEC */
 SYSCTL_NODE(_net_inet, IPPROTO_RAW, raw,

-       CTLFLAG_RW|CTLFLAG_LOCKED, 0, "RAW");
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "RAW");

 #if IPDIVERT
 SYSCTL_NODE(_net_inet, IPPROTO_DIVERT, div,
 #if IPDIVERT
 SYSCTL_NODE(_net_inet, IPPROTO_DIVERT, div,

-       CTLFLAG_RW|CTLFLAG_LOCKED, 0, "DIVERT");
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "DIVERT");

 #endif /* IPDIVERT */
 #endif /* IPDIVERT */