aboutsummaryrefslogtreecommitdiffstats
path: root/epan/addr_resolv.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2011-04-26 17:13:37 +0000
committerGerald Combs <gerald@wireshark.org>2011-04-26 17:13:37 +0000
commitb223e99e5a27318e13de8ec1e009bc310053446d (patch)
tree21fd3eb723ae1f5029e6eb66e8fe271be9affde0 /epan/addr_resolv.c
parent45b060dd136761cf55b36512ca5aed8c21187f03 (diff)
get_host_ipaddr() was returning numeric addresses in host byte order
and hostnames in network byte order. Have it return everything in network byte order. svn path=/trunk/; revision=36873
Diffstat (limited to 'epan/addr_resolv.c')
-rw-r--r--epan/addr_resolv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index dc589c271f..0a6fb45215 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -2412,7 +2412,7 @@ host_name_lookup_init(void) {
report_open_failure(hostspath, errno, FALSE);
}
g_free(hostspath);
-
+
#ifdef HAVE_C_ARES
#ifdef CARES_HAVE_ARES_LIBRARY_INIT
if (ares_library_init(ARES_LIB_INIT_ALL) == ARES_SUCCESS) {
@@ -2702,7 +2702,7 @@ add_ipv4_name(const guint addr, const gchar *name)
ai = g_malloc0(sizeof(struct addrinfo));
addrinfo_list = addrinfo_list_last = ai;
}
-
+
sa4 = g_malloc0(sizeof(struct sockaddr_in));
sa4->sin_family = AF_INET;
sa4->sin_addr.s_addr = addr;
@@ -2712,7 +2712,7 @@ add_ipv4_name(const guint addr, const gchar *name)
ai->ai_addrlen = sizeof(struct sockaddr_in);
ai->ai_canonname = (char *) tp->name;
ai->ai_addr = (struct sockaddr*) sa4;
-
+
addrinfo_list_last->ai_next = ai;
addrinfo_list_last = ai;
@@ -3148,7 +3148,7 @@ get_host_ipaddr(const char *host, guint32 *addrp)
return FALSE;
}
- *addrp = g_ntohl(ipaddr.s_addr);
+ *addrp = ipaddr.s_addr;
return TRUE;
}