mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 06:15:55 +00:00
Code Issues Releases Wiki Activity

Update failover state keywords.

Browse Source
This commit is contained in:
Ted Lemon
2000-08-31 04:39:41 +00:00
parent 275082ddad
commit 058159169d
2 changed files with 54 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
server/confpars.c
View File

@@ -43,7 +43,7 @@
#ifndef lint
static char copyright[] =
"$Id: confpars.c,v 1.123 2000/08/24 18:46:31 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n";
"$Id: confpars.c,v 1.124 2000/08/31 04:39:41 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -584,12 +584,6 @@ int parse_statement (cfile, group, type, host_decl, declaration)
return declaration;
}
if (declaration) {
parse_warn (cfile,
"parameters not allowed after first declaration.");
return 1;
}
return 0;
}
@@ -610,8 +604,7 @@ void parse_failover_peer (cfile, group, type)
int i;
struct expression *expr;
isc_result_t status;
struct option_cache **paddr;
int *pport;
dhcp_failover_config_t *cp;
token = next_token (&val, cfile);
if (token != PEER) {
@@ -685,12 +678,14 @@ void parse_failover_peer (cfile, group, type)
peer -> name = name;
/* Set the initial state. */
peer -> my_state = potential_conflict;
peer -> my_stos = cur_time;
peer -> partner_state = unknown_state;
peer -> partner_stos = cur_time;
peer -> me.state = potential_conflict;
peer -> me.stos = cur_time;
peer -> partner.state = unknown_state;
peer -> partner.stos = cur_time;
do {
cp = &peer -> me;
peer:
token = next_token (&val, cfile);
switch (token) {
case RBRACE:
@@ -709,54 +704,33 @@ void parse_failover_peer (cfile, group, type)
break;
case PEER:
token = next_token (&val, cfile);
switch (token) {
case ADDRESS:
paddr = &peer -> address;
goto doaddr;
case PORT:
pport = &peer -> port;
goto doport;
default:
parse_warn (cfile,
"expecting 'address' or 'port'");
skip_to_rbrace (cfile, 1);
dhcp_failover_state_dereference (&peer, MDL);
return;
}
break;
cp = &peer -> partner;
goto peer;
case ADDRESS:
paddr = &peer -> server_addr;
doaddr:
expr = (struct expression *)0;
if (!parse_ip_addr_or_hostname (&expr, cfile, 0)) {
skip_to_rbrace (cfile, 1);
dhcp_failover_state_dereference (&peer, MDL);
return;
}
option_cache (paddr, (struct data_string *)0, expr,
option_cache (&cp -> address,
(struct data_string *)0, expr,
(struct option *)0);
expression_dereference (&expr, MDL);
break;
case PORT:
pport = &peer -> listen_port;
doport:
token = next_token (&val, cfile);
if (token != NUMBER) {
parse_warn (cfile, "expecting number");
skip_to_rbrace (cfile, 1);
}
*pport = atoi (val);
cp -> port = atoi (val);
break;
case MAX_TRANSMIT_IDLE:
tp = &peer -> max_transmit_idle;
goto parse_idle;
case MAX_RESPONSE_DELAY:
tp = &peer -> max_response_delay;
tp = &cp -> max_response_delay;
parse_idle:
token = next_token (&val, cfile);
if (token != NUMBER) {
@@ -769,7 +743,7 @@ void parse_failover_peer (cfile, group, type)
break;
case MAX_UNACKED_UPDATES:
tp = &peer -> max_flying_updates;
tp = &cp -> max_flying_updates;
goto parse_idle;
case MCLT:
@@ -893,6 +867,7 @@ void parse_failover_state_declaration (struct parse *cfile,
const char *val;
char *name;
dhcp_failover_state_t *state;
dhcp_failover_config_t *cp;
if (!peer) {
token = next_token (&val, cfile);
@@ -949,25 +924,21 @@ void parse_failover_state_declaration (struct parse *cfile,
case RBRACE:
break;
case MY:
cp = &state -> me;
do_state:
token = next_token (&val, cfile);
if (token != STATE) {
parse_warn (cfile, "expecting 'state'");
goto bogus;
}
parse_failover_state (cfile,
&state -> my_state,
&state -> my_stos);
&cp -> state, &cp -> stos);
break;
case PARTNER:
token = next_token (&val, cfile);
if (token != STATE) {
parse_warn (cfile, "expecting 'state'");
goto bogus;
}
parse_failover_state (cfile,
&state -> partner_state,
&state -> partner_stos);
break;
cp = &state -> partner;
goto do_state;
default:
bogus:
parse_warn (cfile, "expecting state setting.");
@@ -991,6 +962,10 @@ void parse_failover_state (cfile, state, stos)
token = next_token (&val, cfile);
switch (token) {
case UNKNOWN_STATE:
state_in = unknown_state;
break;
case PARTNER_DOWN:
state_in = partner_down;
break;
@@ -1003,20 +978,32 @@ void parse_failover_state (cfile, state, stos)
state_in = communications_interrupted;
break;
case POTENTIAL_CONFLICT:
state_in = potential_conflict;
break;
case RESOLUTION_INTERRUPTED:
state_in = resolution_interrupted;
break;
case POTENTIAL_CONFLICT:
state_in = potential_conflict;
break;
case RECOVER:
state_in = recover;
break;
case UNKNOWN_STATE:
state_in = unknown_state;
case RECOVER_DONE:
state_in = recover_done;
break;
case SHUTDOWN:
state_in = shut_down;
break;
case PAUSED:
state_in = paused;
break;
case STARTUP:
state_in = startup;
break;
default: