Increment per-host sequence in check_icmp

[nagiosplug.git] / plugins-root / check_icmp.c

diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 4da6ea166cecb98859f42f923f7a9ea0f5bea22b..1dde4478936afc8df47549d1da12da28b2eb40ca 100644 (file)
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -70,6 +70,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #include <netinet/ip_icmp.h>
 #include <arpa/inet.h>
 #include <signal.h>
+#include <float.h>
 
 
 /** sometimes undefined system macros (quite a few, actually) **/
@@ -183,14 +184,14 @@ static u_int get_timevar(const char *);
 static u_int get_timevaldiff(struct timeval *, struct timeval *);
 static in_addr_t get_ip_address(const char *);
 static int wait_for_reply(int, u_int);
-static int recvfrom_wto(int, char *, unsigned int, struct sockaddr *, u_int *);
+static int recvfrom_wto(int, void *, unsigned int, struct sockaddr *, u_int *);
 static int send_icmp_ping(int, struct rta_host *);
 static int get_threshold(char *str, threshold *th);
 static void run_checks(void);
 static void set_source_ip(char *);
 static int add_target(char *);
 static int add_target_ip(char *, struct in_addr *);
-static int handle_random_icmp(char *, struct sockaddr_in *);
+static int handle_random_icmp(unsigned char *, struct sockaddr_in *);
 static unsigned short icmp_checksum(unsigned short *, int);
 static void finish(int);
 static void crash(const char *, ...);
@@ -299,7 +300,7 @@ get_icmp_error_msg(unsigned char icmp_type, unsigned char icmp_code)
 }
 
 static int
-handle_random_icmp(char *packet, struct sockaddr_in *addr)
+handle_random_icmp(unsigned char *packet, struct sockaddr_in *addr)
 {
        struct icmp p, sent_icmp;
        struct rta_host *host = NULL;
@@ -332,14 +333,14 @@ handle_random_icmp(char *packet, struct sockaddr_in *addr)
         * to RFC 792). If it isn't, just ignore it */
        memcpy(&sent_icmp, packet + 28, sizeof(sent_icmp));
        if(sent_icmp.icmp_type != ICMP_ECHO || sent_icmp.icmp_id != pid ||
-          sent_icmp.icmp_seq >= targets)
+          sent_icmp.icmp_seq >= targets*packets)
        {
                if(debug) printf("Packet is no response to a packet we sent\n");
                return 0;
        }
 
        /* it is indeed a response for us */
-       host = table[sent_icmp.icmp_seq];
+       host = table[sent_icmp.icmp_seq/packets];
        if(debug) {
                printf("Received \"%s\" from %s for ICMP ECHO sent to %s.\n",
                           get_icmp_error_msg(p.icmp_type, p.icmp_code),
@@ -623,7 +624,7 @@ main(int argc, char **argv)
        table = malloc(sizeof(struct rta_host **) * (argc - 1));
        i = 0;
        while(host) {
-               host->id = i;
+               host->id = i*packets;
                table[i] = host;
                host = host->next;
                i++;
@@ -693,7 +694,7 @@ static int
 wait_for_reply(int sock, u_int t)
 {
        int n, hlen;
-       static char buf[4096];
+       static unsigned char buf[4096];
        struct sockaddr_in resp_addr;
        struct ip *ip;
        struct icmp icp;
@@ -762,12 +763,7 @@ wait_for_reply(int sock, u_int t)
                /* check the response */
                memcpy(&icp, buf + hlen, sizeof(icp));
 
-               if(icp.icmp_id != pid) {
-                       handle_random_icmp(buf + hlen, &resp_addr);
-                       continue;
-               }
-
-               if(icp.icmp_type != ICMP_ECHOREPLY || icp.icmp_seq >= targets) {
+               if(icp.icmp_id != pid || icp.icmp_type != ICMP_ECHOREPLY || icp.icmp_seq >= targets*packets) {
                        if(debug > 2) printf("not a proper ICMP_ECHOREPLY\n");
                        handle_random_icmp(buf + hlen, &resp_addr);
                        continue;
@@ -775,8 +771,11 @@ wait_for_reply(int sock, u_int t)
 
                /* this is indeed a valid response */
                memcpy(&data, icp.icmp_data, sizeof(data));
+               if (debug > 2)
+                       printf("ICMP echo-reply of len %u, id %u, seq %u, cksum 0x%X\n",
+                              sizeof(data), icp.icmp_id, icp.icmp_seq, icp.icmp_cksum);
 
-               host = table[icp.icmp_seq];
+               host = table[icp.icmp_seq/packets];
                gettimeofday(&now, &tz);
                tdiff = get_timevaldiff(&data.stime, &now);
 
@@ -813,7 +812,7 @@ static int
 send_icmp_ping(int sock, struct rta_host *host)
 {
        static union {
-               char *buf; /* re-use so we prevent leaks */
+               void *buf; /* re-use so we prevent leaks */
                struct icmp *icp;
                u_short *cksum_in;
        } packet = { NULL };
@@ -847,9 +846,13 @@ send_icmp_ping(int sock, struct rta_host *host)
        packet.icp->icmp_code = 0;
        packet.icp->icmp_cksum = 0;
        packet.icp->icmp_id = pid;
-       packet.icp->icmp_seq = host->id;
+       packet.icp->icmp_seq = host->id++;
        packet.icp->icmp_cksum = icmp_checksum(packet.cksum_in, icmp_pkt_size);
 
+       if (debug > 2)
+               printf("Sending ICMP echo-request of len %u, id %u, seq %u, cksum 0x%X to host %s\n",
+                      sizeof(data), packet.icp->icmp_id, packet.icp->icmp_seq, packet.icp->icmp_cksum, host->name);
+
        len = sendto(sock, packet.buf, icmp_pkt_size, 0, (struct sockaddr *)addr,
                                 sizeof(struct sockaddr));
 
@@ -866,7 +869,7 @@ send_icmp_ping(int sock, struct rta_host *host)
 }
 
 static int
-recvfrom_wto(int sock, char *buf, unsigned int len, struct sockaddr *saddr,
+recvfrom_wto(int sock, void *buf, unsigned int len, struct sockaddr *saddr,
                         u_int *timo)
 {
        u_int slen;
@@ -1034,7 +1037,7 @@ get_timevaldiff(struct timeval *early, struct timeval *later)
        if(!early) early = &prog_start;
 
        /* if early > later we return 0 so as to indicate a timeout */
-       if(early->tv_sec > early->tv_sec ||
+       if(early->tv_sec > later->tv_sec ||
           (early->tv_sec == later->tv_sec && early->tv_usec > later->tv_usec))
        {
                return 0;