From a8d8221357bfb264b50e3a70ee8976c097f8cdca Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Tue, 29 Jun 2004 17:54:25 +0000
Subject: [PATCH] FreeBSD fix for utils (bug #1949)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3352 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
include/asterisk/utils.h | 3 +++
utils.c | 6 ++++++
2 files changed, 9 insertions(+)
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index e6e4e6f79f..9a3b57329b 100755
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -32,6 +32,9 @@ extern int test_for_thread_safety(void);
extern const char *ast_inet_ntoa(char *buf, int bufsiz, struct in_addr ia);
extern int ast_utils_init(void);
+#ifdef inet_ntoa
+#undef inet_ntoa
+#endif
#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__
#endif
diff --git a/utils.c b/utils.c
index 45be322309..63aca45214 100755
--- a/utils.c
+++ b/utils.c
@@ -14,6 +14,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
#include <asterisk/lock.h>
#include <asterisk/utils.h>
@@ -29,6 +30,7 @@ static char b2a[256];
AST_MUTEX_DEFINE_STATIC(__mutex);
+/* Recursive replacement for gethostbyname for BSD-based systems */
static int gethostbyname_r (const char *name, struct hostent *ret, char *buf,
size_t buflen, struct hostent **result,
int *h_errnop)
@@ -126,6 +128,9 @@ static int gethostbyname_r (const char *name, struct hostent *ret, char *buf,
#endif
+/* Recursive thread safe version of gethostbyname that replaces the
+ standard gethostbyname (which is not recursive)
+*/
struct hostent *ast_gethostbyname(const char *host, struct ast_hostent *hp)
{
int res;
@@ -328,6 +333,7 @@ static void base64_init(void)
#endif
}
+/* Recursive thread safe replacement of inet_ntoa */
const char *ast_inet_ntoa(char *buf, int bufsiz, struct in_addr ia)
{
return inet_ntop(AF_INET, &ia, buf, bufsiz);
--
GitLab