X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fudhcp%2Ffiles.c;h=6a93bd0e212609d8efd016ce3d58f8b6a4ac3d87;hb=95891fc016c9911406cb826540873f0894bcbe8b;hp=9ade4ae6d1c9c4bb4e2991b834f7b08b1bba9152;hpb=4ebaf1074218d4e1c2907114bc53080c5abbd57d;p=oweals%2Fbusybox.git diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c index 9ade4ae6d..6a93bd0e2 100644 --- a/networking/udhcp/files.c +++ b/networking/udhcp/files.c @@ -11,43 +11,29 @@ #include "options.h" -/* - * Domain names may have 254 chars, and string options can be 254 - * chars long. However, 80 bytes will be enough for most, and won't - * hog up memory. If you have a special application, change it - */ -#define READ_CONFIG_BUF_SIZE 80 - -/* on these functions, make sure you datatype matches */ +/* on these functions, make sure your datatype matches */ static int read_ip(const char *line, void *arg) { - struct in_addr *addr = arg; - struct hostent *host; - int retval = 1; - - if (!inet_aton(line, addr)) { - host = gethostbyname(line); - if (host) - addr->s_addr = *((unsigned long *) host->h_addr_list[0]); - else retval = 0; - } - return retval; + len_and_sockaddr *lsa; + + lsa = host_and_af2sockaddr(line, 0, AF_INET); + if (!lsa) + return 0; + *(uint32_t*)arg = lsa->u.sin.sin_addr.s_addr; + free(lsa); + return 1; } static int read_mac(const char *line, void *arg) { uint8_t *mac_bytes = arg; struct ether_addr *temp_ether_addr; - int retval = 1; temp_ether_addr = ether_aton(line); - if (temp_ether_addr == NULL) - retval = 0; - else - memcpy(mac_bytes, temp_ether_addr, 6); - - return retval; + return 0; + memcpy(mac_bytes, temp_ether_addr, 6); + return 1; } @@ -57,14 +43,13 @@ static int read_str(const char *line, void *arg) free(*dest); *dest = xstrdup(line); - return 1; } static int read_u32(const char *line, void *arg) { - *((uint32_t*)arg) = bb_strtou32(line, NULL, 10); + *(uint32_t*)arg = bb_strtou32(line, NULL, 10); return errno == 0; } @@ -72,26 +57,28 @@ static int read_u32(const char *line, void *arg) static int read_yn(const char *line, void *arg) { char *dest = arg; - int retval = 1; - if (!strcasecmp("yes", line)) + if (!strcasecmp("yes", line)) { *dest = 1; - else if (!strcasecmp("no", line)) + return 1; + } + if (!strcasecmp("no", line)) { *dest = 0; - else retval = 0; - - return retval; + return 1; + } + return 0; } /* find option 'code' in opt_list */ -struct option_set *find_option(struct option_set *opt_list, char code) +struct option_set *find_option(struct option_set *opt_list, uint8_t code) { while (opt_list && opt_list->data[OPT_CODE] < code) opt_list = opt_list->next; - if (opt_list && opt_list->data[OPT_CODE] == code) return opt_list; - else return NULL; + if (opt_list && opt_list->data[OPT_CODE] == code) + return opt_list; + return NULL; } @@ -101,23 +88,18 @@ static void attach_option(struct option_set **opt_list, { struct option_set *existing, *new, **curr; - /* add it to an existing option */ existing = find_option(*opt_list, option->code); - if (existing) { - DEBUG("Attaching option %s to existing member of list", option->name); - if (option->flags & OPTION_LIST) { - if (existing->data[OPT_LEN] + length <= 255) { - existing->data = realloc(existing->data, - existing->data[OPT_LEN] + length + 2); - memcpy(existing->data + existing->data[OPT_LEN] + 2, buffer, length); - existing->data[OPT_LEN] += length; - } /* else, ignore the data, we could put this in a second option in the future */ - } /* else, ignore the new data */ - } else { - DEBUG("Attaching option %s to list", option->name); + if (!existing) { + DEBUG("Attaching option %02x to list", option->code); + +#if ENABLE_FEATURE_RFC3397 + if ((option->flags & TYPE_MASK) == OPTION_STR1035) + /* reuse buffer and length for RFC1035-formatted string */ + buffer = dname_enc(NULL, 0, buffer, &length); +#endif /* make a new option */ - new = xmalloc(sizeof(struct option_set)); + new = xmalloc(sizeof(*new)); new->data = xmalloc(length + 2); new->data[OPT_CODE] = option->code; new->data[OPT_LEN] = length; @@ -129,7 +111,41 @@ static void attach_option(struct option_set **opt_list, new->next = *curr; *curr = new; +#if ENABLE_FEATURE_RFC3397 + if ((option->flags & TYPE_MASK) == OPTION_STR1035 && buffer != NULL) + free(buffer); +#endif + return; } + + /* add it to an existing option */ + DEBUG("Attaching option %02x to existing member of list", option->code); + if (option->flags & OPTION_LIST) { +#if ENABLE_FEATURE_RFC3397 + if ((option->flags & TYPE_MASK) == OPTION_STR1035) + /* reuse buffer and length for RFC1035-formatted string */ + buffer = dname_enc(existing->data + 2, + existing->data[OPT_LEN], buffer, &length); +#endif + if (existing->data[OPT_LEN] + length <= 255) { + existing->data = xrealloc(existing->data, + existing->data[OPT_LEN] + length + 3); + if ((option->flags & TYPE_MASK) == OPTION_STRING) { + /* ' ' can bring us to 256 - bad */ + if (existing->data[OPT_LEN] + length >= 255) + return; + /* add space separator between STRING options in a list */ + existing->data[existing->data[OPT_LEN] + 2] = ' '; + existing->data[OPT_LEN]++; + } + memcpy(existing->data + existing->data[OPT_LEN] + 2, buffer, length); + existing->data[OPT_LEN] += length; + } /* else, ignore the data, we could put this in a second option in the future */ +#if ENABLE_FEATURE_RFC3397 + if ((option->flags & TYPE_MASK) == OPTION_STR1035 && buffer != NULL) + free(buffer); +#endif + } /* else, ignore the new data */ } @@ -138,31 +154,29 @@ static int read_opt(const char *const_line, void *arg) { struct option_set **opt_list = arg; char *opt, *val, *endptr; - const struct dhcp_option *option; - int retval = 0, length; - char buffer[8]; char *line; + const struct dhcp_option *option; + int retval, length, idx; + char buffer[8] __attribute__((aligned(4))); uint16_t *result_u16 = (uint16_t *) buffer; uint32_t *result_u32 = (uint32_t *) buffer; /* Cheat, the only const line we'll actually get is "" */ line = (char *) const_line; opt = strtok(line, " \t="); - if (!opt) return 0; + if (!opt) + return 0; - option = dhcp_options; - while (1) { - if (!option->code) - return 0; - if (!strcasecmp(option->name, opt)) - break; - option++; - } + idx = index_in_strings(dhcp_option_strings, opt); /* NB: was strcasecmp! */ + if (idx < 0) + return 0; + option = &dhcp_options[idx]; + retval = 0; do { val = strtok(NULL, ", \t"); if (!val) break; - length = option_lengths[option->flags & TYPE_MASK]; + length = dhcp_option_lengths[option->flags & TYPE_MASK]; retval = 0; opt = buffer; /* new meaning for variable opt */ switch (option->flags & TYPE_MASK) { @@ -171,10 +185,16 @@ static int read_opt(const char *const_line, void *arg) break; case OPTION_IP_PAIR: retval = read_ip(val, buffer); - if (!(val = strtok(NULL, ", \t/-"))) retval = 0; - if (retval) retval = read_ip(val, buffer + 4); + val = strtok(NULL, ", \t/-"); + if (!val) + retval = 0; + if (retval) + retval = read_ip(val, buffer + 4); break; case OPTION_STRING: +#if ENABLE_FEATURE_RFC3397 + case OPTION_STR1035: +#endif length = strlen(val); if (length > 0) { if (length > 254) length = 254; @@ -189,22 +209,33 @@ static int read_opt(const char *const_line, void *arg) buffer[0] = strtoul(val, &endptr, 0); retval = (endptr[0] == '\0'); break; - case OPTION_U16: - *result_u16 = htons(strtoul(val, &endptr, 0)); - retval = (endptr[0] == '\0'); + /* htonX are macros in older libc's, using temp var + * in code below for safety */ + /* TODO: use bb_strtoX? */ + case OPTION_U16: { + unsigned long tmp = strtoul(val, &endptr, 0); + *result_u16 = htons(tmp); + retval = (endptr[0] == '\0' /*&& tmp < 0x10000*/); break; - case OPTION_S16: - *result_u16 = htons(strtol(val, &endptr, 0)); + } + case OPTION_S16: { + long tmp = strtol(val, &endptr, 0); + *result_u16 = htons(tmp); retval = (endptr[0] == '\0'); break; - case OPTION_U32: - *result_u32 = htonl(strtoul(val, &endptr, 0)); + } + case OPTION_U32: { + unsigned long tmp = strtoul(val, &endptr, 0); + *result_u32 = htonl(tmp); retval = (endptr[0] == '\0'); break; - case OPTION_S32: - *result_u32 = htonl(strtol(val, &endptr, 0)); + } + case OPTION_S32: { + long tmp = strtol(val, &endptr, 0); + *result_u32 = htonl(tmp); retval = (endptr[0] == '\0'); break; + } default: break; } @@ -222,7 +253,6 @@ static int read_staticlease(const char *const_line, void *arg) uint8_t *mac_bytes; uint32_t *ip; - /* Allocate memory for addresses */ mac_bytes = xmalloc(sizeof(unsigned char) * 8); ip = xmalloc(sizeof(uint32_t)); @@ -244,81 +274,91 @@ static int read_staticlease(const char *const_line, void *arg) } +struct config_keyword { + const char *keyword; + int (*handler)(const char *line, void *var); + void *var; + const char *def; +}; + static const struct config_keyword keywords[] = { - /* keyword handler variable address default */ - {"start", read_ip, &(server_config.start), "192.168.0.20"}, - {"end", read_ip, &(server_config.end), "192.168.0.254"}, - {"interface", read_str, &(server_config.interface), "eth0"}, - {"option", read_opt, &(server_config.options), ""}, - {"opt", read_opt, &(server_config.options), ""}, - {"max_leases", read_u32, &(server_config.max_leases), "254"}, - {"remaining", read_yn, &(server_config.remaining), "yes"}, - {"auto_time", read_u32, &(server_config.auto_time), "7200"}, - {"decline_time",read_u32, &(server_config.decline_time),"3600"}, - {"conflict_time",read_u32,&(server_config.conflict_time),"3600"}, - {"offer_time", read_u32, &(server_config.offer_time), "60"}, - {"min_lease", read_u32, &(server_config.min_lease), "60"}, - {"lease_file", read_str, &(server_config.lease_file), LEASES_FILE}, - {"pidfile", read_str, &(server_config.pidfile), "/var/run/udhcpd.pid"}, - {"notify_file", read_str, &(server_config.notify_file), ""}, - {"siaddr", read_ip, &(server_config.siaddr), "0.0.0.0"}, - {"sname", read_str, &(server_config.sname), ""}, - {"boot_file", read_str, &(server_config.boot_file), ""}, - {"static_lease",read_staticlease, &(server_config.static_leases), ""}, - /*ADDME: static lease */ - {"", NULL, NULL, ""} + /* keyword handler variable address default */ + {"start", read_ip, &(server_config.start_ip), "192.168.0.20"}, + {"end", read_ip, &(server_config.end_ip), "192.168.0.254"}, + {"interface", read_str, &(server_config.interface), "eth0"}, + /* Avoid "max_leases value not sane" warning by setting default + * to default_end_ip - default_start_ip + 1: */ + {"max_leases", read_u32, &(server_config.max_leases), "235"}, + {"remaining", read_yn, &(server_config.remaining), "yes"}, + {"auto_time", read_u32, &(server_config.auto_time), "7200"}, + {"decline_time", read_u32, &(server_config.decline_time), "3600"}, + {"conflict_time",read_u32, &(server_config.conflict_time),"3600"}, + {"offer_time", read_u32, &(server_config.offer_time), "60"}, + {"min_lease", read_u32, &(server_config.min_lease), "60"}, + {"lease_file", read_str, &(server_config.lease_file), LEASES_FILE}, + {"pidfile", read_str, &(server_config.pidfile), "/var/run/udhcpd.pid"}, + {"siaddr", read_ip, &(server_config.siaddr), "0.0.0.0"}, + /* keywords with no defaults must be last! */ + {"option", read_opt, &(server_config.options), ""}, + {"opt", read_opt, &(server_config.options), ""}, + {"notify_file", read_str, &(server_config.notify_file), ""}, + {"sname", read_str, &(server_config.sname), ""}, + {"boot_file", read_str, &(server_config.boot_file), ""}, + {"static_lease", read_staticlease, &(server_config.static_leases), ""}, + /* ADDME: static lease */ }; +enum { KWS_WITH_DEFAULTS = ARRAY_SIZE(keywords) - 6 }; -int read_config(const char *file) +/* + * Domain names may have 254 chars, and string options can be 254 + * chars long. However, 80 bytes will be enough for most, and won't + * hog up memory. If you have a special application, change it + */ +#define READ_CONFIG_BUF_SIZE 80 + +void read_config(const char *file) { FILE *in; char buffer[READ_CONFIG_BUF_SIZE], *token, *line; - int i, lm = 0; + int i, lineno; - for (i = 0; keywords[i].keyword[0]; i++) - if (keywords[i].def[0]) - keywords[i].handler(keywords[i].def, keywords[i].var); + for (i = 0; i < KWS_WITH_DEFAULTS; i++) + keywords[i].handler(keywords[i].def, keywords[i].var); - in = fopen(file, "r"); - if (!in) { - bb_error_msg("cannot open config file: %s", file); - return 0; - } + in = fopen_or_warn(file, "r"); + if (!in) + return; + lineno = 0; while (fgets(buffer, READ_CONFIG_BUF_SIZE, in)) { - char debug_orig[READ_CONFIG_BUF_SIZE]; - char *p; - - lm++; - p = strchr(buffer, '\n'); - if (p) *p = '\0'; - if (ENABLE_FEATURE_UDHCP_DEBUG) strcpy(debug_orig, buffer); - p = strchr(buffer, '#'); - if (p) *p = '\0'; - - if (!(token = strtok(buffer, " \t"))) continue; - if (!(line = strtok(NULL, ""))) continue; - - /* eat leading whitespace */ - line = skip_whitespace(line); - /* eat trailing whitespace */ - i = strlen(line) - 1; - while (i >= 0 && isspace(line[i])) - line[i--] = '\0'; - - for (i = 0; keywords[i].keyword[0]; i++) - if (!strcasecmp(token, keywords[i].keyword)) + lineno++; + /* *strchrnul(buffer, '\n') = '\0'; - trim() will do it */ + *strchrnul(buffer, '#') = '\0'; + + token = strtok(buffer, " \t"); + if (!token) continue; + line = strtok(NULL, ""); + if (!line) continue; + + trim(line); /* remove leading/trailing whitespace */ + + for (i = 0; i < ARRAY_SIZE(keywords); i++) { + if (!strcasecmp(token, keywords[i].keyword)) { if (!keywords[i].handler(line, keywords[i].var)) { - bb_error_msg("cannot parse line %d of %s", lm, file); - if (ENABLE_FEATURE_UDHCP_DEBUG) - bb_error_msg("cannot parse '%s'", debug_orig); + bb_error_msg("can't parse line %d in %s at '%s'", + lineno, file, line); /* reset back to the default value */ keywords[i].handler(keywords[i].def, keywords[i].var); } + break; + } + } } fclose(in); - return 1; + + server_config.start_ip = ntohl(server_config.start_ip); + server_config.end_ip = ntohl(server_config.end_ip); } @@ -329,9 +369,8 @@ void write_leases(void) time_t curr = time(0); unsigned long tmp_time; - fp = open(server_config.lease_file, O_WRONLY|O_CREAT|O_TRUNC, 0666); + fp = open_or_warn(server_config.lease_file, O_WRONLY|O_CREAT|O_TRUNC); if (fp < 0) { - bb_error_msg("cannot open %s for writing", server_config.lease_file); return; } @@ -370,9 +409,8 @@ void read_leases(const char *file) unsigned int i = 0; struct dhcpOfferedAddr lease; - fp = open(file, O_RDONLY); + fp = open_or_warn(file, O_RDONLY); if (fp < 0) { - bb_error_msg("cannot open %s for reading", file); return; } @@ -380,9 +418,11 @@ void read_leases(const char *file) && full_read(fp, &lease, sizeof(lease)) == sizeof(lease) ) { /* ADDME: is it a static lease */ - if (lease.yiaddr >= server_config.start && lease.yiaddr <= server_config.end) { + uint32_t y = ntohl(lease.yiaddr); + if (y >= server_config.start_ip && y <= server_config.end_ip) { lease.expires = ntohl(lease.expires); - if (!server_config.remaining) lease.expires -= time(0); + if (!server_config.remaining) + lease.expires -= time(0); if (!(add_lease(lease.chaddr, lease.yiaddr, lease.expires))) { bb_error_msg("too many leases while loading %s", file); break;