busybox/udhcp
1
0
Fork 0
mirror of https://git.busybox.net/udhcp synced 2025-05-09 14:21:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

some cleanups, sanity stuff, etc

Browse Source
This commit is contained in:
Russ Dill 2003-12-16 01:38:51 +00:00
parent 195c5f1b8e
commit f6e6a8c6b0
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
files.c
View File

@ -19,7 +19,7 @@
#include "leases.h" #include "leases.h"
/* on these functions, make sure you datatype matches */ /* on these functions, make sure you datatype matches */
static int read_ip(char *line, void *arg) static int read_ip(const char *line, void *arg)
{ {
struct in_addr *addr = arg; struct in_addr *addr = arg;
struct hostent *host; struct hostent *host;
@ -34,7 +34,7 @@ static int read_ip(char *line, void *arg)
} }
static int read_str(char *line, void *arg) static int read_str(const char *line, void *arg)
{ {
char **dest = arg; char **dest = arg;
@ -45,7 +45,7 @@ static int read_str(char *line, void *arg)
} }
static int read_u32(char *line, void *arg) static int read_u32(const char *line, void *arg)
{ {
u_int32_t *dest = arg; u_int32_t *dest = arg;
char *endptr; char *endptr;
@ -54,7 +54,7 @@ static int read_u32(char *line, void *arg)
} }
static int read_yn(char *line, void *arg) static int read_yn(const char *line, void *arg)
{ {
char *dest = arg; char *dest = arg;
int retval = 1; int retval = 1;
@ -174,14 +174,14 @@ static struct config_keyword keywords[] = {
}; };
int read_config(char *file) int read_config(const char *file)
{ {
FILE *in; FILE *in;
char buffer[80], orig[80], *token, *line; char buffer[80], orig[80], *token, *line;
int i; int i;
for (i = 0; strlen(keywords[i].keyword); i++) for (i = 0; keywords[i].keyword[0]; i++)
if (strlen(keywords[i].def)) if (keywords[i].def[0])
keywords[i].handler(keywords[i].def, keywords[i].var); keywords[i].handler(keywords[i].def, keywords[i].var);
if (!(in = fopen(file, "r"))) { if (!(in = fopen(file, "r"))) {
@ -206,7 +206,7 @@ int read_config(char *file)
for (i = strlen(line); i > 0 && isspace(line[i - 1]); i--); for (i = strlen(line); i > 0 && isspace(line[i - 1]); i--);
line[i] = '\0'; line[i] = '\0';
for (i = 0; strlen(keywords[i].keyword); i++) for (i = 0; keywords[i].keyword[0]; i++)
if (!strcasecmp(token, keywords[i].keyword)) if (!strcasecmp(token, keywords[i].keyword))
if (!keywords[i].handler(line, keywords[i].var)) { if (!keywords[i].handler(line, keywords[i].var)) {
LOG(LOG_ERR, "unable to parse '%s'", orig); LOG(LOG_ERR, "unable to parse '%s'", orig);
@ -225,7 +225,7 @@ void write_leases(void)
unsigned int i; unsigned int i;
char buf[255]; char buf[255];
time_t curr = time(0); time_t curr = time(0);
unsigned long lease_time; unsigned long tmp_time;
if (!(fp = fopen(server_config.lease_file, "w"))) { if (!(fp = fopen(server_config.lease_file, "w"))) {
LOG(LOG_ERR, "Unable to open %s for writing", server_config.lease_file); LOG(LOG_ERR, "Unable to open %s for writing", server_config.lease_file);
@ -234,15 +234,20 @@ void write_leases(void)
for (i = 0; i < server_config.max_leases; i++) { for (i = 0; i < server_config.max_leases; i++) {
if (leases[i].yiaddr != 0) { 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 (server_config.remaining) {
if (lease_expired(&(leases[i]))) if (lease_expired(&(leases[i])))
lease_time = 0; leases[i].expires = 0;
else lease_time = leases[i].expires - curr; else leases[i].expires -= curr;
} else lease_time = leases[i].expires; } /* else stick with the time we got */
lease_time = htonl(lease_time); leases[i].expires = htonl(leases[i].expires);
fwrite(leases[i].chaddr, 16, 1, fp); fwrite(&leases[i], sizeof(struct dhcpOfferedAddr), 1, fp);
fwrite(&(leases[i].yiaddr), 4, 1, fp);
fwrite(&lease_time, 4, 1, fp); /* Then restore it when done. */
leases[i].expires = tmp_time;
} }
} }
fclose(fp); fclose(fp);
@ -254,7 +259,7 @@ void write_leases(void)
} }
void read_leases(char *file) void read_leases(const char *file)
{ {
FILE *fp; FILE *fp;
unsigned int i = 0; unsigned int i = 0;
@ -280,5 +285,3 @@ void read_leases(char *file)
DEBUG(LOG_INFO, "Read %d leases", i); DEBUG(LOG_INFO, "Read %d leases", i);
fclose(fp); fclose(fp);
} }