OS-7667 IPFilter needs to keep and report state for cloud firewall logging
Portions contributed by: Mike Gerdts <mike.gerdts@joyent.com>

*** 4,14 ****
   * See the IPFILTER.LICENCE file for details on licencing.
   *
   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   *
!  * Copyright 2018 Joyent, Inc.  All rights reserved.
   */
  
  #ifndef __IPF_STACK_H__
  #define __IPF_STACK_H__
  
--- 4,14 ----
   * See the IPFILTER.LICENCE file for details on licencing.
   *
   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   *
!  * Copyright 2019, Joyent, Inc.
   */
  
  #ifndef __IPF_STACK_H__
  #define __IPF_STACK_H__
  
*** 44,53 ****
--- 44,54 ----
          struct ipf_stack        *ifs_next;
          struct ipf_stack        **ifs_pnext;
          struct ipf_stack        *ifs_gz_cont_ifs;
          netid_t                 ifs_netid;
          zoneid_t                ifs_zone;
+         zoneid_t                ifs_zone_did;
          boolean_t               ifs_gz_controlled;
  
          /* ipf module */
          fr_info_t               ifs_frcache[2][8];
  
*** 314,323 ****
--- 315,325 ----
          struct radix_mask       *ifs_rn_mkfreelist;
          struct radix_node_head  *ifs_mask_rnhead;
          char                    *ifs_addmask_key;
          char                    *ifs_rn_zeros;
          char                    *ifs_rn_ones;
+ 
  #ifdef KERNEL
          /* kstats for inbound and outbound */
          kstat_t                 *ifs_kstatp[2];
  #endif
  };