1 files changed, 49 insertions, 34 deletions

diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 01ae174..f8f1535 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -50,19 +50,11 @@ const char *email = "devel@monitoring-plugins.org";
 #if HAVE_SYS_SOCKIO_H
 #include <sys/sockio.h>
 #endif
-#include <sys/ioctl.h>
+
 #include <sys/time.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <stddef.h>
 #include <errno.h>
-#include <string.h>
+#include <signal.h>
 #include <ctype.h>
-#include <netdb.h>
-#include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
@@ -71,8 +63,6 @@ const char *email = "devel@monitoring-plugins.org";
 #include <netinet/ip_icmp.h>
 #include <netinet/icmp6.h>
 #include <arpa/inet.h>
-#include <signal.h>
-#include <float.h>
 
 
 /** sometimes undefined system macros (quite a few, actually) **/
@@ -207,7 +197,7 @@ static int add_target(char *);
 static int add_target_ip(char *, struct sockaddr_storage *);
 static int handle_random_icmp(unsigned char *, struct sockaddr_storage *);
 static void parse_address(struct sockaddr_storage *, char *, int);
-static unsigned short icmp_checksum(unsigned short *, int);
+static unsigned short icmp_checksum(uint16_t *, size_t);
 static void finish(int);
 static void crash(const char *, ...);
 
@@ -223,7 +213,7 @@ static int mode, protocols, sockets, debug = 0, timeout = 10;
 static unsigned short icmp_data_size = DEFAULT_PING_DATA_SIZE;
 static unsigned short icmp_pkt_size = DEFAULT_PING_DATA_SIZE + ICMP_MINLEN;
 
-static unsigned int icmp_sent = 0, icmp_recv = 0, icmp_lost = 0;
+static unsigned int icmp_sent = 0, icmp_recv = 0, icmp_lost = 0, ttl = 0;
 #define icmp_pkts_en_route (icmp_sent - (icmp_recv + icmp_lost))
 static unsigned short targets_down = 0, targets = 0, packets = 0;
 #define targets_alive (targets - targets_down)
@@ -233,7 +223,6 @@ static pid_t pid;
 static struct timezone tz;
 static struct timeval prog_start;
 static unsigned long long max_completion_time = 0;
-static unsigned char ttl = 0;   /* outgoing ttl */
 static unsigned int warn_down = 1, crit_down = 1; /* host down threshold values */
 static int min_hosts_alive = -1;
 float pkt_backoff_factor = 1.5;
@@ -410,6 +399,7 @@ main(int argc, char **argv)
 #ifdef SO_TIMESTAMP
         int on = 1;
 #endif
+        char *source_ip = NULL;
         char * opts_str = "vhVw:c:n:p:t:H:s:i:b:I:l:m:64";
 
         setlocale (LC_ALL, "");
