- memcpy(&p->last_ping_received, &tv, sizeof(tv));
-
- tvsub(&tv, (struct timeval *) &icmp->icmp_data[0]);
- delay=tv.tv_sec*1000+(tv.tv_usec/1000);
-
- if(isVerbose)
- log(LOG_INFO,"Got ICMP reply from %s in %d ms.",p->name,delay);
- p->down=0;
- if(!p->up)
- {
- p->up=1;
- if(isVerbose)
- log(LOG_INFO,"Host %s in now up. Executing UP command",p->name);
- if(!fork())
- {
- system(p->upcmd);
- exit(0);
- } else
- {
- wait(nil);
- }
+ int host_count = iniparser_getnsec(conf);
+ if (host_count < 1 ) {
+ fprintf(stderr, "ERROR: Unable to determine number of hosts in configuration file.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ 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));
+ char * key_buf = malloc(section_len + 1 + MAXCONFKEYLEN + 1);
+ strcpy(key_buf, iniparser_getsecname(conf, i));
+ key_buf[section_len++] = ':';
+
+ struct monitor_host * cur_host = malloc(sizeof(struct monitor_host));
+
+ key_buf[section_len] = '\0';
+ strncat(key_buf, "host", MAXCONFKEYLEN);
+ cur_host->name = strdup(iniparser_getstring(conf, key_buf, NULL));
+
+ key_buf[section_len] = '\0';
+ strncat(key_buf, "interval", MAXCONFKEYLEN);
+ cur_host->ping_interval = iniparser_getint(conf, key_buf, -1);
+
+ key_buf[section_len] = '\0';
+ strncat(key_buf, "max_delay", MAXCONFKEYLEN);
+ cur_host->max_delay = iniparser_getint(conf, key_buf, -1);
+
+ key_buf[section_len] = '\0';
+ strncat(key_buf, "up_cmd", MAXCONFKEYLEN);
+ cur_host->up_cmd = strdup(iniparser_getstring(conf, key_buf, NULL));
+
+ key_buf[section_len] = '\0';
+ strncat(key_buf, "down_cmd", MAXCONFKEYLEN);
+ 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. */
+ cur_host->host_up = true;
+
+ /* TODO: Do I want to make any checks for start_condition? */
+ 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);
+ }
+
+ 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;