mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-30 22:05:23 +00:00
Code Issues Releases Wiki Activity

Support 'never' as a possible lease expiry time.

Browse Source
This commit is contained in:
Ted Lemon
1999-09-08 01:47:46 +00:00
parent 4fe74d7268
commit be1ee858db
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/conflex.c
View File

@@ -22,7 +22,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: conflex.c,v 1.52 1999/08/01 14:26:48 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; "$Id: conflex.c,v 1.53 1999/09/08 01:45:34 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -495,6 +495,8 @@ static enum dhcp_token intern (atom, dfv)
case 'i': case 'i':
if (!strcasecmp (atom + 1, "nteger")) if (!strcasecmp (atom + 1, "nteger"))
return INTEGER; return INTEGER;
if (!strcasecmp (atom + 1, "nfinite"))
return INFINITE;
if (!strcasecmp (atom + 1, "p-address")) if (!strcasecmp (atom + 1, "p-address"))
return IP_ADDRESS; return IP_ADDRESS;
if (!strcasecmp (atom + 1, "nitial-interval")) if (!strcasecmp (atom + 1, "nitial-interval"))
@@ -557,6 +559,8 @@ static enum dhcp_token intern (atom, dfv)
return NAMESERVER; return NAMESERVER;
if (!strcasecmp (atom + 1, "etmask")) if (!strcasecmp (atom + 1, "etmask"))
return NETMASK; return NETMASK;
if (!strcasecmp (atom + 1, "ever"))
return NEVER;
if (!strcasecmp (atom + 1, "ext-server")) if (!strcasecmp (atom + 1, "ext-server"))
return NEXT_SERVER; return NEXT_SERVER;
if (!strcasecmp (atom + 1, "ot")) if (!strcasecmp (atom + 1, "ot"))

11
common/parse.c
View File

@@ -22,7 +22,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: parse.c,v 1.36 1999/08/01 14:26:49 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; "$Id: parse.c,v 1.37 1999/09/08 01:45:29 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -536,6 +536,7 @@ void convert_num (buf, str, base, size)
* NUMBER COLON NUMBER COLON NUMBER SEMI | * NUMBER COLON NUMBER COLON NUMBER SEMI |
* NUMBER NUMBER SLASH NUMBER SLASH NUMBER * NUMBER NUMBER SLASH NUMBER SLASH NUMBER
* NUMBER COLON NUMBER COLON NUMBER NUMBER SEMI | * NUMBER COLON NUMBER COLON NUMBER NUMBER SEMI |
* NEVER
* *
* Dates are stored in GMT or with a timezone offset; first number is day * Dates are stored in GMT or with a timezone offset; first number is day
* of week; next is year/month/day; next is hours:minutes:seconds on a * of week; next is year/month/day; next is hours:minutes:seconds on a
@@ -554,8 +555,14 @@ TIME parse_date (cfile)
static int months [11] = { 31, 59, 90, 120, 151, 181, static int months [11] = { 31, 59, 90, 120, 151, 181,
212, 243, 273, 304, 334 }; 212, 243, 273, 304, 334 };
/* Day of week... */ /* Day of week, or "never"... */
token = next_token (&val, cfile); token = next_token (&val, cfile);
if (token == NEVER) {
if (!parse_semi (cfile))
return 0;
return MAX_TIME;
}
if (token != NUMBER) { if (token != NUMBER) {
parse_warn ("numeric day of week expected."); parse_warn ("numeric day of week expected.");
if (token != SEMI) if (token != SEMI)

2
includes/dhctoken.h
View File

@@ -194,6 +194,8 @@ enum dhcp_token {
DNS_UPDATE = 412, DNS_UPDATE = 412,
LEASE_TIME = 413, LEASE_TIME = 413,
STATIC = 414, STATIC = 414,
NEVER = 415,
INFINITE = 416,
}; };
#define is_identifier(x) ((x) >= FIRST_TOKEN && \ #define is_identifier(x) ((x) >= FIRST_TOKEN && \