diff options
| author | Martin Mares <mj@ucw.cz> | 2000-03-01 12:42:13 +0100 |
|---|---|---|
| committer | Martin Mares <mj@ucw.cz> | 2000-03-01 12:42:13 +0100 |
| commit | aee539f241dd233eb9e716e11ee2c449ab482a75 (patch) | |
| tree | 4e3ca622427a69ef1f4e8a4f21c1803d9c804070 | |
| parent | db1326aa5e39711d88d305ac08a0afa137ab77f0 (diff) | |
| download | bird-aee539f241dd233eb9e716e11ee2c449ab482a75.tar bird-aee539f241dd233eb9e716e11ee2c449ab482a75.zip | |
Made `datetime' more user friendly. Now it should be a quoted string
of type "dd-mm-yyyy".
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | conf/confbase.Y | 14 |
2 files changed, 11 insertions, 7 deletions
@@ -18,10 +18,7 @@ Core - netlink: import Linux route attributes to our rta's, so that they can be filtered? -- config: executable config files - config: when parsing prefix, check zero bits -- config: useless rules when protocols disabled -- config: better datetime format - krt: rescan interfaces when route addition fails? @@ -56,6 +53,7 @@ Globals Various ideas ~~~~~~~~~~~~~ +- config: executable config files - client: access control - IPv6 router advertisements - real multipath (doesn't seem to be simple at all :() diff --git a/conf/confbase.Y b/conf/confbase.Y index 49d3b12..ba60fb2 100644 --- a/conf/confbase.Y +++ b/conf/confbase.Y @@ -1,7 +1,7 @@ /* * BIRD -- Configuration Parser Top * - * (c) 1998--1999 Martin Mares <mj@ucw.cz> + * (c) 1998--2000 Martin Mares <mj@ucw.cz> * * Can be freely distributed and used under the terms of the GNU GPL. */ @@ -37,6 +37,7 @@ CF_DECLS struct password_item *p; struct rt_show_data *ra; void *g; + bird_clock_t time; } %token END CLI_MARKER INVALID_TOKEN @@ -46,7 +47,8 @@ CF_DECLS %token <s> SYM %token <t> TEXT -%type <i> expr bool pxlen datetime +%type <i> expr bool pxlen +%type <time> datetime %nonassoc '=' '<' '>' '~' '.' %left '+' '-' @@ -115,8 +117,12 @@ pxlen: } ; -datetime: /* Return seconds from epoch, FIXME we want be more user friendly */ - NUM { $$ = $1; } +datetime: /* Return seconds from epoch, FIXME we want be more user friendly */ + TEXT { + $$ = tm_parse_date($1); + if (!$$) + cf_error("Invalid date"); + } ; CF_CODE |