diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-03-29 00:29:35 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-03-29 00:29:35 +0100 |
| commit | e20f7ccd9e110fcd5deb945f8d23922efd8b0822 (patch) | |
| tree | 89b61ee61ac306817dc19b9313806bf2562b1c1b /bgpd/bgpd.c | |
| parent | 6481583be322b0ba223a0140500a0a6d50546dd9 (diff) | |
| download | quagga-ex14.tar.bz2 quagga-ex14.tar.xz | |
Bring "ex" version up to date with 0.99.18ex14
Release: 0.99.18ex14
Also fixes issue with unknown attributes -- does not release them prematurely.
Contains the "bgpd: New show commands for improved view and address family support", which is post 0.99.18. (But not RFC 5082 GTSM.)
Diffstat (limited to 'bgpd/bgpd.c')
| -rw-r--r-- | bgpd/bgpd.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 79aad2cb..ea914022 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -3909,8 +3909,10 @@ peer_clear_soft (struct peer *peer, afi_t afi, safi_t safi, return 0; } -/* Display peer uptime.*/ -/* XXX: why does this function return char * when it takes buffer? */ +/* Display peer uptime. + * + * Note that this is a time period -- not an actual time. + */ char * peer_uptime (time_t uptime2, char *buf, size_t len) { @@ -3934,8 +3936,7 @@ peer_uptime (time_t uptime2, char *buf, size_t len) } /* Get current time. */ - uptime1 = time (NULL); - uptime1 -= uptime2; + uptime1 = bgp_clock () - uptime2; tm = gmtime (&uptime1); /* Making formatted timer strings. */ @@ -4629,7 +4630,7 @@ bgp_master_init (void) bm->bgp = list_new (); bm->master = thread_master_create (); bm->port = BGP_PORT_DEFAULT; - bm->start_time = time (NULL); + bm->start_time = bgp_clock (); /* Implicitly: * |