From e9a0c65615282fe14a00af70207d620fbc19f98f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timo=20Ter=C3=A4s?= Date: Thu, 22 Oct 2015 11:35:18 +0300 Subject: [PATCH] bgpd: update rtt on soft clear MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit rtt is calculated dynamically by the kernel. Refresh it on soft clear. Fixes: ef757700d0 "bgpd: allow using rtt in route-map's set metric" Signed-off-by: Timo Teräs (cherry picked from commit 5a2a1ec18c89daec5de6690a9b0f47c0d11a0f2d) Conflicts: bgpd/bgpd.c --- bgpd/bgpd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 1e61b0fa2c..fca6e5bb1b 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -27,6 +27,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "stream.h" #include "command.h" #include "sockunion.h" +#include "sockopt.h" #include "network.h" #include "memory.h" #include "filter.h" @@ -5982,6 +5983,8 @@ peer_clear_soft (struct peer *peer, afi_t afi, safi_t safi, if (! peer->afc[afi][safi]) return BGP_ERR_AF_UNCONFIGURED; + peer->rtt = sockopt_tcp_rtt (peer->fd); + if (stype == BGP_CLEAR_SOFT_OUT || stype == BGP_CLEAR_SOFT_BOTH) { /* Clear the "neighbor x.x.x.x default-originate" flag */ -- 2.39.5