diff --git a/src/config.c b/src/config.c index bdaa358..2da211d 100644 --- a/src/config.c +++ b/src/config.c @@ -1,401 +1,396 @@ /* * Copyright (C) 2011 Jiaju Zhang * Copyright (C) 2013 Philipp Marek * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include #include #include #include #include #include "booth.h" #include "config.h" #include "ticket.h" #include "log.h" static int ticket_size = 0; static int ticket_realloc(void) { void *p; booth_conf = realloc(booth_conf, sizeof(struct booth_config) + (ticket_size + TICKET_ALLOC) * sizeof(struct ticket_config)); if (!booth_conf) { log_error("can't alloc more booth config"); return -ENOMEM; } p = (char *) booth_conf + sizeof(struct booth_config) + ticket_size * sizeof(struct ticket_config); memset(p, 0, TICKET_ALLOC * sizeof(struct ticket_config)); ticket_size += TICKET_ALLOC; return 0; } int add_node(char *address, int type); int add_node(char *addr_string, int type) { int rv; struct booth_node *node; rv = 1; if (booth_conf->node_count == MAX_NODES) { log_error("too many nodes"); goto out; } if (strlen(addr_string)+1 >= sizeof(booth_conf->node[0].addr_string)) { log_error("node address \"%s\" too long", addr_string); goto out; } node = booth_conf->node+booth_conf->node_count; node->family = BOOTH_PROTO_FAMILY; node->type = type; node->nodeid = booth_conf->node_count; strcpy(node->addr_string, addr_string); node->tcp_fd = -1; booth_conf->node_count++; + rv = 0; memset(&node->sa6, 0, sizeof(node->sa6)); - if (node->family == AF_INET) { - if (inet_pton(AF_INET, - node->addr_string, - &node->sa4.sin_addr) < 0) - goto addr_bad; + if (inet_pton(AF_INET, + node->addr_string, + &node->sa4.sin_addr) > 0) { + + node->family = AF_INET; node->sa4.sin_family = node->family; node->sa4.sin_port = htons(booth_conf->port); node->saddrlen = sizeof(node->sa4); node->addrlen = sizeof(node->sa4.sin_addr); - } else if (node->family == AF_INET6) { - if (inet_pton(AF_INET6, - node->addr_string, - &node->sa6.sin6_addr) < 0) - goto addr_bad; + } else if (inet_pton(AF_INET6, + node->addr_string, + &node->sa6.sin6_addr) > 0) { + + node->family = AF_INET6; node->sa6.sin6_family = node->family; node->sa6.sin6_flowinfo = 0; node->sa6.sin6_port = htons(booth_conf->port); node->saddrlen = sizeof(node->sa6); node->addrlen = sizeof(node->sa6.sin6_addr); + } else { - log_error("invalid INET family"); - goto out; + log_error("Address string \"%s\" is bad", node->addr_string); + rv = EINVAL; } - - rv = 0; - out: return rv; - -addr_bad: - log_error("Address string \"%s\" is bad", node->addr_string); - goto out; } int read_config(const char *path) { char line[1024]; FILE *fp; char *s, *key, *val, *expiry, *weight, *c; const char *cp; int in_quotes, got_equals, got_quotes, i; int lineno = 0; int got_transport = 0; fp = fopen(path, "r"); if (!fp) { log_error("failed to open %s: %s", path, strerror(errno)); return -1; } booth_conf = malloc(sizeof(struct booth_config) + TICKET_ALLOC * sizeof(struct ticket_config)); if (!booth_conf) { log_error("failed to alloc memory for booth config"); return -ENOMEM; } memset(booth_conf, 0, sizeof(struct booth_config) + TICKET_ALLOC * sizeof(struct ticket_config)); ticket_size = TICKET_ALLOC; log_debug("reading config file %s", path); while (fgets(line, sizeof(line), fp)) { lineno++; s = line; while (*s == ' ') s++; if (*s == '#' || *s == '\n') continue; if (*s == '-' || *s == '.' || *s =='/' || *s == '+' || *s == '(' || *s == ')' || *s == ':' || *s == ',' || *s == '@' || *s == '=' || *s == '"') { log_error("invalid key name in config file " "('%c', line %d char %ld)", *s, lineno, (long)(s - line)); goto out; } key = s; /* will point to the key on the left hand side */ val = NULL; /* will point to the value on the right hand side */ in_quotes = 0; /* true iff we're inside a double-quoted string */ got_equals = 0; /* true iff we're on the RHS of the = assignment */ got_quotes = 0; /* true iff the RHS is quoted */ while (*s != '\n' && *s != '\0') { if (!(*s >='a' && *s <= 'z') && !(*s >= 'A' && *s <= 'Z') && !(*s >= '0' && *s <= '9') && !(*s == '_') && !(*s == '-') && !(*s == '.') && !(*s == '/') && !(*s == ' ') && !(*s == '+') && !(*s == '(') && !(*s == ')') && !(*s == ':') && !(*s == ';') && !(*s == ',') && !(*s == '@') && !(*s == '=') && !(*s == '"')) { log_error("invalid character ('%c', line %d char %ld)" " in config file", *s, lineno, (long)(s - line)); goto out; } if (*s == '=' && !got_equals) { got_equals = 1; *s = '\0'; val = s + 1; } else if ((*s == '=' || *s == '_' || *s == '-' || *s == '.') && got_equals && !in_quotes) { log_error("invalid config file format: unquoted '%c' " "(line %d char %ld)", *s, lineno, (long)(s - line)); goto out; } else if ((*s == '/' || *s == '+' || *s == '(' || *s == ')' || *s == ':' || *s == ',' || *s == '@') && !in_quotes) { log_error("invalid config file format: unquoted '%c' " "(line %d char %ld)", *s, lineno, (long)(s - line)); goto out; } else if ((*s == ' ') && !in_quotes && !got_quotes) { log_error("invalid config file format: unquoted whitespace " "(line %d char %ld)", lineno, (long)(s - line)); goto out; } else if (*s == '"' && !got_equals) { log_error("invalid config file format: unexpected quotes " "(line %d char %ld)", lineno, (long)(s - line)); goto out; } else if (*s == '"' && !in_quotes) { in_quotes = 1; if (val) { val++; got_quotes = 1; } } else if (*s == '"' && in_quotes) { in_quotes = 0; *s = '\0'; } s++; } if (!got_equals) { log_error("invalid config file format: missing '=' (lineno %d)", lineno); goto out; } if (in_quotes) { log_error("invalid config file format: unterminated quotes (lineno %d)", lineno); goto out; } if (!got_quotes) *s = '\0'; if (strlen(key) > BOOTH_NAME_LEN || strlen(val) > BOOTH_NAME_LEN) { log_error("key/value too long"); goto out; } if (!strcmp(key, "transport")) { if (!strcmp(val, "UDP")) booth_conf->proto = UDP; else if (!strcmp(val, "SCTP")) booth_conf->proto = SCTP; else { log_error("invalid transport protocol"); goto out; } got_transport = 1; } if (!strcmp(key, "port")) booth_conf->port = atoi(val); if (!strcmp(key, "name")) { if(strlen(val)+1 >= BOOTH_NAME_LEN) { log_error("Config name too long."); goto out; } } if (!strcmp(key, "site")) { if (add_node(val, SITE)) goto out; } if (!strcmp(key, "arbitrator")) { if (add_node(val, ARBITRATOR)) goto out; } if (!strcmp(key, "ticket")) { int count = booth_conf->ticket_count; if (booth_conf->ticket_count == ticket_size) { if (ticket_realloc() < 0) goto out; } expiry = index(val, ';'); weight = rindex(val, ';'); if (!expiry) { strcpy(booth_conf->ticket[count].name, val); booth_conf->ticket[count].expiry = DEFAULT_TICKET_EXPIRY; log_info("expire is not set in %s." " Set the default value %ds.", booth_conf->ticket[count].name, DEFAULT_TICKET_EXPIRY); } else if (expiry && expiry == weight) { *expiry++ = '\0'; while (*expiry == ' ') expiry++; strcpy(booth_conf->ticket[count].name, val); booth_conf->ticket[count].expiry = atoi(expiry); } else { *expiry++ = '\0'; *weight++ = '\0'; while (*expiry == ' ') expiry++; while (*weight == ' ') weight++; strcpy(booth_conf->ticket[count].name, val); booth_conf->ticket[count].expiry = atoi(expiry); i = 0; while ((c = index(weight, ','))) { *c++ = '\0'; booth_conf->ticket[count].weight[i++] = atoi(weight); while (*c == ' ') c++; weight = c; if (i == MAX_NODES) { log_error("too many weights"); break; } } } booth_conf->ticket_count++; } } if (!got_transport) { log_error("config file was missing transport line"); goto out; } /* Default: make config name match config filename. */ if (!booth_conf->name[0]) { cp = strrchr(path, '/'); if (!cp) cp = path; /* TODO: locale? */ /* NUL-termination by memset. */ for(i=0; iname[i] = *(cp++); /* Last resort. */ if (!booth_conf->name[0]) strcpy(booth_conf->name, "booth"); } return 0; out: free(booth_conf); booth_conf = NULL; return -1; } int check_config(int type) { // int i; if (!booth_conf) return -1; /* for (i = 0; i < booth_conf->node_count; i++) { if (booth_conf->node[i].local && booth_conf->node[i].type == type) return 0; } return -1;*/ return 0; } int find_site_in_config(unsigned char *site, struct booth_node **node) { struct booth_node *n; int i; if (!booth_conf) return 0; for (i = 0; i < booth_conf->node_count; i++) { n = booth_conf->node + i; if (n->type == SITE && strcmp(n->addr_string, site) == 0) { *node = n; return 1; } } return 0; } const char *type_to_string(int type) { switch (type) { case ARBITRATOR: return "arbitrator"; case SITE: return "site"; case CLIENT: return "client"; } return "??invalid-type??"; }