xnu-7195.50.7.100.1.tar.gz

[apple/xnu.git] / bsd / netinet / ip_flowid.h

diff --git a/bsd/netinet/ip_flowid.h b/bsd/netinet/ip_flowid.h
index 3c68a809f3be55a22f8636289625ee99943e8336..47f6df61746c2edf7422eba0880857189a32eb2a 100644 (file)
--- a/bsd/netinet/ip_flowid.h
+++ b/bsd/netinet/ip_flowid.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2011-2012 Apple Inc. All rights reserved.
+ * Copyright (c) 2011-2019 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *


@@ -82,7 +82,6 @@ struct ip_flow_id {
 struct route_in6;
 struct sockaddr_in6;
 struct pf_rule;
 struct route_in6;
 struct sockaddr_in6;
 struct pf_rule;

-struct ip_fw;

 
 /*
  * Arguments for calling ipfw_chk() and dummynet_io(). We put them
 
 /*
  * Arguments for calling ipfw_chk() and dummynet_io(). We put them


@@ -92,8 +91,6 @@ struct ip_fw;
 struct ip_fw_args {
        struct mbuf             *fwa_m;         /* the mbuf chain               */
        struct ifnet            *fwa_oif;       /* output interface             */
 struct ip_fw_args {
        struct mbuf             *fwa_m;         /* the mbuf chain               */
        struct ifnet            *fwa_oif;       /* output interface             */

-       struct sockaddr_in      *fwa_next_hop;  /* forward address              */
-       struct ip_fw            *fwa_ipfw_rule; /* matching IPFW rule           */

        struct pf_rule          *fwa_pf_rule;   /* matching PF rule             */
        struct ether_header     *fwa_eh;        /* for bridged packets          */
        int                     fwa_flags;      /* for dummynet                 */
        struct pf_rule          *fwa_pf_rule;   /* matching PF rule             */
        struct ether_header     *fwa_eh;        /* for bridged packets          */
        int                     fwa_flags;      /* for dummynet                 */


@@ -116,7 +113,6 @@ struct ip_fw_args {
        u_int32_t               fwa_unfragpartlen;  /* for IPv6 output */
        struct ip6_exthdrs      *fwa_exthdrs;   /* for IPv6 output */
        struct ip_flow_id       fwa_id;         /* grabbed from IP header       */
        u_int32_t               fwa_unfragpartlen;  /* for IPv6 output */
        struct ip6_exthdrs      *fwa_exthdrs;   /* for IPv6 output */
        struct ip_flow_id       fwa_id;         /* grabbed from IP header       */

-       u_int16_t               fwa_divert_rule;/* divert cookie                */

        u_int32_t               fwa_cookie;
 };
 #define fwa_ipoa fwa_ipoa_._fwa_ipoa
        u_int32_t               fwa_cookie;
 };
 #define fwa_ipoa fwa_ipoa_._fwa_ipoa


@@ -128,10 +124,7 @@ struct ip_fw_args {
 
 /* Allocate a separate structure for inputs args to save space and bzero time */
 struct ip_fw_in_args {
 
 /* Allocate a separate structure for inputs args to save space and bzero time */
 struct ip_fw_in_args {

-       struct sockaddr_in      *fwai_next_hop; /* forward address            */
-       struct ip_fw            *fwai_ipfw_rule;/* matching IPFW rule         */

        struct pf_rule          *fwai_pf_rule;  /* matching PF rule           */
        struct pf_rule          *fwai_pf_rule;  /* matching PF rule           */

-       u_int16_t               fwai_divert_rule;/* divert cookie             */

 };
 
 #endif /* BSD_KERNEL_PRIVATE */
 };
 
 #endif /* BSD_KERNEL_PRIVATE */