Pull the address (and port and circuit type) stuff out of

[obnox/wireshark/wip.git] / pcap-util.h

diff --git a/pcap-util.h b/pcap-util.h
index 3a7ffc66521b7604f3e7f2f65d5ae7728d24fd9a..df1770ea7778aaf6d42b27c37ce1d0ba247ce612 100644 (file)
--- a/pcap-util.h
+++ b/pcap-util.h
@@ -31,6 +31,8 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#include <epan/address.h>
+
 /*
  * XXX - this is also the traditional default snapshot size in
  * tcpdump - but, if IPv6 is enabled, it defaults to 96, to get an
@@ -57,13 +59,8 @@ typedef struct {
 /*
  * An address in the "ip_addr" list.
  */
-typedef enum {
-       FAM_IPv4,
-       FAM_IPv6
-} address_family;
-
 typedef struct {
-       address_family family;
+       address_type type;
        union {
                guint32 ip4_addr;
                guint8 ip6_addr[16];