diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2013-11-22 02:43:41 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2013-11-22 02:48:44 +0100 |
| commit | 0aeac9cb7f9887374ce0258c8653f9518529bf08 (patch) | |
| tree | 2d16e0904be1658c08a4c779cf4132bc8bf20efa /conf | |
| parent | 8931425d02dd8656b48142f608d3119ab6f4a96f (diff) | |
| parent | 7c9930f9c8feb3b08f7a9e94a08807ccbbc096f5 (diff) | |
Merge commit 'origin/bfd'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/confbase.Y | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/conf/confbase.Y b/conf/confbase.Y index c6678e77..8b9f206a 100644 --- a/conf/confbase.Y +++ b/conf/confbase.Y @@ -73,6 +73,7 @@ CF_DECLS %type <iface> ipa_scope %type <i> expr bool pxlen +%type <i32> expr_us %type <time> datetime %type <a> ipa %type <px> prefix prefix_or_ipa @@ -86,7 +87,7 @@ CF_DECLS %left '!' %nonassoc '.' -CF_KEYWORDS(DEFINE, ON, OFF, YES, NO) +CF_KEYWORDS(DEFINE, ON, OFF, YES, NO, S, MS, US) CF_GRAMMAR @@ -124,6 +125,13 @@ expr: $$ = SYM_VAL($1).i; } ; + +expr_us: + expr S { $$ = (u32) $1 * 1000000; } + | expr MS { $$ = (u32) $1 * 1000; } + | expr US { $$ = (u32) $1 * 1; } + ; + /* expr_u16: expr { check_u16($1); $$ = $1; }; */ /* Switches */ |