lagertonne/nut
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Imported Upstream version 2.6.0

Browse source
This commit is contained in:
arnaud.quette@free.fr 2011-01-26 10:35:08 +01:00
parent 26fb71b504
commit 459aaf9392
510 changed files with 40508 additions and 18859 deletions
Download patch file Download diff file Expand all files Collapse all files

106
server/conf.c
View file

@ -30,59 +30,33 @@
/* add another UPS for monitoring from ups.conf */
static void ups_create(const char *fn, const char *name, const char *desc)
{
upstype_t *temp, *last;
temp = last = firstups;
/* find end of linked list */
while (temp != NULL) {
last = temp;
upstype_t *temp;
for (temp = firstups; temp != NULL; temp = temp->next) {
if (!strcasecmp(temp->name, name)) {
upslogx(LOG_ERR, "UPS name [%s] is already in use!",
name);
upslogx(LOG_ERR, "UPS name [%s] is already in use!", name);
return;
}
temp = temp->next;
}
/* grab some memory and add the info */
temp = xmalloc(sizeof(upstype_t));
temp->name = xstrdup(name);
temp = xcalloc(1, sizeof(*temp));
temp->fn = xstrdup(fn);
temp->name = xstrdup(name);
if (desc)
if (desc) {
temp->desc = xstrdup(desc);
else
temp->desc = NULL;
}
temp->stale = 1;
temp->numlogins = 0;
temp->fsd = 0;
temp->retain = 1;
temp->next = NULL;
temp->dumpdone = 0;
temp->data_ok = 0;
temp->sock_fd = sstate_connect(temp);
/* preload this to the current time to avoid false staleness */
time(&temp->last_heard);
temp->last_ping = 0;
temp->last_connfail = 0;
temp->inforoot = NULL;
temp->cmdlist = NULL;
if (last == NULL)
firstups = temp;
else
last->next = temp;
temp->sock_fd = sstate_connect(temp);
temp->next = firstups;
firstups = temp;
num_ups++;
}
@ -272,48 +246,38 @@ void load_upsdconf(int reloading)
/* callback during parsing of ups.conf */
void do_upsconf_args(char *upsname, char *var, char *val)
{
ups_t *tmp, *last;
ups_t *temp;
/* no "global" stuff for us */
if (!upsname)
if (!upsname) {
return;
last = tmp = upstable;
while (tmp) {
last = tmp;
if (!strcmp(tmp->upsname, upsname)) {
if (!strcmp(var, "driver"))
tmp->driver = xstrdup(val);
if (!strcmp(var, "port"))
tmp->port = xstrdup(val);
if (!strcmp(var, "desc"))
tmp->desc = xstrdup(val);
return;
}
tmp = tmp->next;
}
tmp = xmalloc(sizeof(ups_t));
tmp->upsname = xstrdup(upsname);
tmp->driver = NULL;
tmp->port = NULL;
tmp->desc = NULL;
tmp->next = NULL;
/* check if UPS is already listed */
for (temp = upstable; temp != NULL; temp = temp->next) {
if (!strcmp(temp->upsname, upsname)) {
break;
}
}
if (!strcmp(var, "driver"))
tmp->driver = xstrdup(val);
if (!strcmp(var, "port"))
tmp->port = xstrdup(val);
if (!strcmp(var, "desc"))
tmp->desc = xstrdup(val);
/* if not listed, create a new entry and prepend it to the list */
if (temp == NULL) {
temp = xcalloc(1, sizeof(*temp));
temp->upsname = xstrdup(upsname);
temp->next = upstable;
upstable = temp;
}
if (last)
last->next = tmp;
else
upstable = tmp;
if (!strcmp(var, "driver")) {
free(temp->driver);
temp->driver = xstrdup(val);
} else if (!strcmp(var, "port")) {
free(temp->port);
temp->port = xstrdup(val);
} else if (!strcmp(var, "desc")) {
free(temp->desc);
temp->desc = xstrdup(val);
}
}
/* add valid UPSes from ups.conf to the internal structures */