X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fliboping.c;h=4c614f744adfa5bfd7a78a4e7573e5db385adabb;hb=dfbb70da843d92b3d8935ab5d264554e1f12abf2;hp=62bc461b8e7b2680c3e93c0a6822da24bb9fa89c;hpb=6d35f0cbf1cb30913020be3b78028ae8299332f0;p=liboping.git

diff --git a/src/liboping.c b/src/liboping.c
index 62bc461..4c614f7 100644
--- a/src/liboping.c
+++ b/src/liboping.c
@@ -288,6 +288,22 @@ static pinghost_t *ping_receive_ipv4 (pinghost_t *ph, char *buffer, size_t buffe
 	return (ptr);
 }
 
+#ifndef ICMP6_ECHO_REQUEST
+# ifdef ICMP6_ECHO /* AIX netinet/ip6_icmp.h */
+#  define ICMP6_ECHO_REQUEST ICMP6_ECHO
+# else
+#  define ICMP6_ECHO_REQUEST 128
+# endif
+#endif
+
+#ifndef ICMP6_ECHO_REPLY
+# ifdef ICMP6_ECHOREPLY /* AIX netinet/ip6_icmp.h */
+#  define ICMP6_ECHO_REPLY ICMP6_ECHOREPLY
+# else
+#  define ICMP6_ECHO_REPLY 129
+# endif
+#endif
+
 static pinghost_t *ping_receive_ipv6 (pinghost_t *ph, char *buffer, size_t buffer_len)
 {
 	struct icmp6_hdr *icmp_hdr;
@@ -778,6 +794,7 @@ static pinghost_t *ping_alloc (void)
 	ph->addr    = (struct sockaddr_storage *) (ph->timer + 1);
 
 	ph->addrlen = sizeof (struct sockaddr_storage);
+	ph->fd      = -1;
 	ph->latency = -1.0;
 	ph->ident   = ping_get_ident () & 0xFFFF;
 
@@ -786,6 +803,9 @@ static pinghost_t *ping_alloc (void)
 
 static void ping_free (pinghost_t *ph)
 {
+	if (ph->fd >= 0)
+		close (ph->fd);
+	
 	if (ph->hostname != NULL)
 		free (ph->hostname);
 
@@ -1152,8 +1172,7 @@ int ping_host_add (pingobj_t *obj, const char *host)
 
 	if (ph->fd < 0)
 	{
-		free (ph->hostname);
-		free (ph);
+		ping_free (ph);
 		return (-1);
 	}
 
@@ -1210,9 +1229,6 @@ int ping_host_remove (pingobj_t *obj, const char *host)
 	else
 		pre->next = cur->next;
 	
-	if (cur->fd >= 0)
-		close (cur->fd);
-
 	ping_free (cur);
 
 	return (0);