From: octo <octo>
Date: Tue, 9 May 2006 05:34:03 +0000 (+0000)
Subject: Fixed that nasty bug in the `sequence' code: Comparing an int with a short without... 
X-Git-Tag: liboping-0.1.1~2^2~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=4bd6b167f08659f8f5b636419eb6212a1bed18c1;p=liboping.git

Fixed that nasty bug in the `sequence' code: Comparing an int with a short without casting.. Argh..
---

diff --git a/src/liboping.c b/src/liboping.c
index 9e9d6c2..b926090 100644
--- a/src/liboping.c
+++ b/src/liboping.c
@@ -260,7 +260,7 @@ static pinghost_t *ping_receive_ipv4 (pinghost_t *ph, char *buffer, size_t buffe
 	for (ptr = ph; ptr != NULL; ptr = ptr->next)
 	{
 		dprintf ("hostname = %s, ident = 0x%04x, seq = %i\n",
-				ptr->hostname, ptr->ident, ptr->sequence - 1);
+				ptr->hostname, ptr->ident, ((ptr->sequence - 1) & 0xFFFF));
 
 		if (ptr->addrfamily != AF_INET)
 			continue;
@@ -271,7 +271,7 @@ static pinghost_t *ping_receive_ipv4 (pinghost_t *ph, char *buffer, size_t buffe
 		if (ptr->ident != ident)
 			continue;
 
-		if ((ptr->sequence - 1) != seq)
+		if (((ptr->sequence - 1) & 0xFFFF) != seq)
 			continue;
 
 		dprintf ("Match found: hostname = %s, ident = 0x%04x, seq = %i\n",
@@ -323,7 +323,7 @@ static pinghost_t *ping_receive_ipv6 (pinghost_t *ph, char *buffer, size_t buffe
 	for (ptr = ph; ptr != NULL; ptr = ptr->next)
 	{
 		dprintf ("hostname = %s, ident = 0x%04x, seq = %i\n",
-				ptr->hostname, ptr->ident, ptr->sequence - 1);
+				ptr->hostname, ptr->ident, ((ptr->sequence - 1) & 0xFFFF));
 
 		if (ptr->addrfamily != AF_INET6)
 			continue;
@@ -334,7 +334,7 @@ static pinghost_t *ping_receive_ipv6 (pinghost_t *ph, char *buffer, size_t buffe
 		if (ptr->ident != ident)
 			continue;
 
-		if ((ptr->sequence - 1) != seq)
+		if (((ptr->sequence - 1) & 0xFFFF) != seq)
 			continue;
 
 		dprintf ("Match found: hostname = %s, ident = 0x%04x, seq = %i\n",
@@ -1139,6 +1139,7 @@ int ping_iterator_get_info (pingobj_iter_t *iter, int info,
 			ret = 0;
 			break;
 
+		/* FIXME Return the sequence as an unsigned int */
 		case PING_INFO_SEQUENCE:
 			ret = ENOMEM;
 			*buffer_len = sizeof (uint16_t);