From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Sat, 25 Jun 2011 12:51:16 +0000 (+0200)
Subject: Fixes output of BGP timers in 'show protocols all'.
X-Git-Tag: v1.3.2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35f8c731ea29bd534c74b2d0de089d5683ebcd8d;p=thirdparty%2Fbird.git

Fixes output of BGP timers in 'show protocols all'.
---

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 9c069b45e..70c9b2f99 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1032,6 +1032,9 @@ bgp_get_status(struct proto *P, byte *buf)
     bsprintf(buf, "%-14s%s%s", bgp_state_dsc(p), err1, err2);
 }
 
+static inline bird_clock_t tm_remains(timer *t)
+{ return t->expires ? t->expires - now : 0; }
+
 static void
 bgp_show_proto_info(struct proto *P)
 {
@@ -1074,10 +1077,10 @@ bgp_show_proto_info(struct proto *P)
       if (p->cf->route_limit)
 	cli_msg(-1006, "    Route limit:      %d/%d",
 		p->p.stats.imp_routes, p->cf->route_limit);
-      cli_msg(-1006, "    Hold timer:       %d/%d", 
-	      c->hold_timer->expires - now, c->hold_time);
-      cli_msg(-1006, "    Keepalive timer:  %d/%d", 
-	      c->keepalive_timer->expires - now, c->keepalive_time);
+      cli_msg(-1006, "    Hold timer:       %d/%d",
+	      tm_remains(c->hold_timer), c->hold_time);
+      cli_msg(-1006, "    Keepalive timer:  %d/%d",
+	      tm_remains(c->keepalive_timer), c->keepalive_time);
     }
 
   if ((p->last_error_class != BE_NONE) &&