X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fudhcp%2Ffiles.c;h=a061a9c9bb469e0ef91c370c3b7e1dd2d4edfc19;hb=ddbf3bf35ffd70e7105f4cf8fe8aa81b3c7667e2;hp=b7bad3309a0d716f6e386afabfc17a801af77796;hpb=f1980f67d3b005090a31b7465d219e8ca19c5736;p=oweals%2Fbusybox.git diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c index b7bad3309..a061a9c9b 100644 --- a/networking/udhcp/files.c +++ b/networking/udhcp/files.c @@ -2,6 +2,8 @@ /* * files.c -- DHCP server file manipulation * * Rewrite by Russ Dill July 2001 + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include @@ -10,6 +12,16 @@ #include "dhcpd.h" #include "options.h" +#if BB_LITTLE_ENDIAN +static inline uint64_t hton64(uint64_t v) +{ + return (((uint64_t)htonl(v)) << 32) | htonl(v >> 32); +} +#else +#define hton64(v) (v) +#endif +#define ntoh64(v) hton64(v) + /* on these functions, make sure your datatype matches */ static int read_ip(const char *line, void *arg) @@ -24,14 +36,10 @@ static int read_ip(const char *line, void *arg) return 1; } + static int read_mac(const char *line, void *arg) { - struct ether_addr *temp_ether_addr; - - temp_ether_addr = ether_aton_r(line, (struct ether_addr *)arg); - if (temp_ether_addr == NULL) - return 0; - return 1; + return NULL == ether_aton_r(line, (struct ether_addr *)arg); } @@ -90,7 +98,7 @@ static void attach_option(struct option_set **opt_list, if (!existing) { DEBUG("Attaching option %02x to list", option->code); -#if ENABLE_FEATURE_RFC3397 +#if ENABLE_FEATURE_UDHCP_RFC3397 if ((option->flags & TYPE_MASK) == OPTION_STR1035) /* reuse buffer and length for RFC1035-formatted string */ buffer = (char *)dname_enc(NULL, 0, buffer, &length); @@ -109,7 +117,7 @@ static void attach_option(struct option_set **opt_list, new->next = *curr; *curr = new; -#if ENABLE_FEATURE_RFC3397 +#if ENABLE_FEATURE_UDHCP_RFC3397 if ((option->flags & TYPE_MASK) == OPTION_STR1035 && buffer != NULL) free(buffer); #endif @@ -119,7 +127,7 @@ static void attach_option(struct option_set **opt_list, /* 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 ENABLE_FEATURE_UDHCP_RFC3397 if ((option->flags & TYPE_MASK) == OPTION_STR1035) /* reuse buffer and length for RFC1035-formatted string */ buffer = (char *)dname_enc(existing->data + 2, @@ -139,7 +147,7 @@ static void attach_option(struct option_set **opt_list, 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 ENABLE_FEATURE_UDHCP_RFC3397 if ((option->flags & TYPE_MASK) == OPTION_STR1035 && buffer != NULL) free(buffer); #endif @@ -190,7 +198,7 @@ static int read_opt(const char *const_line, void *arg) retval = read_ip(val, buffer + 4); break; case OPTION_STRING: -#if ENABLE_FEATURE_RFC3397 +#if ENABLE_FEATURE_UDHCP_RFC3397 case OPTION_STR1035: #endif length = strlen(val); @@ -248,25 +256,21 @@ static int read_staticlease(const char *const_line, void *arg) char *line; char *mac_string; char *ip_string; - uint8_t *mac_bytes; - uint32_t *ip; - - /* Allocate memory for addresses */ - mac_bytes = xmalloc(sizeof(unsigned char) * 8); - ip = xmalloc(sizeof(uint32_t)); + struct ether_addr mac_bytes; + uint32_t ip; /* Read mac */ line = (char *) const_line; - mac_string = strtok(line, " \t"); - read_mac(mac_string, mac_bytes); + mac_string = strtok_r(line, " \t", &line); + read_mac(mac_string, &mac_bytes); /* Read ip */ - ip_string = strtok(NULL, " \t"); - read_ip(ip_string, ip); + ip_string = strtok_r(NULL, " \t", &line); + read_ip(ip_string, &ip); - addStaticLease(arg, mac_bytes, ip); + addStaticLease(arg, (uint8_t*) &mac_bytes, ip); - if (ENABLE_FEATURE_UDHCP_DEBUG) printStaticLeases(arg); + if (ENABLE_UDHCP_DEBUG) printStaticLeases(arg); return 1; } @@ -287,7 +291,7 @@ static const struct config_keyword keywords[] = { /* 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"}, +// {"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"}, @@ -303,7 +307,6 @@ static const struct config_keyword keywords[] = { {"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 }; @@ -340,36 +343,42 @@ void FAST_FUNC read_config(const char *file) void FAST_FUNC write_leases(void) { - int fp; + int fd; unsigned i; - time_t curr = time(0); - unsigned long tmp_time; + leasetime_t curr; + int64_t written_at; - fp = open_or_warn(server_config.lease_file, O_WRONLY|O_CREAT|O_TRUNC); - if (fp < 0) { + fd = open_or_warn(server_config.lease_file, O_WRONLY|O_CREAT|O_TRUNC); + if (fd < 0) return; - } + + curr = written_at = time(NULL); + + written_at = hton64(written_at); + full_write(fd, &written_at, sizeof(written_at)); for (i = 0; i < server_config.max_leases; i++) { - if (leases[i].yiaddr != 0) { - - /* screw with the time in the struct, for easier writing */ - tmp_time = leases[i].expires; - - if (server_config.remaining) { - if (lease_expired(&(leases[i]))) - leases[i].expires = 0; - else leases[i].expires -= curr; - } /* else stick with the time we got */ - leases[i].expires = htonl(leases[i].expires); - // FIXME: error check?? - full_write(fp, &leases[i], sizeof(leases[i])); - - /* then restore it when done */ - leases[i].expires = tmp_time; - } + leasetime_t tmp_time; + + if (leases[i].yiaddr == 0) + continue; + + /* Screw with the time in the struct, for easier writing */ + tmp_time = leases[i].expires; + + leases[i].expires -= curr; + if ((signed_leasetime_t) leases[i].expires < 0) + leases[i].expires = 0; + leases[i].expires = htonl(leases[i].expires); + + /* No error check. If the file gets truncated, + * we lose some leases on restart. Oh well. */ + full_write(fd, &leases[i], sizeof(leases[i])); + + /* Then restore it when done */ + leases[i].expires = tmp_time; } - close(fp); + close(fd); if (server_config.notify_file) { // TODO: vfork-based child creation @@ -382,32 +391,43 @@ void FAST_FUNC write_leases(void) void FAST_FUNC read_leases(const char *file) { - int fp; - unsigned i; struct dhcpOfferedAddr lease; + int64_t written_at, time_passed; + int fd; + USE_UDHCP_DEBUG(unsigned i;) - fp = open_or_warn(file, O_RDONLY); - if (fp < 0) { + fd = open_or_warn(file, O_RDONLY); + if (fd < 0) return; - } - i = 0; - while (i < server_config.max_leases - && full_read(fp, &lease, sizeof(lease)) == sizeof(lease) - ) { - /* ADDME: is it a static lease */ + if (full_read(fd, &written_at, sizeof(written_at)) != sizeof(written_at)) + goto ret; + written_at = ntoh64(written_at); + + time_passed = time(NULL) - written_at; + /* Strange written_at, or lease file from old version of udhcpd + * which had no "written_at" field? */ + if ((uint64_t)time_passed > 12 * 60 * 60) + goto ret; + + USE_UDHCP_DEBUG(i = 0;) + while (full_read(fd, &lease, sizeof(lease)) == sizeof(lease)) { + /* ADDME: what if it matches some static lease? */ 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(NULL); - if (!(add_lease(lease.chaddr, lease.yiaddr, lease.expires))) { + signed_leasetime_t expires = ntohl(lease.expires) - (signed_leasetime_t)time_passed; + if (expires <= 0) + continue; + /* NB: add_lease takes "relative time", IOW, + * lease duration, not lease deadline. */ + if (!(add_lease(lease.chaddr, lease.yiaddr, expires, lease.hostname))) { bb_error_msg("too many leases while loading %s", file); break; } - i++; + USE_UDHCP_DEBUG(i++;) } } DEBUG("Read %d leases", i); - close(fp); + ret: + close(fd); }