#include <netinet/ip.h>
#include <netinet/ip_icmp.h>
#include <errno.h>
+#include <assert.h>
#include "iniparser/iniparser.h"
#define MAXPACKETSIZE (65536 - 60 - 8) /* TODO: What are the magic numbers? */
#define DEFAULTDATALEN (64 - 8) /* TODO: What are the magic numbers? */
+/* ICMP header contains: type, code, checksum, identifier and sequence number. */
+#define ICMP_ECHO_HEADER_BYTES 8
+#define ICMP_ECHO_DATA_BYTES sizeof(struct timeval)
+#define ICMP_ECHO_PACKET_BYTES ICMP_ECHO_HEADER_BYTES + ICMP_ECHO_DATA_BYTES
+
/* Must be larger than the length of the longest configuration key (currently 'start_condition'). */
#define MAXCONFKEYLEN 20
bool host_up;
struct sockaddr_in dest;
- /* TODO: Why are we using both a linked list AND an array for this data? */
/* Linked list */
struct monitor_host * next;
};
/* Globals */
/* Since the program is based around signals, a linked list of hosts is maintained here. */
- static struct monitor_host ** hosts = NULL;
+ static struct monitor_host * hosts = NULL;
+ static int send_delay = 1;
/* Set by command line flags. */
- static bool verbose = false;
- static bool retry_down_cmd = false;
- /* TODO: Get rid of this global. */
- static int send_delay = 1;
+ static bool verbose = false;
+ static bool retry_down_cmd = false;
/*
- * Checksum routine for Internet Protocol family headers
+ * Generate an Internet Checksum per RFC 1071.
+ *
+ * This is not a general purpose implementation of RFC 1071. Since we only
+ * send ICMP echo packets, we assume 'data' will contain a specific number of
+ * bytes.
*/
-static int
-in_cksum(unsigned short * addr, int len)
+uint16_t
+checksum(uint16_t * data)
{
- int nleft = len;
- unsigned short * w = addr;
- int sum = 0;
- unsigned short answer = 0;
-
- /*
- * Our algorithm is simple, using a 32 bit accumulator (sum), we add
- * sequential 16 bit words to it, and at the end, fold back all the
- * carry bits from the top 16 bits into the lower 16 bits.
- */
- while (nleft > 1) {
- sum += *w++;
- nleft -= 2;
+ uint32_t accumulator = 0;
+ for (size_t i = 0; i < ICMP_ECHO_PACKET_BYTES / 2; i++) {
+ accumulator += ntohs(data[i]);
+ if (accumulator > 0xffff) accumulator -= 0xffff;
}
-
- /* mop up an odd byte, if necessary */
- if (nleft == 1) {
- *(u_char *)(&answer) = *(u_char *)w;
- sum += answer;
- }
-
- /* add back carry outs from top 16 bits to low 16 bits */
- sum = (sum >> 16) + (sum & 0xffff); /* add hi 16 to low 16 */
- sum += (sum >> 16); /* add carry */
- answer = ~sum; /* truncate to 16 bits */
- return(answer);
+ return htons(~accumulator);
}
/*
- * Subtracts two timeval structs.
- * Ensure out >= in.
- * Modifies out = out - in.
+ * Calculate difference between two timeval structs to within one second.
*/
-static void
-tv_sub(register struct timeval * out, register struct timeval * in)
+void
+timeval_diff(struct timeval * a, const struct timeval * b)
{
- if ((out->tv_usec -= in->tv_usec) < 0) {
- --out->tv_sec;
- out->tv_usec += 1000000;
- }
- out->tv_sec -= in->tv_sec;
+ assert(a->tv_sec >= b->tv_sec);
+ a->tv_sec -= b->tv_sec;
}
/*
{
int i;
struct icmp * icp;
- struct monitor_host * p;
- u_char outpack[MAXPACKETSIZE];
+ struct monitor_host * p = hosts;
+ unsigned char outpack[MAXPACKETSIZE]; /* Use char so this can be aliased later. */
- p = hosts[0];
while (p) {
if (p->socket != -1) {
struct timeval now;
gettimeofday(&now, (struct timezone *) NULL);
- tv_sub(&now, &p->last_ping_received);
+ timeval_diff(&now, &p->last_ping_received);
if (now.tv_sec > (p->max_delay + p->ping_interval)) {
if ((p->host_up) || retry_down_cmd) {
}
gettimeofday(&now, (struct timezone *) NULL);
- tv_sub(&now, &p->last_ping_sent);
+ timeval_diff(&now, &p->last_ping_sent);
if (now.tv_sec > p->ping_interval) { /* Time to send ping */
icp = (struct icmp *) outpack;
int cc = DEFAULTDATALEN + 8; /* skips ICMP portion */
- /* compute ICMP checksum */
- icp->icmp_cksum = in_cksum((unsigned short *) icp, cc);
+ icp->icmp_cksum = checksum((uint16_t *) outpack);
i = sendto(p->socket, (char *) outpack, cc, 0, (const struct sockaddr *) (&p->dest), sizeof(struct sockaddr));
memcpy(&p->last_ping_received, &tv, sizeof(tv));
- tv_sub(&tv, (struct timeval *) &icmp->icmp_data[0]);
+ timeval_diff(&tv, (struct timeval *) &icmp->icmp_data[0]);
delay = tv.tv_sec * 1000 + (tv.tv_usec / 1000);
- if (verbose) printf("INFO: Got ICMP reply from %s in %d ms.\n", p->name, delay);
+ if (verbose) printf("INFO: Got ICMP reply from %s.\n", p->name);
if (!p->host_up) {
if (verbose) printf("INFO: Host %s started responding. Executing UP command.\n", p->name);
p->host_up = true;
struct monitor_host * p;
while (1) {
- p = hosts[0];
+ p = hosts;
FD_ZERO(&rfds);
while (p) {
if (p->socket != -1) {
/* Intentionally empty. We arrive here when interrupted by a signal. No action should be taken. */
} else {
if (retval > 0) {
- p = hosts[0];
+ p = hosts;
while (p) {
if (p->socket!=-1 && FD_ISSET(p->socket, &rfds)) read_icmp_data(p);
p = p->next;
exit(EXIT_FAILURE);
}
- hosts = malloc(sizeof(struct monitor_host *) * host_count);
+ struct monitor_host * host_list_end = NULL;
for (int i=0; i < host_count; i++) {
/* Allocate a reusable buffer large enough to hold the full 'section:key' string. */
int section_len = strlen(iniparser_getsecname(conf, i));
strcpy(key_buf, iniparser_getsecname(conf, i));
key_buf[section_len++] = ':';
- hosts[i] = malloc(sizeof(struct monitor_host));
+ struct monitor_host * cur_host = malloc(sizeof(struct monitor_host));
key_buf[section_len] = '\0';
strncat(key_buf, "host", MAXCONFKEYLEN);
- hosts[i]->name = strdup(iniparser_getstring(conf, key_buf, NULL));
+ cur_host->name = strdup(iniparser_getstring(conf, key_buf, NULL));
key_buf[section_len] = '\0';
strncat(key_buf, "interval", MAXCONFKEYLEN);
- hosts[i]->ping_interval = iniparser_getint(conf, key_buf, -1);
+ cur_host->ping_interval = iniparser_getint(conf, key_buf, -1);
key_buf[section_len] = '\0';
strncat(key_buf, "max_delay", MAXCONFKEYLEN);
- hosts[i]->max_delay = iniparser_getint(conf, key_buf, -1);
+ cur_host->max_delay = iniparser_getint(conf, key_buf, -1);
key_buf[section_len] = '\0';
strncat(key_buf, "up_cmd", MAXCONFKEYLEN);
- hosts[i]->up_cmd = strdup(iniparser_getstring(conf, key_buf, NULL));
+ cur_host->up_cmd = strdup(iniparser_getstring(conf, key_buf, NULL));
key_buf[section_len] = '\0';
strncat(key_buf, "down_cmd", MAXCONFKEYLEN);
- hosts[i]->down_cmd = strdup(iniparser_getstring(conf, key_buf, NULL));
+ cur_host->down_cmd = strdup(iniparser_getstring(conf, key_buf, NULL));
key_buf[section_len] = '\0';
/* TODO: Parse for up/down/auto in start_condition. */
/* TODO: Do a host up/down check if necessary. */
- hosts[i]->host_up = true;
+ cur_host->host_up = true;
/* TODO: Do I want to make any checks for start_condition? */
- if (hosts[i]->name == NULL || hosts[i]->ping_interval == -1 || hosts[i]->max_delay == -1) {
+ if (cur_host->name == NULL || cur_host->ping_interval == -1 || cur_host->max_delay == -1) {
fprintf(stderr, "ERROR: Problems parsing section %s.\n", iniparser_getsecname(conf, i));
exit(EXIT_FAILURE);
}
- hosts[i]->socket = -1;
- hosts[i]->next = NULL;
- if (i>0) hosts[i-1]->next = hosts[i];
- gettimeofday(&(hosts[i]->last_ping_received), (struct timezone *) NULL);
+ cur_host->socket = -1;
+ cur_host->next = NULL;
+ gettimeofday(&(cur_host->last_ping_received), (struct timezone *) NULL);
+
+ if (hosts == NULL) {
+ hosts = cur_host;
+ host_list_end = cur_host;
+ } else {
+ host_list_end->next = cur_host;
+ host_list_end = cur_host;
+ }
+
+ free(key_buf);
}
iniparser_freedict(conf);
}
static void
init_hosts(void)
{
- struct monitor_host * p = hosts[0];
+ struct monitor_host * p = hosts;
struct protoent * proto;
int ok = 0;