2004-05-03 Daniel Roesen <dr@cluenet.de>

        * bgp_fsm.c: (bgp_stop) Reset uptime only on transition from
          Established so that it reflects true downtime (rather time
          since last transition, eg Active->Idle)

diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 211898202c0be5f9c45d3f8594b0ed7d3d517f8e..b5f288787e0e1a6b86b3bd4d632f42130dd1781a 100644 (file)
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-03 Daniel Roesen <dr@cluenet.de>
+       
+       * bgp_fsm.c: (bgp_stop) Reset uptime only on transition from 
+         Established so that it reflects true downtime (rather time 
+         since last transition, eg Active->Idle)
+         
 2004-05-01 rivo nurges <rix@estpak.ee>
  
         * bgp_route.c: fix UNH IOL BGP-4.1.12f

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 3d8e957675d92c835bf51513b7abb8ead47364ff..5c8224c67a9f0e774393c5c8e10173d84afa76ab 100644 (file)
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -329,15 +329,14 @@ bgp_stop (struct peer *peer)
 
       /* set last reset time */
       peer->resettime = time (NULL);
+      /* Reset uptime. */
+      bgp_uptime_reset (peer);
 
 #ifdef HAVE_SNMP
       bgpTrapBackwardTransition (peer);
 #endif /* HAVE_SNMP */
     }
 
-  /* Reset uptime. */
-  bgp_uptime_reset (peer);
-
   /* Need of clear of peer. */
   if (established)
     bgp_clear_route_all (peer);