From: Ted Lemon <source@isc.org>
Date: Fri, 20 Apr 2001 18:07:29 +0000 (+0000)
Subject: Add recover_wait state goo.
X-Git-Tag: V3-RC2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3417f5cf6a64190833889884a8ffbb25981a49b9;p=thirdparty%2Fdhcp.git

Add recover_wait state goo.
---

diff --git a/common/conflex.c b/common/conflex.c
index 26ca7462d..aa65e4178 100644
--- a/common/conflex.c
+++ b/common/conflex.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: conflex.c,v 1.90 2001/03/17 00:47:32 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: conflex.c,v 1.91 2001/04/20 18:07:25 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -888,6 +888,8 @@ static enum dhcp_token intern (atom, dfv)
 			return RECOVER;
 		if (!strcasecmp (atom + 1, "ecover-done"))
 			return RECOVER_DONE;
+		if (!strcasecmp (atom + 1, "ecover-wait"))
+			return RECOVER_WAIT;
 		if (!strcasecmp (atom + 1, "econtact-interval"))
 			return RECONTACT_INTERVAL;
 		if (!strcasecmp (atom + 1, "equest"))
diff --git a/includes/dhctoken.h b/includes/dhctoken.h
index 7fb9c7538..bc3736e54 100644
--- a/includes/dhctoken.h
+++ b/includes/dhctoken.h
@@ -309,7 +309,8 @@ enum dhcp_token {
 	TOKEN_CREATE = 604,
 	TOKEN_OPEN = 605,
 	TOKEN_HELP = 606,
-	END_OF_FILE = 607
+	END_OF_FILE = 607,
+	RECOVER_WAIT = 608
 };
 
 #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\
diff --git a/includes/failover.h b/includes/failover.h
index fbd9bedd9..9c7bd8138 100644
--- a/includes/failover.h
+++ b/includes/failover.h
@@ -239,7 +239,8 @@ enum failover_state {
 	recover_done,
 	shut_down,
 	paused,
-	startup
+	startup,
+	recover_wait
 };
 
 /* Service states are simplifications of failover states, particularly
diff --git a/server/confpars.c b/server/confpars.c
index 68010d29e..d9cd14d5f 100644
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: confpars.c,v 1.139 2001/04/16 22:25:04 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: confpars.c,v 1.140 2001/04/20 18:07:29 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1126,6 +1126,10 @@ void parse_failover_state (cfile, state, stos)
 		state_in = recover;
 		break;
 		
+	      case RECOVER_WAIT:
+		state_in = recover_wait;
+		break;
+		
 	      case RECOVER_DONE:
 		state_in = recover_done;
 		break;