diff options
| -rw-r--r-- | conf/confbase.Y | 4 | ||||
| -rw-r--r-- | doc/bird.conf.example | 14 | ||||
| -rw-r--r-- | sysdep/unix/io.c | 24 |
3 files changed, 40 insertions, 2 deletions
diff --git a/conf/confbase.Y b/conf/confbase.Y index 5da84b1e..fa178d87 100644 --- a/conf/confbase.Y +++ b/conf/confbase.Y @@ -145,9 +145,9 @@ pxlen: datetime: TEXT { - $$ = tm_parse_date($1); + $$ = tm_parse_datetime($1); if (!$$) - cf_error("Invalid date"); + cf_error("Invalid date and time"); } ; diff --git a/doc/bird.conf.example b/doc/bird.conf.example index dfa84a2c..704abef0 100644 --- a/doc/bird.conf.example +++ b/doc/bird.conf.example @@ -128,6 +128,20 @@ protocol static { # }; # strict nonbroadcast yes; # }; +# interface "xxx0" { +# passwords { +# password "abc" { +# id 1; +# generate to "22-04-2003 11:00:06"; +# accept to "17-01-2004 12:01:05"; +# }; +# password "def" { +# id 2; +# generate from "22-04-2003 11:00:07"; +# accept from "17-01-2003 12:01:05"; +# }; +# authentication cryptographic; +# }; # }; # area 20 { # stub 1; diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index f68763cc..5ecc8ae1 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -300,6 +300,30 @@ tm_shot(void) } /** + * tm_parse_datetime - parse a date and time + * @x: datetime string + * + * tm_parse_datetime() takes a textual representation of + * a date and time (dd-mm-yyyy hh:mm:ss) + * and converts it to the corresponding value of type &bird_clock_t. + */ +bird_clock_t +tm_parse_datetime(char *x) +{ + struct tm tm; + int n; + time_t t; + + if (sscanf(x, "%d-%d-%d %d:%d:%d%n", &tm.tm_mday, &tm.tm_mon, &tm.tm_year, &tm.tm_hour, &tm.tm_min, &tm.tm_sec, &n) != 6 || x[n]) + return tm_parse_date(x); + tm.tm_mon--; + tm.tm_year -= 1900; + t = mktime(&tm); + if (t == (time_t) -1) + return 0; + return t; +} +/** * tm_parse_date - parse a date * @x: date string * |