inet_aton() -> inet_pton()

eggheads · Jul 25, 2023 · 88a9724 · 88a9724
1 parent f51443f
commit 88a9724
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 253 deletions.
diff --git a/configure.ac b/configure.ac
@@ -113,7 +113,7 @@ AX_TYPE_SOCKLEN_T
 AX_CREATE_STDINT_H([eggint.h])
 
 # Checks for functions and their arguments.
-AC_CHECK_FUNCS([dprintf explicit_bzero explicit_memset getrandom inet_aton isascii memset_s random rand lrand48 snprintf strlcpy vsnprintf])
+AC_CHECK_FUNCS([dprintf explicit_bzero explicit_memset getrandom isascii memset_s random rand lrand48 snprintf strlcpy vsnprintf])
 AC_FUNC_SELECT_ARGTYPES
 EGG_FUNC_B64_NTOP
 AC_FUNC_MMAP

diff --git a/src/compat/Makefile.in b/src/compat/Makefile.in
@@ -17,7 +17,7 @@ STRIP = @STRIP@
 CFLAGS = @CFLAGS@ -I../.. -I$(top_srcdir) -I$(top_srcdir)/src @SSL_INCLUDES@ @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
 
-OBJS = base64.o explicit_bzero.o in6.o inet_aton.o snprintf.o strlcpy.o
+OBJS = base64.o explicit_bzero.o in6.o snprintf.o strlcpy.o
 
 doofus:
 	@echo ""

diff --git a/src/compat/compat.h b/src/compat/compat.h
@@ -24,7 +24,6 @@
 #define _EGG_COMPAT_COMPAT_H
 
 #include "base64.h"
-#include "inet_aton.h"
 #include "snprintf.h"
 #include "explicit_bzero.h"
 #include "strlcpy.h"

diff --git a/src/compat/inet_aton.c b/src/compat/inet_aton.c
diff --git a/src/compat/inet_aton.h b/src/compat/inet_aton.h
diff --git a/src/eggdrop.h b/src/eggdrop.h
@@ -318,6 +318,7 @@ typedef uint32_t IP;
 
 /* The following functions are for backward compatibility only */
 #define egg_bzero(dest, len) memset(dest, 0, len)
+#define egg_inet_aton(src, dst) inet_pton(AF_INET, src, dst)
 #define egg_memcpy memcpy
 #define egg_memset memset
 #define egg_strcasecmp strcasecmp
@@ -340,6 +341,7 @@ typedef int (*IntFunc) ();
 
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 typedef struct {
   int family;

diff --git a/src/mod/dns.mod/dns.c b/src/mod/dns.mod/dns.c
@@ -180,7 +180,7 @@ static char *dns_change(ClientData cdata, Tcl_Interp *irp,
       } else
         port = NAMESERVER_PORT; /* port 53 */
       /* Ignore invalid addresses */
-      if (egg_inet_aton(list[i], &myres.nsaddr_list[myres.nscount].sin_addr)) {
+      if (inet_pton(AF_INET, list[i], &myres.nsaddr_list[myres.nscount].sin_addr)) {
         myres.nsaddr_list[myres.nscount].sin_port = htons(port);
         myres.nsaddr_list[myres.nscount].sin_family = AF_INET;
         myres.nscount++;

diff --git a/src/mod/module.h b/src/mod/module.h
@@ -60,9 +60,6 @@
 #undef Assert
 
 /* Compatibility functions. */
-#ifdef egg_inet_aton
-#  undef egg_inet_aton
-#endif
 #ifdef egg_vsnprintf
 #  undef egg_vsnprintf
 #endif
@@ -430,7 +427,7 @@ typedef void (*chanout_butfunc)(int, int, const char *, ...) ATTRIBUTE_FORMAT(pr
 #define sock_has_data ((int(*)(int, int))global[248])
 #define bots_in_subtree ((int (*)(tand_t *))global[249])
 #define users_in_subtree ((int (*)(tand_t *))global[250])
-#define egg_inet_aton ((int (*)(const char *cp, struct in_addr *addr))global[251])
+/* was egg_inet_aton -- use inet_pton() instead */
 /* 252 - 255 */
 #define egg_snprintf (global[252])
 #define egg_vsnprintf ((int (*)(char *, size_t, const char *, va_list))global[253])

diff --git a/src/modules.c b/src/modules.c
@@ -526,7 +526,7 @@ Function global_table[] = {
   (Function) sock_has_data,
   (Function) bots_in_subtree,
   (Function) users_in_subtree,
-  (Function) egg_inet_aton,
+  (Function) 0,                   /* was egg_inet_aton -- use inet_pton() instead */
   /* 252 - 255 */
   (Function) egg_snprintf,
   (Function) egg_vsnprintf,