diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2015-02-22 16:08:28 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2015-02-22 17:21:54 +0100 |
| commit | 6cf72d7ad7cbe1eb2f5b63660be6967d29b37044 (patch) | |
| tree | d0b2576ae89cc4919befaac006f4efa345efb3f3 /proto/bgp/bgp.c | |
| parent | a1beb8f3ee7a6e41dbe4bfd336b8bf5eecb46d01 (diff) | |
Rename BGP option 'start delay' to 'connect delay'
Also update log message for error-triggered startup delay.
Diffstat (limited to 'proto/bgp/bgp.c')
| -rw-r--r-- | proto/bgp/bgp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c index 07fd8478..050f737f 100644 --- a/proto/bgp/bgp.c +++ b/proto/bgp/bgp.c @@ -168,7 +168,7 @@ bgp_initiate(struct bgp_proto *p) if (p->startup_delay) { p->start_state = BSS_DELAY; - BGP_TRACE(D_EVENTS, "Startup delayed by %d seconds", p->startup_delay); + BGP_TRACE(D_EVENTS, "Startup delayed by %d seconds due to errors", p->startup_delay); bgp_start_timer(p->startup_timer, p->startup_delay); } else @@ -651,7 +651,7 @@ bgp_setup_sk(struct bgp_conn *conn, sock *s) static void bgp_active(struct bgp_proto *p) { - int delay = MAX(1, p->cf->start_delay_time); + int delay = MAX(1, p->cf->connect_delay_time); struct bgp_conn *conn = &p->outgoing_conn; BGP_TRACE(D_EVENTS, "Connect delayed by %d seconds", delay); @@ -1417,8 +1417,8 @@ bgp_show_proto_info(struct proto *P) if ((oc->state == BS_ACTIVE) && (oc->connect_retry_timer->expires)) - cli_msg(-1006, " Start delay: %d/%d", - oc->connect_retry_timer->expires - now, p->cf->start_delay_time); + cli_msg(-1006, " Connect delay: %d/%d", + oc->connect_retry_timer->expires - now, p->cf->connect_delay_time); if (p->gr_active && p->gr_timer->expires) cli_msg(-1006, " Restart timer: %d/-", p->gr_timer->expires - now); |