Remove inet_aton() usage everywhere

Including where it says not to in comments. Use IPv4 dotted-decimal
notation.

Change-Id: Iafe1f6fbd2bd5867c41642dc27411f47dff8ce6a
Reviewed-on: https://code.wireshark.org/review/24044
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>

6 files changed, 55 insertions, 59 deletions

diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 1826321eec..c9ecd0d78a 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -103,7 +103,6 @@
 #include <wsutil/report_message.h>
 #include <wsutil/file_util.h>
 #include <wsutil/pint.h>
-#include "wsutil/inet_aton.h"
 #include <wsutil/inet_addr.h>
 
 #include <epan/strutil.h>
@@ -3122,7 +3121,7 @@ c_ares_ghi_cb(void *arg, int status, int timeouts _U_, struct hostent *hp) {
 gboolean
 get_host_ipaddr(const char *host, guint32 *addrp)
 {
-    struct in_addr      ipaddr;
+    guint32 ipaddr;
 #ifdef HAVE_C_ARES
     struct timeval tv = { 0, GHI_TIMEOUT }, *tvp;
     int nfds;
@@ -3130,12 +3129,7 @@ get_host_ipaddr(const char *host, guint32 *addrp)
     async_hostent_t ahe;
 #endif
 
-    /*
-     * don't change it to inet_pton(AF_INET), they are not 100% compatible.
-     * inet_pton(AF_INET) does not support hexadecimal notation nor
-     * less-than-4 octet notation.
-     */
-    if (!inet_aton(host, &ipaddr)) {
+    if (!ws_inet_pton4(host, &ipaddr)) {
 
         /* It's not a valid dotted-quad IP address; is it a valid
          * host name?
@@ -3185,7 +3179,7 @@ get_host_ipaddr(const char *host, guint32 *addrp)
             return FALSE;
     }
 
-    *addrp = ipaddr.s_addr;
+    *addrp = ipaddr;
     return TRUE;
 }
 
diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c
index ee77e10f3b..af39168d1a 100644
--- a/epan/dissectors/packet-aeron.c
+++ b/epan/dissectors/packet-aeron.c
@@ -29,7 +29,6 @@
 #include <epan/conversation.h>
 #include <epan/exceptions.h>
 #include <epan/to_str.h>
-#include <wsutil/inet_aton.h>
 #include <wsutil/pint.h>
 
 /* The Aeron protocol is defined at https://github.com/real-logic/Aeron/wiki/Protocol-Specification */
diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c
index c6b6892cb6..d54716a99d 100644
--- a/epan/dissectors/packet-dcom.c
+++ b/epan/dissectors/packet-dcom.c
@@ -70,7 +70,6 @@
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/addr_resolv.h>
-#include <wsutil/inet_aton.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include "packet-dcerpc.h"
@@ -1785,7 +1784,7 @@ dissect_dcom_DUALSTRINGARRAY(tvbuff_t *tvb, gint offset, packet_info *pinfo,
 	gboolean isPrintable;
 	guint32 first_ip = 0;
 	guint32 curr_ip = 0;
-	struct in_addr		ipaddr;
+	guint32 ipaddr;
 	proto_item *pi;
 
 
@@ -1818,7 +1817,7 @@ dissect_dcom_DUALSTRINGARRAY(tvbuff_t *tvb, gint offset, packet_info *pinfo,
 
 	/* convert ip address (if it is dotted decimal) */
 	/* XXX - this conversion is ugly */
-		if (inet_aton(szStr, &ipaddr)) {
+		if (ws_inet_pton4(szStr, &ipaddr)) {
 			if(get_host_ipaddr(szStr, &curr_ip)) {
 
 				/*expert_add_info_format(pinfo, NULL, PI_UNDECODED, PI_WARN, "DUALSTRINGARRAY: IP:%s",
diff --git a/epan/dissectors/packet-lbm.h b/epan/dissectors/packet-lbm.h
index 1d99ae05d8..8772b0509a 100644
--- a/epan/dissectors/packet-lbm.h
+++ b/epan/dissectors/packet-lbm.h
@@ -94,7 +94,13 @@
 #endif
 #include <stddef.h>
 
-#include <wsutil/inet_aton.h>
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
 
 typedef guint8 lbm_uint8_t;
 typedef guint16 lbm_uint16_t;
@@ -112,8 +118,8 @@ typedef guint64 lbm_uint64_t;
 #define UAT_IPV4_CB_DEF(basename,field_name,rec_t) \
     static gboolean basename ## _ ## field_name ## _chk_cb(void * u1 _U_, const char * strptr, unsigned len _U_, const void * u2 _U_, const void * u3 _U_, char ** err) \
     { \
-        struct in_addr addr; \
-        if (inet_aton(strptr, &addr) == 0) \
+        guint32 addr; \
+        if (!ws_inet_pton4(strptr, &addr)) \
         { \
             *err = g_strdup("invalid address"); \
             return (FALSE); \
@@ -122,12 +128,12 @@ typedef guint64 lbm_uint64_t;
     } \
     static void basename ## _ ## field_name ## _set_cb(void* rec, const char* buf, unsigned len, const void* u1 _U_, const void* u2 _U_) \
     { \
-        struct in_addr addr; \
+        guint32 addr; \
         char* new_buf = g_strndup(buf,len); \
         g_free((((rec_t*)rec)->field_name)); \
         (((rec_t*)rec)->field_name) = new_buf; \
-        inet_aton(new_buf, &addr); \
-        (((rec_t*)rec)->field_name ## _val_h) = g_ntohl(addr.s_addr); \
+        ws_inet_pton4(new_buf, &addr); \
+        (((rec_t*)rec)->field_name ## _val_h) = g_ntohl(addr); \
     } \
     static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr, unsigned* out_len, const void* u1 _U_, const void* u2 _U_) \
     {\
@@ -150,13 +156,13 @@ typedef guint64 lbm_uint64_t;
 #define UAT_IPV4_MC_CB_DEF(basename,field_name,rec_t) \
     static gboolean basename ## _ ## field_name ## _chk_cb(void * u1 _U_, const char * strptr, unsigned len _U_, const void * u2 _U_, const void * u3 _U_, char ** err) \
     { \
-        struct in_addr addr; \
-        if (inet_aton(strptr, &addr) == 0) \
+        guint32 addr; \
+        if (!ws_inet_pton4(strptr, &addr)) \
         { \
             *err = g_strdup("invalid address"); \
             return (FALSE); \
         } \
-        if (!IN_MULTICAST(g_ntohl(addr.s_addr)) && (g_ntohl(addr.s_addr) != 0)) \
+        if (!IN_MULTICAST(g_ntohl(addr)) && (g_ntohl(addr) != 0)) \
         { \
             *err = g_strdup("invalid multicast address"); \
             return (FALSE); \
@@ -165,12 +171,12 @@ typedef guint64 lbm_uint64_t;
     } \
     static void basename ## _ ## field_name ## _set_cb(void* rec, const char* buf, unsigned len, const void* u1 _U_, const void* u2 _U_) \
     { \
-        struct in_addr addr; \
+        guint32 addr; \
         char* new_buf = g_strndup(buf,len); \
         g_free((((rec_t*)rec)->field_name)); \
         (((rec_t*)rec)->field_name) = new_buf; \
-        inet_aton(new_buf, &addr); \
-        (((rec_t*)rec)->field_name ## _val_h) = g_ntohl(addr.s_addr); \
+        ws_inet_pton4(new_buf, &addr); \
+        (((rec_t*)rec)->field_name ## _val_h) = g_ntohl(addr); \
     } \
     static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr, unsigned* out_len, const void* u1 _U_, const void* u2 _U_) \
     {\
diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c
index 0573ef3b5b..3e2b7f77ee 100644
--- a/epan/dissectors/packet-lbmr.c
+++ b/epan/dissectors/packet-lbmr.c
@@ -33,7 +33,6 @@
 #include <epan/expert.h>
 #include <epan/uat.h>
 #include <epan/to_str.h>
-#include <wsutil/inet_aton.h>
 #include <wsutil/pint.h>
 #include "packet-lbm.h"
 #include "packet-lbtru.h"
@@ -6503,7 +6502,7 @@ void proto_register_lbmr(void)
         { &ei_lbmr_analysis_zero_len_option, { "lbmr.analysis.zero_len_option", PI_MALFORMED, PI_ERROR, "Zero-length LBMR option", EXPFILL } },
     };
     module_t * lbmr_module;
-    struct in_addr addr;
+    guint32 addr;
     uat_t * tag_uat;
     expert_module_t * expert_lbmr;
 
@@ -6522,8 +6521,8 @@ void proto_register_lbmr(void)
         "Set the UDP port for incoming multicast topic resolution (context resolver_multicast_incoming_port)",
         10,
         &global_lbmr_mc_incoming_udp_port);
-    inet_aton(LBMR_DEFAULT_MC_INCOMING_ADDRESS, &addr);
-    lbmr_mc_incoming_address_host = g_ntohl(addr.s_addr);
+    ws_inet_pton4(LBMR_DEFAULT_MC_INCOMING_ADDRESS, &addr);
+    lbmr_mc_incoming_address_host = g_ntohl(addr);
     prefs_register_string_preference(lbmr_module,
         "mc_incoming_address",
         "Incoming multicast address (default " LBMR_DEFAULT_MC_INCOMING_ADDRESS ")",
@@ -6535,8 +6534,8 @@ void proto_register_lbmr(void)
         "Set the UDP port for outgoing multicast topic resolution (context resolver_multicast_outgoing_port)",
         10,
         &global_lbmr_mc_outgoing_udp_port);
-    inet_aton(LBMR_DEFAULT_MC_OUTGOING_ADDRESS, &addr);
-    lbmr_mc_outgoing_address_host = g_ntohl(addr.s_addr);
+    ws_inet_pton4(LBMR_DEFAULT_MC_OUTGOING_ADDRESS, &addr);
+    lbmr_mc_outgoing_address_host = g_ntohl(addr);
     prefs_register_string_preference(lbmr_module,
         "mc_outgoing_address",
         "Outgoing multicast address (default " LBMR_DEFAULT_MC_OUTGOING_ADDRESS ")",
@@ -6560,8 +6559,8 @@ void proto_register_lbmr(void)
         "Set the destination port for unicast topic resolution (context resolver_unicast_destination_port)",
         10,
         &global_lbmr_uc_dest_port);
-    inet_aton(LBMR_DEFAULT_UC_ADDRESS, &addr);
-    lbmr_uc_address_host = g_ntohl(addr.s_addr);
+    ws_inet_pton4(LBMR_DEFAULT_UC_ADDRESS, &addr);
+    lbmr_uc_address_host = g_ntohl(addr);
     prefs_register_string_preference(lbmr_module,
         "uc_address",
         "Unicast resolver address (default " LBMR_DEFAULT_UC_ADDRESS ")",
@@ -6686,7 +6685,7 @@ void proto_register_lbmr(void)
 void proto_reg_handoff_lbmr(void)
 {
     static gboolean already_registered = FALSE;
-    struct in_addr addr;
+    guint32 addr;
 
     if (!already_registered)
     {
@@ -6697,11 +6696,11 @@ void proto_reg_handoff_lbmr(void)
 
     lbmr_mc_incoming_udp_port = global_lbmr_mc_incoming_udp_port;
     lbmr_mc_outgoing_udp_port = global_lbmr_mc_outgoing_udp_port;
-    inet_aton(global_lbmr_mc_incoming_address, &addr);
-    lbmr_mc_incoming_address_host = g_ntohl(addr.s_addr);
+    ws_inet_pton4(global_lbmr_mc_incoming_address, &addr);
+    lbmr_mc_incoming_address_host = g_ntohl(addr);
 
-    inet_aton(global_lbmr_mc_outgoing_address, &addr);
-    lbmr_mc_outgoing_address_host = g_ntohl(addr.s_addr);
+    ws_inet_pton4(global_lbmr_mc_outgoing_address, &addr);
+    lbmr_mc_outgoing_address_host = g_ntohl(addr);
 
     /* Make sure the low port is <= the high port. If not, don't change them. */
     if (global_lbmr_uc_port_low <= global_lbmr_uc_port_high)
@@ -6710,8 +6709,8 @@ void proto_reg_handoff_lbmr(void)
         lbmr_uc_port_low = global_lbmr_uc_port_low;
     }
     lbmr_uc_dest_port = global_lbmr_uc_dest_port;
-    inet_aton(global_lbmr_uc_address, &addr);
-    lbmr_uc_address_host = g_ntohl(addr.s_addr);
+    ws_inet_pton4(global_lbmr_uc_address, &addr);
+    lbmr_uc_address_host = g_ntohl(addr);
     lbmr_use_tag = global_lbmr_use_tag;
 
     already_registered = TRUE;
diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c
index 2b331e80af..cab81d2c36 100644
--- a/epan/dissectors/packet-lbtrm.c
+++ b/epan/dissectors/packet-lbtrm.c
@@ -31,7 +31,6 @@
 #include <epan/tap.h>
 #include <epan/conversation.h>
 #include <epan/to_str.h>
-#include <wsutil/inet_aton.h>
 #include <wsutil/pint.h>
 #include "packet-lbm.h"
 #include "packet-lbtrm.h"
@@ -1721,7 +1720,7 @@ void proto_register_lbtrm(void)
         { &ei_lbtrm_analysis_sm_dup, { "lbtrm.analysis.sm.dup", PI_SEQUENCE, PI_NOTE, "Duplicate SM", EXPFILL } },
     };
     module_t * lbtrm_module;
-    struct in_addr addr;
+    guint32 addr;
     uat_t * tag_uat;
     expert_module_t * expert_lbtrm;
 
@@ -1734,16 +1733,16 @@ void proto_register_lbtrm(void)
     expert_register_field_array(expert_lbtrm, ei, array_length(ei));
 
     lbtrm_module = prefs_register_protocol_subtree("29West", proto_lbtrm, proto_reg_handoff_lbtrm);
-    inet_aton(LBTRM_DEFAULT_MC_ADDRESS_LOW, &addr);
-    lbtrm_mc_address_low_host = g_ntohl(addr.s_addr);
+    ws_inet_pton4(LBTRM_DEFAULT_MC_ADDRESS_LOW, &addr);
+    lbtrm_mc_address_low_host = g_ntohl(addr);
     prefs_register_string_preference(lbtrm_module,
         "mc_address_low",
         "Multicast address range low (default " LBTRM_DEFAULT_MC_ADDRESS_LOW ")",
         "Set the low end of the LBT-RM multicast address range (context transport_lbtrm_multicast_address_low)",
         &global_lbtrm_mc_address_low);
 
-    inet_aton(LBTRM_DEFAULT_MC_ADDRESS_HIGH, &addr);
-    lbtrm_mc_address_high_host = g_ntohl(addr.s_addr);
+    ws_inet_pton4(LBTRM_DEFAULT_MC_ADDRESS_HIGH, &addr);
+    lbtrm_mc_address_high_host = g_ntohl(addr);
     prefs_register_string_preference(lbtrm_module,
         "mc_address_high",
         "Multicast address range high (default " LBTRM_DEFAULT_MC_ADDRESS_HIGH ")",
@@ -1778,16 +1777,16 @@ void proto_register_lbtrm(void)
         10,
         &global_lbtrm_src_port_high);
 
-    inet_aton(MIM_DEFAULT_MC_INCOMING_ADDRESS, &addr);
-    mim_incoming_mc_address_host = g_ntohl(addr.s_addr);
+    ws_inet_pton4(MIM_DEFAULT_MC_INCOMING_ADDRESS, &addr);
+    mim_incoming_mc_address_host = g_ntohl(addr);
     prefs_register_string_preference(lbtrm_module,
         "mim_incoming_address",
         "MIM incoming multicast address (default " MIM_DEFAULT_MC_INCOMING_ADDRESS ")",
         "Set the incoming MIM multicast address (context mim_incoming_address)",
         &global_mim_incoming_mc_address);
 
-    inet_aton(MIM_DEFAULT_MC_OUTGOING_ADDRESS, &addr);
-    mim_outgoing_mc_address_host = g_ntohl(addr.s_addr);
+    ws_inet_pton4(MIM_DEFAULT_MC_OUTGOING_ADDRESS, &addr);
+    mim_outgoing_mc_address_host = g_ntohl(addr);
     prefs_register_string_preference(lbtrm_module,
         "mim_outgoing_address",
         "MIM outgoing multicast address (default " MIM_DEFAULT_MC_OUTGOING_ADDRESS ")",
@@ -1860,7 +1859,7 @@ void proto_register_lbtrm(void)
 void proto_reg_handoff_lbtrm(void)
 {
     static gboolean already_registered = FALSE;
-    struct in_addr addr;
+    guint32 addr;
     guint32 dest_addr_h_low;
     guint32 dest_addr_h_high;
 
@@ -1873,10 +1872,10 @@ void proto_reg_handoff_lbtrm(void)
     }
 
     /* Make sure the low MC address is <= the high MC address. If not, don't change them. */
-    inet_aton(global_lbtrm_mc_address_low, &addr);
-    dest_addr_h_low = g_ntohl(addr.s_addr);
-    inet_aton(global_lbtrm_mc_address_high, &addr);
-    dest_addr_h_high = g_ntohl(addr.s_addr);
+    ws_inet_pton4(global_lbtrm_mc_address_low, &addr);
+    dest_addr_h_low = g_ntohl(addr);
+    ws_inet_pton4(global_lbtrm_mc_address_high, &addr);
+    dest_addr_h_high = g_ntohl(addr);
     if (dest_addr_h_low <= dest_addr_h_high)
     {
         lbtrm_mc_address_low_host = dest_addr_h_low;
@@ -1898,10 +1897,10 @@ void proto_reg_handoff_lbtrm(void)
     }
 
     /* Add the dissector hooks for the MIM MC groups. */
-    inet_aton(global_mim_incoming_mc_address, &addr);
-    mim_incoming_mc_address_host = g_htonl(addr.s_addr);
-    inet_aton(global_mim_outgoing_mc_address, &addr);
-    mim_outgoing_mc_address_host = g_htonl(addr.s_addr);
+    ws_inet_pton4(global_mim_incoming_mc_address, &addr);
+    mim_incoming_mc_address_host = g_htonl(addr);
+    ws_inet_pton4(global_mim_outgoing_mc_address, &addr);
+    mim_outgoing_mc_address_host = g_htonl(addr);
 
     /* Add the dissector hooks for the MIM ports. */
     mim_incoming_dest_port = global_mim_incoming_dest_port;