diff options
| author | Sebastian Benoit <benno@cvs.openbsd.org> | 2013-05-11 14:42:29 +0000 |
|---|---|---|
| committer | Sebastian Benoit <benno@cvs.openbsd.org> | 2013-05-11 14:42:29 +0000 |
| commit | ee9241880f9bba56f2d18b539ad59f2d169bf84c (patch) | |
| tree | 0e732cd9d389f5d68707306f001348d9d0a4d59d /usr.sbin | |
| parent | 40795472e8e0221f9f7b755a70f92a23a7a45d69 (diff) | |
change mrt rib dump ReopenTimerInterval from time_t to int. Intervalls
don't need to scale to 64 bits in this universe.
ok claudio@ & florian@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/bgpd/bgpd.h | 4 | ||||
| -rw-r--r-- | usr.sbin/bgpd/parse.y | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h index 5e64703cab7..26f636a1bd8 100644 --- a/usr.sbin/bgpd/bgpd.h +++ b/usr.sbin/bgpd/bgpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.h,v 1.276 2013/03/07 21:26:28 claudio Exp $ */ +/* $OpenBSD: bgpd.h,v 1.277 2013/05/11 14:42:28 benno Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -916,7 +916,7 @@ struct mrt_config { char name[MRT_FILE_LEN]; /* base file name */ char file[MRT_FILE_LEN]; /* actual file name */ time_t ReopenTimer; - time_t ReopenTimerInterval; + int ReopenTimerInterval; }; /* prototypes */ diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 460f016201a..1f611ec3c37 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.265 2012/11/13 09:47:20 claudio Exp $ */ +/* $OpenBSD: parse.y,v 1.266 2013/05/11 14:42:28 benno Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -114,7 +114,7 @@ struct filter_match_l { struct peer *alloc_peer(void); struct peer *new_peer(void); struct peer *new_group(void); -int add_mrtconfig(enum mrt_type, char *, time_t, struct peer *, +int add_mrtconfig(enum mrt_type, char *, int, struct peer *, char *); int add_rib(char *, u_int, u_int16_t); struct rde_rib *find_rib(char *); @@ -439,7 +439,7 @@ conf_main : AS as4number { | DUMP STRING STRING optnumber { int action; - if ($4 < 0 || $4 > UINT_MAX) { + if ($4 < 0 || $4 > INT_MAX) { yyerror("bad timeout"); free($2); free($3); @@ -467,7 +467,7 @@ conf_main : AS as4number { | DUMP RIB STRING STRING STRING optnumber { int action; - if ($6 < 0 || $6 > UINT_MAX) { + if ($6 < 0 || $6 > INT_MAX) { yyerror("bad timeout"); free($3); free($4); @@ -575,7 +575,7 @@ conf_main : AS as4number { mrtdump : DUMP STRING inout STRING optnumber { int action; - if ($5 < 0 || $5 > UINT_MAX) { + if ($5 < 0 || $5 > INT_MAX) { yyerror("bad timeout"); free($2); free($4); @@ -3081,7 +3081,7 @@ new_group(void) } int -add_mrtconfig(enum mrt_type type, char *name, time_t timeout, struct peer *p, +add_mrtconfig(enum mrt_type type, char *name, int timeout, struct peer *p, char *rib) { struct mrt *m, *n; |