From: Ted Lemon <source@isc.org>
Date: Wed, 3 May 2000 05:56:28 +0000 (+0000)
Subject: Add unknown-state and potential-conflict-nic
X-Git-Tag: V3-BETA-2-PATCH-1~210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=822e866add8cd66d366ba694a364484ec841d72a;p=thirdparty%2Fdhcp.git

Add unknown-state and potential-conflict-nic
---

diff --git a/common/conflex.c b/common/conflex.c
index a9df4cb4b..0d7bc89cf 100644
--- a/common/conflex.c
+++ b/common/conflex.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: conflex.c,v 1.72 2000/05/01 17:25:36 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: conflex.c,v 1.73 2000/05/03 05:56:28 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -813,6 +813,8 @@ static enum dhcp_token intern (atom, dfv)
 			return PORT;
 		if (!strcasecmp (atom + 1, "otential-conflict"))
 			return POTENTIAL_CONFLICT;
+		if (!strcasecmp (atom + 1, "otential-conflict-nic"))
+			return POTENTIAL_CONFLICT_NIC;
 		if (!strcasecmp (atom + 1, "ick-first-value") ||
 		    !strcasecmp (atom + 1, "ick"))
 			return PICK;
@@ -846,6 +848,8 @@ static enum dhcp_token intern (atom, dfv)
 			return NS_REFUSED;
 		break;
 	      case 's':
+		if (!strcasecmp (atom + 1, "tate"))
+			return STATE;
 		if (!strcasecmp (atom + 1, "ecret"))
 			return SECRET;
 		if (!strcasecmp (atom + 1, "ervfail"))
@@ -936,6 +940,8 @@ static enum dhcp_token intern (atom, dfv)
 		if (!strncasecmp (atom + 1, "nknown", 6)) {
 			if (!strcasecmp (atom + 7, "-clients"))
 				return UNKNOWN_CLIENTS;
+			if (!strcasecmp (atom + 7, "-state"))
+				return UNKNOWN_STATE;
 			if (!atom [7])
 				return UNKNOWN;
 			break;
diff --git a/includes/dhctoken.h b/includes/dhctoken.h
index 01cc67623..0fcfd0cd4 100644
--- a/includes/dhctoken.h
+++ b/includes/dhctoken.h
@@ -263,7 +263,10 @@ enum dhcp_token {
 	BALANCE = 461,
 	TOKEN_MAX = 462,
 	SECONDS = 463,
-	ADDRESS = 464
+	ADDRESS = 464,
+	POTENTIAL_CONFLICT_NIC = 465,
+	STATE = 466,
+	UNKNOWN_STATE = 567
 };
 
 #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\