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

"epan/packet_info.h" and put it in "epan/address.h".

Use the AT_ values from "epan/address.h" for address types in the
interface lists rather than having our own FAM_ enums.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11427 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 3 insertions, 6 deletions

diff --git a/pcap-util.h b/pcap-util.h
index 3a7ffc6652..df1770ea77 100644
--- 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];