sync with OpenBSD -current
This commit is contained in:
parent
caf62be22c
commit
b3ecf9fa9a
56 changed files with 383 additions and 289 deletions
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: session.c,v 1.457 2024/01/10 11:08:04 claudio Exp $ */
|
||||
/* $OpenBSD: session.c,v 1.458 2024/01/11 14:11:03 claudio Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
|
||||
|
@ -608,11 +608,6 @@ bgp_fsm(struct peer *peer, enum session_events event)
|
|||
/* init write buffer */
|
||||
msgbuf_init(&peer->wbuf);
|
||||
|
||||
peer->stats.last_sent_errcode = 0;
|
||||
peer->stats.last_sent_suberr = 0;
|
||||
peer->stats.last_rcvd_errcode = 0;
|
||||
peer->stats.last_rcvd_suberr = 0;
|
||||
|
||||
if (!peer->depend_ok)
|
||||
timer_stop(&peer->timers, Timer_ConnectRetry);
|
||||
else if (peer->passive || peer->conf.passive ||
|
||||
|
@ -3553,6 +3548,13 @@ session_up(struct peer *p)
|
|||
{
|
||||
struct session_up sup;
|
||||
|
||||
/* clear last errors, now that the session is up */
|
||||
p->stats.last_sent_errcode = 0;
|
||||
p->stats.last_sent_suberr = 0;
|
||||
p->stats.last_rcvd_errcode = 0;
|
||||
p->stats.last_rcvd_suberr = 0;
|
||||
memset(p->stats.last_reason, 0, sizeof(p->stats.last_reason));
|
||||
|
||||
if (imsg_rde(IMSG_SESSION_ADD, p->conf.id,
|
||||
&p->conf, sizeof(p->conf)) == -1)
|
||||
fatalx("imsg_compose error");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue