X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fliboping.c;h=4626e6d26e55710ca89c8fee94dc0106184c9e69;hb=8fe50ddb4a18b033f8ea63ef36393ef8b1033f64;hp=f3c850ec763d854dc129c3ec29aa16429b890d7f;hpb=41afaef8517f2674ca0f7e2969b1e3755f61cdec;p=liboping.git

diff --git a/src/liboping.c b/src/liboping.c
index f3c850e..4626e6d 100644
--- a/src/liboping.c
+++ b/src/liboping.c
@@ -302,19 +302,16 @@ static pinghost_t *ping_receive_ipv4 (pingobj_t *obj, char *buffer,
 		return (NULL);
 
 	icmp_hdr = (struct icmp *) buffer;
-	buffer     += ICMP_MINLEN;
-	buffer_len -= ICMP_MINLEN;
-
 	if (icmp_hdr->icmp_type != ICMP_ECHOREPLY)
 	{
-		dprintf ("Unexpected ICMP type: %i\n", icmp_hdr->icmp_type);
+		dprintf ("Unexpected ICMP type: %"PRIu8"\n", icmp_hdr->icmp_type);
 		return (NULL);
 	}
 
 	recv_checksum = icmp_hdr->icmp_cksum;
+	/* This writes to buffer. */
 	icmp_hdr->icmp_cksum = 0;
-	calc_checksum = ping_icmp4_checksum ((char *) icmp_hdr,
-			ICMP_MINLEN + buffer_len);
+	calc_checksum = ping_icmp4_checksum (buffer, buffer_len);
 
 	if (recv_checksum != calc_checksum)
 	{
@@ -697,6 +694,7 @@ static int ping_receive_all (pingobj_t *obj)
 			if (!timerisset (ptr->timer))
 				continue;
 
+			assert (ptr->fd < FD_SETSIZE);
 			FD_SET (ptr->fd, &read_fds);
 			FD_SET (ptr->fd, &err_fds);
 			num_fds++;
@@ -815,29 +813,28 @@ static int ping_send_one_ipv4 (pingobj_t *obj, pinghost_t *ph)
 	struct icmp *icmp4;
 	int status;
 
-	char buf[4096];
-	int  buflen;
+	char   buf[4096] = {0};
+	size_t buflen;
 
 	char *data;
-	int   datalen;
+	size_t datalen;
 
 	dprintf ("ph->hostname = %s\n", ph->hostname);
 
-	memset (buf, '\0', sizeof (buf));
 	icmp4 = (struct icmp *) buf;
-	data  = buf + ICMP_MINLEN;
-
-	icmp4->icmp_type  = ICMP_ECHO;
-	icmp4->icmp_code  = 0;
-	icmp4->icmp_cksum = 0;
-	icmp4->icmp_id    = htons (ph->ident);
-	icmp4->icmp_seq   = htons (ph->sequence);
+	*icmp4 = (struct icmp) {
+		.icmp_type = ICMP_ECHO,
+		.icmp_id   = htons (ph->ident),
+		.icmp_seq  = htons (ph->sequence),
+	};
 
-	buflen = sizeof(buf) - ICMP_MINLEN;
-	strncpy (data, ph->data, buflen);
-	datalen = strlen (data);
+	datalen = strlen (ph->data);
+	buflen = ICMP_MINLEN + datalen;
+	if (sizeof (buf) < buflen)
+		return (EINVAL);
 
-	buflen = datalen + ICMP_MINLEN;
+	data  = buf + ICMP_MINLEN;
+	memcpy (data, ph->data, datalen);
 
 	icmp4->icmp_cksum = ping_icmp4_checksum (buf, buflen);
 
@@ -860,7 +857,7 @@ static int ping_send_one_ipv6 (pingobj_t *obj, pinghost_t *ph)
 	struct icmp6_hdr *icmp6;
 	int status;
 
-	char buf[4096];
+	char buf[4096] = {0};
 	int  buflen;
 
 	char *data;
@@ -868,23 +865,22 @@ static int ping_send_one_ipv6 (pingobj_t *obj, pinghost_t *ph)
 
 	dprintf ("ph->hostname = %s\n", ph->hostname);
 
-	memset (buf, '\0', sizeof (buf));
 	icmp6 = (struct icmp6_hdr *) buf;
-	data  = (char *) (icmp6 + 1);
+	*icmp6 = (struct icmp6_hdr) {
+		.icmp6_type  = ICMP6_ECHO_REQUEST,
+		.icmp6_id    = htons (ph->ident),
+		.icmp6_seq   = htons (ph->sequence),
+	};
 
-	icmp6->icmp6_type  = ICMP6_ECHO_REQUEST;
-	icmp6->icmp6_code  = 0;
-	/* The checksum will be calculated by the TCP/IP stack.  */
-	/* FIXME */
-	icmp6->icmp6_cksum = 0;
-	icmp6->icmp6_id    = htons (ph->ident);
-	icmp6->icmp6_seq   = htons (ph->sequence);
+	datalen = strlen (ph->data);
+	buflen = sizeof (*icmp6) + datalen;
+	if (sizeof (buf) < buflen)
+		return (EINVAL);
 
-	buflen = 4096 - ICMP_MINLEN;
-	strncpy (data, ph->data, buflen);
-	datalen = strlen (data);
+	data  = buf + ICMP_MINLEN;
+	memcpy (data, ph->data, datalen);
 
-	buflen = datalen + ICMP_MINLEN;
+	/* The checksum will be calculated by the TCP/IP stack. */
 
 	dprintf ("Sending ICMPv6 package with ID 0x%04x\n", ph->ident);
 
@@ -1486,6 +1482,16 @@ int ping_host_add (pingobj_t *obj, const char *host)
 			ping_set_errno (obj, errno);
 			continue;
 		}
+		else if (ph->fd >= FD_SETSIZE)
+		{
+			dprintf("socket(2) returned file descriptor %d, which is above the file "
+				"descriptor limit for select(2) (FD_SETSIZE = %d)\n",
+				ph->fd, FD_SETSIZE);
+			close(ph->fd);
+			ph->fd = -1;
+			ping_set_errno(obj, EMFILE);
+			continue;
+		}
 
 		if (obj->srcaddr != NULL)
 		{
@@ -1716,6 +1722,20 @@ pingobj_iter_t *ping_iterator_next (pingobj_iter_t *iter)
 	return ((pingobj_iter_t *) iter->next);
 }
 
+int ping_iterator_count (pingobj_t *obj)
+{
+	if (obj == NULL)
+		return 0;
+
+	int count = 0;
+	pingobj_iter_t *iter = obj->head;
+	while (iter) {
+		count++;
+		iter = iter->next;
+	}
+	return count;
+}
+
 int ping_iterator_get_info (pingobj_iter_t *iter, int info,
 		void *buffer, size_t *buffer_len)
 {