src/liboping.c: Do not reset recv_ttl in ping_receive_one().

[liboping.git] / src / liboping.c

diff --git a/src/liboping.c b/src/liboping.c
index 47c8279..2ccbf4d 100644 (file)
--- a/src/liboping.c
+++ b/src/liboping.c
@@ -25,7 +25,6 @@
 # include <stdlib.h>
 # include <stdio.h>
 # include <string.h>
-# include <stdint.h>
 # include <inttypes.h>
 # include <errno.h>
 # include <assert.h>
@@ -33,6 +32,10 @@
 # error "You don't have the standard C99 header files installed"
 #endif /* STDC_HEADERS */
 
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -61,6 +64,7 @@
 #if HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
+
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif
@@ -141,7 +145,7 @@ struct pingobj
 /* Even though Posix requires "strerror_r" to return an "int",
  * some systems (e.g. the GNU libc) return a "char *" _and_
  * ignore the second argument ... -tokkee */
-char *sstrerror (int errnum, char *buf, size_t buflen)
+static char *sstrerror (int errnum, char *buf, size_t buflen)
 {
        buf[0] = 0;
 
@@ -339,6 +343,9 @@ static pinghost_t *ping_receive_ipv4 (pinghost_t *ph, char *buffer, size_t buffe
                                ident, seq);
        }
 
+       if (ptr != NULL)
+               ptr->recv_ttl = ip_hdr->ip_ttl;
+
        return (ptr);
 }
 
@@ -425,7 +432,6 @@ static int ping_receive_one (int fd, pinghost_t *ph, struct timeval *now)
 {
        struct timeval diff;
        pinghost_t *host = NULL;
-       int family;
        int recv_ttl;
        
        /*
@@ -471,15 +477,16 @@ static int ping_receive_one (int fd, pinghost_t *ph, struct timeval *now)
        dprintf ("Read %zi bytes from fd = %i\n", payload_buffer_len, fd);
 
        /* Iterate over all auxiliary data in msghdr */
-       family = -1;
        recv_ttl = -1;
        for (cmsg = CMSG_FIRSTHDR (&msghdr); /* {{{ */
                        cmsg != NULL;
                        cmsg = CMSG_NXTHDR (&msghdr, cmsg))
        {
-               if (cmsg->cmsg_level == IPPROTO_IP) /* {{{ */
+               if (ph->addrfamily == AF_INET) /* {{{ */
                {
-                       family = AF_INET;
+                       if (cmsg->cmsg_level != IPPROTO_IP)
+                               continue;
+
                        if (cmsg->cmsg_type == IP_TTL)
                        {
                                memcpy (&recv_ttl, CMSG_DATA (cmsg),
@@ -492,9 +499,11 @@ static int ping_receive_one (int fd, pinghost_t *ph, struct timeval *now)
                                                cmsg->cmsg_type);
                        }
                } /* }}} */
-               else if (cmsg->cmsg_level == IPPROTO_IPV6) /* {{{ */
+               else if (ph->addrfamily == AF_INET6) /* {{{ */
                {
-                       family = AF_INET6;
+                       if (cmsg->cmsg_level != IPPROTO_IPV6)
+                               continue;
+
                        if (cmsg->cmsg_type == IPV6_HOPLIMIT)
                        {
                                memcpy (&recv_ttl, CMSG_DATA (cmsg),
@@ -515,13 +524,13 @@ static int ping_receive_one (int fd, pinghost_t *ph, struct timeval *now)
                }
        } /* }}} for (cmsg) */
 
-       if (family == AF_INET)
+       if (ph->addrfamily == AF_INET)
        {
                host = ping_receive_ipv4 (ph, payload_buffer, payload_buffer_len);
                if (host == NULL)
                        return (-1);
        }
-       else if (family == AF_INET6)
+       else if (ph->addrfamily == AF_INET6)
        {
                host = ping_receive_ipv6 (ph, payload_buffer, payload_buffer_len);
                if (host == NULL)
@@ -530,7 +539,7 @@ static int ping_receive_one (int fd, pinghost_t *ph, struct timeval *now)
        else
        {
                dprintf ("ping_receive_one: Unknown address family %i.\n",
-                               family);
+                               ph->addrfamily);
                return (-1);
        }
 
@@ -551,11 +560,12 @@ static int ping_receive_one (int fd, pinghost_t *ph, struct timeval *now)
                        (int) diff.tv_sec,
                        (int) diff.tv_usec);
 
+       if (recv_ttl >= 0)
+               host->recv_ttl = recv_ttl;
+
        host->latency  = ((double) diff.tv_usec) / 1000.0;
        host->latency += ((double) diff.tv_sec)  * 1000.0;
 
-       host->recv_ttl = recv_ttl;
-
        timerclear (host->timer);
 
        return (0);
@@ -581,7 +591,10 @@ static int ping_receive_all (pingobj_t *obj)
        ret = 0;
 
        for (ptr = ph; ptr != NULL; ptr = ptr->next)
-               ptr->latency = -1.0;
+       {
+               ptr->latency  = -1.0;
+               ptr->recv_ttl = -1;
+       }
 
        if (gettimeofday (&nowtime, NULL) == -1)
        {
@@ -1341,6 +1354,7 @@ int ping_host_add (pingobj_t *obj, const char *host)
                        setsockopt (ph->fd, IPPROTO_IP, IP_RECVTTL,
                                        &opt, sizeof (opt));
                }
+#if defined(IPPROTO_IPV6) && defined(IPV6_RECVHOPLIMIT)
                else if (ph->addrfamily == AF_INET6)
                {
                        int opt = 1;
@@ -1348,6 +1362,7 @@ int ping_host_add (pingobj_t *obj, const char *host)
                        setsockopt (ph->fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT,
                                        &opt, sizeof (opt));
                }
+#endif
 
                break;
        }