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, 6 insertions, 3 deletions

diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 56d06f75d7..a3f088cbb3 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -280,17 +280,20 @@ set_link_type_list(GtkWidget *linktype_om, GtkWidget *entry)
 	      g_string_append(ip_str, ", ");
 
 	    ip_addr = (if_addr_t *)curr_ip->data;
-	    switch (ip_addr->family) {
+	    switch (ip_addr->type) {
 
-	    case FAM_IPv4:
+	    case AT_IPv4:
 	      g_string_append(ip_str,
 		ip_to_str((guint8 *)&ip_addr->ip_addr.ip4_addr));
 	      break;
 
-	    case FAM_IPv6:
+	    case AT_IPv6:
 	      g_string_append(ip_str,
 	          ip6_to_str((struct e_in6_addr *)&ip_addr->ip_addr.ip6_addr));
 	      break;
+
+            default:
+              g_assert_not_reached();
 	    }
 	  }