update btime and hbeat libs to understand ipv6 as well as ipv4.

1 files changed, 19 insertions, 11 deletions

diff --git a/hbeat.c b/hbeat.c
index 46b8ac1..8f781e0 100644
--- a/hbeat.c
+++ b/hbeat.c
@@ -56,25 +56,33 @@ hbeat_t
 hbeat_init(const char *host, int max_timeout)
 {
 	struct hbeat_s *hbeatp;
-	struct hostent *hostent;
-	struct in_addr tmpaddr;
+	struct addrinfo hints, *aip;
+	void *addr;
+	char ipstr[INET6_ADDRSTRLEN];
 
 	hbeatp = malloc(sizeof *hbeatp);
 	if (!hbeatp) {
 		return NULL;
 	}
 
-	/* Store the dotted quad instead of the hostname so we
-	 * don't have to look it up ever time we hbeat. */
-	if (inet_addr(host) == INADDR_NONE) {
-		if ((hostent = gethostbyname(host)) == NULL) {
-			return NULL;
-		}
-		memcpy(&tmpaddr, hostent->h_addr, hostent->h_length);
-		hbeatp->host = strdup(inet_ntoa(tmpaddr));
+	memset(&hints, 0, sizeof hints);
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = SOCK_DGRAM;
+	
+	if (getaddrinfo(host, NULL, &hints, &aip) != 0) {
+		return NULL;
+	}
+
+	if (aip->ai_family == AF_INET) {
+		addr = &(((struct sockaddr_in *)aip->ai_addr)->sin_addr);
 	} else {
-		hbeatp->host = strdup(host);
+		addr = &(((struct sockaddr_in6 *)aip->ai_addr)->sin6_addr);
 	}
+
+	inet_ntop(aip->ai_family, addr, ipstr, sizeof ipstr);
+	freeaddrinfo(aip);
+
+	hbeatp->host = strdup(ipstr);
 	hbeatp->max_timeout = max_timeout;
 	hbeatp->rhost_state = HOST_ALIVE;
 	hbeatp->last_rhost_btime = 0;