emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sorry about all the noise, should be all synced up now

Browse Source
This commit is contained in:
Russ Dill
2002-12-11 21:40:46 +00:00
parent 920c1e8d6c
commit 9f4395c54e
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
networking/udhcp/ChangeLog
View File

@@ -1,3 +1,10 @@
0.9.9 (pending)
+ Added sanity check for max_leases (udhcp bug #1285) (me)
+ Finally got rid of the trailing space in enviromental vars (me)
+ added an new enviromental variable: $mask. It contains the number
of subnet bits for tools like ip route that require it.
(Bastian Blank <waldi@debian.org>, me)
0.9.8 (021031) 0.9.8 (021031)
+ split up README files (me) + split up README files (me)
+ use /dev/urandom to seed xid's (instead of time(0)) (me) + use /dev/urandom to seed xid's (instead of time(0)) (me)

11
networking/udhcp/dhcpd.c
View File

@@ -95,6 +95,7 @@ int main(int argc, char *argv[])
int pid_fd; int pid_fd;
int max_sock; int max_sock;
int sig; int sig;
unsigned long num_ips;
OPEN_LOG("udhcpd"); OPEN_LOG("udhcpd");
LOG(LOG_INFO, "udhcp server (v%s) started", VERSION); LOG(LOG_INFO, "udhcp server (v%s) started", VERSION);
@@ -114,7 +115,15 @@ int main(int argc, char *argv[])
} }
else server_config.lease = LEASE_TIME; else server_config.lease = LEASE_TIME;
leases = malloc(sizeof(struct dhcpOfferedAddr) * server_config.max_leases); /* Sanity check */
num_ips = ntohl(server_config.end) - ntohl(server_config.start);
if (server_config.max_leases > num_ips) {
LOG(LOG_ERR, "max_leases value (%lu) not sane, setting to %lu instead",
server_config.max_leases, num_ips);
server_config.max_leases = num_ips;
}
leases = xmalloc(sizeof(struct dhcpOfferedAddr) * server_config.max_leases);
memset(leases, 0, sizeof(struct dhcpOfferedAddr) * server_config.max_leases); memset(leases, 0, sizeof(struct dhcpOfferedAddr) * server_config.max_leases);
read_leases(server_config.lease_file); read_leases(server_config.lease_file);

4
networking/udhcp/options.c
View File

@@ -214,8 +214,8 @@ void attach_option(struct option_set **opt_list, struct dhcp_option *option, cha
DEBUG(LOG_INFO, "Attaching option %s to list", option->name); DEBUG(LOG_INFO, "Attaching option %s to list", option->name);
/* make a new option */ /* make a new option */
new = malloc(sizeof(struct option_set)); new = xmalloc(sizeof(struct option_set));
new->data = malloc(length + 2); new->data = xmalloc(length + 2);
new->data[OPT_CODE] = option->code; new->data[OPT_CODE] = option->code;
new->data[OPT_LEN] = length; new->data[OPT_LEN] = length;
memcpy(new->data + 2, buffer, length); memcpy(new->data + 2, buffer, length);