diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-07-19 02:27:17 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-07-19 02:27:17 +0000 |
| commit | 2ad97737fe50aef1b9fa291316b18621275b5e10 (patch) | |
| tree | a40416ac4806fa00960df88df6adab7b75d42303 /pcap-util.c | |
| parent | 84479319adb31b26f3b53accc30b532173489d63 (diff) | |
| download | wireshark-2ad97737fe50aef1b9fa291316b18621275b5e10.tar.gz wireshark-2ad97737fe50aef1b9fa291316b18621275b5e10.tar.bz2 wireshark-2ad97737fe50aef1b9fa291316b18621275b5e10.zip | |
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.
svn path=/trunk/; revision=11427
Diffstat (limited to 'pcap-util.c')
| -rw-r--r-- | pcap-util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pcap-util.c b/pcap-util.c index cca74e22ab..b1fca873da 100644 --- 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); |