@@ -464,7 +454,6 @@ main(int argc, char **argv)
         /* Parse protocol arguments first */
         for(i = 1; i < argc; i++) {
                 while((arg = getopt(argc, argv, opts_str)) != EOF) {
-                        unsigned short size;
                         switch(arg) {
                         case '4':
                                 if (address_family != -1)
@@ -487,10 +476,10 @@ main(int argc, char **argv)
         /* Reset argument scanning */
         optind = 1;
 
+        unsigned short size;
         /* parse the arguments */
         for(i = 1; i < argc; i++) {
                 while((arg = getopt(argc, argv, opts_str)) != EOF) {
-                        unsigned short size;
                         switch(arg) {
                         case 'v':
                                 debug++;
@@ -530,7 +519,7 @@ main(int argc, char **argv)
                                 add_target(optarg);
                                 break;
                         case 'l':
-                                ttl = (unsigned char)strtoul(optarg, NULL, 0);
+                                ttl = (int)strtoul(optarg, NULL, 0);
                                 break;
                         case 'm':
                                 min_hosts_alive = (int)strtoul(optarg, NULL, 0);
@@ -542,7 +531,7 @@ main(int argc, char **argv)
                                 }
                                 break;
                         case 's': /* specify source IP address */
-                                set_source_ip(optarg);
+                                source_ip = optarg;
                                 break;
                         case 'V': /* version */
                                 print_revision (progname, NP_VERSION);
@@ -597,6 +586,8 @@ main(int argc, char **argv)
                 sockets |= HAVE_ICMP;
         else icmp_sockerrno = errno;
 
+        if( source_ip )
+                set_source_ip(source_ip);
 
 #ifdef SO_TIMESTAMP
         if(setsockopt(icmp_sock, SOL_SOCKET, SO_TIMESTAMP, &on, sizeof(on)))
@@ -717,7 +708,7 @@ main(int argc, char **argv)
 static void
 run_checks()
 {
-        u_int i, t, result;
+        u_int i, t;
         u_int final_wait, time_passed;
 
         /* this loop might actually violate the pkt_interval or target_interval
@@ -735,9 +726,9 @@ run_checks()
 
                         /* we're still in the game, so send next packet */
                         (void)send_icmp_ping(icmp_sock, table[t]);
-                        result = wait_for_reply(icmp_sock, target_interval);
+                        wait_for_reply(icmp_sock, target_interval);
                 }
-                result = wait_for_reply(icmp_sock, pkt_interval * targets);
+                wait_for_reply(icmp_sock, pkt_interval * targets);
         }
 
         if(icmp_pkts_en_route && targets_alive) {
@@ -757,7 +748,7 @@ run_checks()
                  * haven't yet */
                 if(debug) printf("Waiting for %u micro-seconds (%0.3f msecs)\n",
                                                  final_wait, (float)final_wait / 1000);
-                result = wait_for_reply(icmp_sock, final_wait);
+                wait_for_reply(icmp_sock, final_wait);
         }
 }
 
@@ -776,7 +767,7 @@ static int
 wait_for_reply(int sock, u_int t)
 {
         int n, hlen;
-        static unsigned char buf[4096];
+        static unsigned char buf[65536];
         struct sockaddr_storage resp_addr;
         union ip_hdr *ip;
         union icmp_packet packet;
@@ -913,9 +904,27 @@ wait_for_reply(int sock, u_int t)
                 if(debug) {
                         char address[INET6_ADDRSTRLEN];
                         parse_address(&resp_addr, address, sizeof(address));
-                        printf("%0.3f ms rtt from %s, outgoing ttl: %u, incoming ttl: %u, max: %0.3f, min: %0.3f\n",
-                                (float)tdiff / 1000, address,
-                                ttl, ip->ip.ip_ttl, (float)host->rtmax / 1000, (float)host->rtmin / 1000);
+
+                        switch(address_family) {
+                                case AF_INET: {
+                                        printf("%0.3f ms rtt from %s, outgoing ttl: %u, incoming ttl: %u, max: %0.3f, min: %0.3f\n",
+                                                (float)tdiff / 1000,
+                                                address,
+                                                ttl,
+                                                ip->ip.ip_ttl,
+                                                (float)host->rtmax / 1000,
+                                                (float)host->rtmin / 1000);
+                                        break;
+                                          };
+                                case AF_INET6: {
+                                        printf("%0.3f ms rtt from %s, outgoing ttl: %u, max: %0.3f, min: %0.3f\n",
+                                                (float)tdiff / 1000,
+                                                address,
+                                                ttl,
+                                                (float)host->rtmax / 1000,
+                                                (float)host->rtmin / 1000);
+                                          };
+                           }
                 }
 
                 /* if we're in hostcheck mode, exit with limited printouts */
@@ -938,6 +947,7 @@ static int
 send_icmp_ping(int sock, struct rta_host *host)
 {
         long int len;
+        size_t addrlen;
         struct icmp_ping_data data;
         struct msghdr hdr;
         struct iovec iov;
@@ -969,6 +979,7 @@ send_icmp_ping(int sock, struct rta_host *host)
 
         if (address_family == AF_INET) {
                 struct icmp *icp = (struct icmp*)buf;
+                addrlen = sizeof(struct sockaddr_in);
 
                 memcpy(&icp->icmp_data, &data, sizeof(data));
 
@@ -977,7 +988,7 @@ send_icmp_ping(int sock, struct rta_host *host)
                 icp->icmp_cksum = 0;
                 icp->icmp_id = htons(pid);
                 icp->icmp_seq = htons(host->id++);
-                icp->icmp_cksum = icmp_checksum((unsigned short*)buf, icmp_pkt_size);
+                icp->icmp_cksum = icmp_checksum((uint16_t*)buf, (size_t)icmp_pkt_size);
 
                 if (debug > 2)
                         printf("Sending ICMP echo-request of len %lu, id %u, seq %u, cksum 0x%X to host %s\n",
@@ -985,7 +996,10 @@ send_icmp_ping(int sock, struct rta_host *host)
         }
         else {
                 struct icmp6_hdr *icp6 = (struct icmp6_hdr*)buf;
+                addrlen = sizeof(struct sockaddr_in6);
+
                 memcpy(&icp6->icmp6_dataun.icmp6_un_data8[4], &data, sizeof(data));
+
                 icp6->icmp6_type = ICMP6_ECHO_REQUEST;
                 icp6->icmp6_code = 0;
                 icp6->icmp6_cksum = 0;
@@ -1006,7 +1020,7 @@ send_icmp_ping(int sock, struct rta_host *host)
 
         memset(&hdr, 0, sizeof(hdr));
         hdr.msg_name = (struct sockaddr *)&host->saddr_in;
-        hdr.msg_namelen = sizeof(struct sockaddr_storage);
+        hdr.msg_namelen = addrlen;
         hdr.msg_iov = &iov;
         hdr.msg_iovlen = 1;
 
@@ -1514,18 +1528,19 @@ get_threshold(char *str, threshold *th)
 }
 
 unsigned short
-icmp_checksum(unsigned short *p, int n)
+icmp_checksum(uint16_t *p, size_t n)
 {
         unsigned short cksum;
         long sum = 0;
 
-        while(n > 2) {
-                sum += *p++;
-                n -= sizeof(unsigned short);
+        /* sizeof(uint16_t) == 2 */
+        while(n >= 2) {
+                sum += *(p++);
+                n -= 2;
         }
 
         /* mop up the occasional odd byte */
-        if(n == 1) sum += (unsigned char)*p;
+        if(n == 1) sum += *((uint8_t *)p -1);
 
         sum = (sum >> 16) + (sum & 0xffff);     /* add hi 16 to low 16 */
         sum += (sum >> 16);                     /* add carry */