Revision 6cf72d7a proto/bgp/bgp.c

View differences:

proto/bgp/bgp.c
168 168
  if (p->startup_delay)
169 169
    {
170 170
      p->start_state = BSS_DELAY;
171
      BGP_TRACE(D_EVENTS, "Startup delayed by %d seconds", p->startup_delay);
171
      BGP_TRACE(D_EVENTS, "Startup delayed by %d seconds due to errors", p->startup_delay);
172 172
      bgp_start_timer(p->startup_timer, p->startup_delay);
173 173
    }
174 174
  else
......
651 651
static void
652 652
bgp_active(struct bgp_proto *p)
653 653
{
654
  int delay = MAX(1, p->cf->start_delay_time);
654
  int delay = MAX(1, p->cf->connect_delay_time);
655 655
  struct bgp_conn *conn = &p->outgoing_conn;
656 656

  
657 657
  BGP_TRACE(D_EVENTS, "Connect delayed by %d seconds", delay);
......
1417 1417

  
1418 1418
      if ((oc->state == BS_ACTIVE) &&
1419 1419
	  (oc->connect_retry_timer->expires))
1420
	cli_msg(-1006, "    Start delay:      %d/%d",
1421
		oc->connect_retry_timer->expires - now, p->cf->start_delay_time);
1420
	cli_msg(-1006, "    Connect delay:    %d/%d",
1421
		oc->connect_retry_timer->expires - now, p->cf->connect_delay_time);
1422 1422

  
1423 1423
      if (p->gr_active && p->gr_timer->expires)
1424 1424
	cli_msg(-1006, "    Restart timer:    %d/-", p->gr_timer->expires - now);

Also available in: Unified diff