summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2009-06-06 18:56:33 +0200
committerOndrej Zajicek <santiago@crfreenet.org>2009-06-06 18:56:33 +0200
commit723826267101cfbb918125f0f270166cd309229d (patch)
tree66e5f39b044451add710d538e4c8501e50ea6305
parentdd91e467657b2dba84df308d0dc74d268bbfa228 (diff)
downloadbird-723826267101cfbb918125f0f270166cd309229d.tar
bird-723826267101cfbb918125f0f270166cd309229d.zip
Fixes bug related to startup delay change.
-rw-r--r--proto/bgp/bgp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 785be52..80116c5 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -253,6 +253,9 @@ bgp_update_startup_delay(struct bgp_proto *p, struct bgp_conn *conn, unsigned co
DBG("BGP: Updating startup delay %d %d\n", code, subcode);
+ if (p->last_proto_error && ((now - p->last_proto_error) >= cf->error_amnesia_time))
+ p->startup_delay = 0;
+
p->last_proto_error = now;
if (cf->disable_after_error)
@@ -265,8 +268,6 @@ bgp_update_startup_delay(struct bgp_proto *p, struct bgp_conn *conn, unsigned co
return;
}
- if (p->last_proto_error && ((now - p->last_proto_error) >= cf->error_amnesia_time))
- p->startup_delay = 0;
if (!p->startup_delay)
p->startup_delay = cf->error_delay_time_min;