diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/addr_resolv.c | 2 | ||||
| -rw-r--r-- | epan/addr_resolv.h | 15 | ||||
| -rw-r--r-- | epan/wslua/wslua_capture_info.c | 2 |
3 files changed, 3 insertions, 16 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 2fcf3a08e6..51077984ec 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -896,7 +896,7 @@ static hashipv6_t * new_ipv6(const struct e_in6_addr *addr) { hashipv6_t *tp = g_new(hashipv6_t,1); - tp->addr = *addr; + memcpy(tp->addr, addr->bytes, sizeof tp->addr); tp->flags = 0; tp->name[0] = '\0'; ip6_to_str_buf(addr, tp->ip6); diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index 9645fe0c47..1f60cabff5 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -89,20 +89,7 @@ typedef struct serv_port { #define DUMMY_AND_RESOLVE_FLGS (DUMMY_ADDRESS_ENTRY | TRIED_RESOLVE_ADDRESS) #define USED_AND_RESOLVED_MASK (DUMMY_ADDRESS_ENTRY | RESOLVED_ADDRESS_USED) -typedef struct hashipv4 { - guint addr; - guint8 flags; /* B0 dummy_entry, B1 resolve, B2 If the address is used in the trace */ - gchar ip[16]; - gchar name[MAXNAMELEN]; -} hashipv4_t; - - -typedef struct hashipv6 { - struct e_in6_addr addr; - guint8 flags; /* B0 dummy_entry, B1 resolve, B2 If the address is used in the trace */ - gchar ip6[MAX_IP6_STR_LEN]; /* XX */ - gchar name[MAXNAMELEN]; -} hashipv6_t; + /* * Flag controlling what names to resolve. */ diff --git a/epan/wslua/wslua_capture_info.c b/epan/wslua/wslua_capture_info.c index eb83a94089..7a4ca96341 100644 --- a/epan/wslua/wslua_capture_info.c +++ b/epan/wslua/wslua_capture_info.c @@ -424,7 +424,7 @@ static int CaptureInfoConst_get_hosts(lua_State* L) { /* create the entry table */ lua_newtable(L); /* addr is in network order already */ - lua_pushlstring(L, (char*)(&ipv6_hash_list_entry->addr.bytes[0]), 16); + lua_pushlstring(L, (char*)(&ipv6_hash_list_entry->addr[0]), 16); lua_setfield(L, -2, "addr"); lua_pushstring(L, ipv6_hash_list_entry->name); lua_setfield(L, -2, "name"); |