30c30
< * $FreeBSD: head/sbin/hastd/parse.y 204076 2010-02-18 23:16:19Z pjd $
---
> * $FreeBSD: head/sbin/hastd/parse.y 207371 2010-04-29 15:36:32Z pjd $
60a61
> static int depth0_timeout;
117a119
> depth0_timeout = HAST_TIMEOUT;
156a159,165
> if (curres->hr_timeout == -1) {
> /*
> * Timeout is not set at resource-level.
> * Use global or default setting.
> */
> curres->hr_timeout = depth0_timeout;
> }
174c183
< %token CONTROL LISTEN PORT REPLICATION EXTENTSIZE RESOURCE NAME LOCAL REMOTE ON
---
> %token CONTROL LISTEN PORT REPLICATION TIMEOUT EXTENTSIZE RESOURCE NAME LOCAL REMOTE ON
202a212,213
> timeout_statement
> |
283a295,310
> timeout_statement: TIMEOUT NUM
> {
> switch (depth) {
> case 0:
> depth0_timeout = $2;
> break;
> case 1:
> if (curres != NULL)
> curres->hr_timeout = $2;
> break;
> default:
> assert(!"timeout at wrong depth level");
> }
> }
> ;
>
391a419
> curres->hr_timeout = -1;
407a436,437
> timeout_statement
> |
< * $FreeBSD: head/sbin/hastd/parse.y 204076 2010-02-18 23:16:19Z pjd $
---
> * $FreeBSD: head/sbin/hastd/parse.y 207371 2010-04-29 15:36:32Z pjd $
60a61
> static int depth0_timeout;
117a119
> depth0_timeout = HAST_TIMEOUT;
156a159,165
> if (curres->hr_timeout == -1) {
> /*
> * Timeout is not set at resource-level.
> * Use global or default setting.
> */
> curres->hr_timeout = depth0_timeout;
> }
174c183
< %token CONTROL LISTEN PORT REPLICATION EXTENTSIZE RESOURCE NAME LOCAL REMOTE ON
---
> %token CONTROL LISTEN PORT REPLICATION TIMEOUT EXTENTSIZE RESOURCE NAME LOCAL REMOTE ON
202a212,213
> timeout_statement
> |
283a295,310
> timeout_statement: TIMEOUT NUM
> {
> switch (depth) {
> case 0:
> depth0_timeout = $2;
> break;
> case 1:
> if (curres != NULL)
> curres->hr_timeout = $2;
> break;
> default:
> assert(!"timeout at wrong depth level");
> }
> }
> ;
>
391a419
> curres->hr_timeout = -1;
407a436,437
> timeout_statement
> |