summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2003-12-23 13:13:25 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2003-12-23 13:13:25 +0000
commit0a385f779ffc608c5feb08ce7ada5db5e536b0a3 (patch)
treee73a2d2b24c24d348d2c34114efd5c537f9f3bea
parent0bb21edd3a1ae1fe599cf011bbc1de0f3ab3abb3 (diff)
better syntax for minimum accepted holdtime
-rw-r--r--usr.sbin/bgpd/parse.y14
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y
index 0b7939e08f5..146cbfc9ab9 100644
--- a/usr.sbin/bgpd/parse.y
+++ b/usr.sbin/bgpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.9 2003/12/23 01:06:21 henning Exp $ */
+/* $OpenBSD: parse.y,v 1.10 2003/12/23 13:13:24 henning Exp $ */
/*
* Copyright (c) 2002, 2003 Henning Brauer <henning@openbsd.org>
@@ -82,7 +82,7 @@ typedef struct {
%}
%token SET
-%token AS BGPID HOLDTIME HOLDTIME_MIN LISTEN ON
+%token AS BGPID HOLDTIME YMIN LISTEN ON
%token GROUP NEIGHBOR
%token REMOTEAS DESCR LOCALADDR MULTIHOP
%token ERROR
@@ -144,13 +144,13 @@ conf_main : AS number {
}
conf->holdtime = $2;
}
- | HOLDTIME_MIN number {
- if ($2 < MIN_HOLDTIME) {
- yyerror("holdtime_min must be at least %u",
+ | HOLDTIME YMIN number {
+ if ($3 < MIN_HOLDTIME) {
+ yyerror("holdtime min must be at least %u",
MIN_HOLDTIME);
YYERROR;
}
- conf->min_holdtime = $2;
+ conf->min_holdtime = $3;
}
| LISTEN ON address {
conf->listen_addr.sin_addr.s_addr = $3.s_addr;
@@ -303,9 +303,9 @@ lookup(char *s)
{ "descr", DESCR},
{ "group", GROUP},
{ "holdtime", HOLDTIME},
- { "holdtime_min", HOLDTIME_MIN},
{ "listen", LISTEN},
{ "local-address", LOCALADDR},
+ { "min", YMIN},
{ "mrtdump", MRTDUMP},
{ "multihop", MULTIHOP},
{ "neighbor", NEIGHBOR},