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

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

diff --git a/pcap-util.c b/pcap-util.c
index cca74e22ab34b5cd7544d5111d705ca740ca8df0..b1fca873dac9e093fbc3da7e812818332c1b28fd 100644 (file)
--- a/pcap-util.c
+++ b/pcap-util.c
@@ -208,7 +208,7 @@ if_info_add_address(if_info_t *if_info, struct sockaddr *addr)
        case AF_INET:
                ai = (struct sockaddr_in *)addr;
                ip_addr = g_malloc(sizeof(*ip_addr));
-               ip_addr->family = FAM_IPv4;
+               ip_addr->type = AT_IPv4;
                ip_addr->ip_addr.ip4_addr =
                    *((guint32 *)&(ai->sin_addr.s_addr));
                if_info->ip_addr = g_slist_append(if_info->ip_addr, ip_addr);
@@ -218,7 +218,7 @@ if_info_add_address(if_info_t *if_info, struct sockaddr *addr)
        case AF_INET6:
                ai6 = (struct sockaddr_in6 *)addr;
                ip_addr = g_malloc(sizeof(*ip_addr));
-               ip_addr->family = FAM_IPv6;
+               ip_addr->type = AT_IPv6;
                memcpy((void *)&ip_addr->ip_addr.ip6_addr,
                    (void *)&ai6->sin6_addr.s6_addr,
                    sizeof ip_addr->ip_addr.ip6_addr);