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

*** 4,13 ****
--- 4,14 ----
   *
   * See the IPFILTER.LICENCE file for details on licencing.
   *
   * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
+  * Copyright 2019 Joyent, Inc.
   */
  
  #pragma ident   "%Z%%M% %I%     %E% SMI"
  
  #ifdef  __FreeBSD__
*** 37,46 ****
--- 38,48 ----
  #include <netinet/in.h>
  #include <netinet/in_systm.h>
  #include <sys/time.h>
  #include <syslog.h>
  #include <net/if.h>
+ #include <uuid/uuid.h>
  #if __FreeBSD_version >= 300000
  # include <net/if_var.h>
  #endif
  #include <netdb.h>
  #include <arpa/nameser.h>
*** 87,104 ****
--- 89,108 ----
                  i6addr_t        a;
                  i6addr_t        m;
                  int     v;
          } ipp;
          union   i6addr  ip6;
+         uuid_t  uuid;
  };
  
  %token  <num>   YY_NUMBER YY_HEX
  %token  <str>   YY_STR
  %token    YY_COMMENT 
  %token    YY_CMP_EQ YY_CMP_NE YY_CMP_LE YY_CMP_GE YY_CMP_LT YY_CMP_GT
  %token    YY_RANGE_OUT YY_RANGE_IN
  %token  <ip6>   YY_IPV6
+ %token  <uuid>  YY_UUID
  
  %token  IPNY_MAPBLOCK IPNY_RDR IPNY_PORT IPNY_PORTS IPNY_AUTO IPNY_RANGE
  %token  IPNY_MAP IPNY_BIMAP IPNY_FROM IPNY_TO IPNY_MASK IPNY_PORTMAP IPNY_ANY
  %token  IPNY_ROUNDROBIN IPNY_FRAG IPNY_AGE IPNY_ICMPIDMAP IPNY_PROXY
  %token  IPNY_TCP IPNY_UDP IPNY_TCPUDP IPNY_STICKY IPNY_MSSCLAMP IPNY_TAG