diff options
| -rw-r--r-- | epan/addr_resolv.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-dcom.c | 2 | ||||
| -rw-r--r-- | epan/ftypes/ftype-ipv4.c | 2 | ||||
| -rw-r--r-- | epan/wslua/wslua_pinfo.c | 1 | ||||
| -rw-r--r-- | plugins/profinet/packet-dcom-cba-acco.c | 1 |
5 files changed, 5 insertions, 9 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; } diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index 7d83989d5d..c652aef482 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -1800,7 +1800,6 @@ dissect_dcom_DUALSTRINGARRAY(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* XXX - this conversion is ugly */ if (inet_aton(szStr, &ipaddr)) { if(get_host_ipaddr(szStr, &curr_ip)) { - curr_ip = g_ntohl(curr_ip); /*expert_add_info_format(pinfo, NULL, PI_UNDECODED, PI_WARN, "DUALSTRINGARRAY: IP:%s", ip_to_str( (guint8 *) &curr_ip));*/ @@ -2359,4 +2358,3 @@ proto_reg_handoff_dcom (void) /* Currently, we have nothing to register for DCOM */ } - diff --git a/epan/ftypes/ftype-ipv4.c b/epan/ftypes/ftype-ipv4.c index ff3aec15c9..785023f241 100644 --- a/epan/ftypes/ftype-ipv4.c +++ b/epan/ftypes/ftype-ipv4.c @@ -81,7 +81,7 @@ val_from_unparsed(fvalue_t *fv, char *s, gboolean allow_partial_value _U_, LogFu return FALSE; } - ipv4_addr_set_host_order_addr(&(fv->value.ipv4), addr); + ipv4_addr_set_net_order_addr(&(fv->value.ipv4), addr); /* If CIDR, get netmask bits. */ if (has_slash) { diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c index 8c6b924ac6..2e12ac59b6 100644 --- a/epan/wslua/wslua_pinfo.c +++ b/epan/wslua/wslua_pinfo.c @@ -1037,4 +1037,3 @@ int Pinfo_register(lua_State* L) { outstanding_Columns = g_ptr_array_new(); return 1; } - diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 427b1f83cf..3a33581727 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -586,7 +586,6 @@ cba_acco_add(packet_info *pinfo, const char *acco) g_free(ip_str); return NULL; } - ip = g_ntohl(ip); pdev = cba_pdev_add(pinfo, (guint8 *) &ip); delim++; |