netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [iproute PATCH] ip-route: Pretty-print expired routes
@ 2016-08-10 11:14 Phil Sutter
  2016-08-11 13:46 ` Edward Cree
  0 siblings, 1 reply; 5+ messages in thread
From: Phil Sutter @ 2016-08-10 11:14 UTC (permalink / raw)
  To: Stephen Hemminger; +Cc: netdev

Instead of printing 'expires -23sec' for expired (but not yet garbage
collected) routes, print 'expired 23sec' instead.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 ip/iproute.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ip/iproute.c b/ip/iproute.c
index c52294d298210..a89a26d68be0f 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -305,6 +305,14 @@ static void print_rtax_features(FILE *fp, unsigned int features)
 		fprintf(fp, " 0x%x", of);
 }
 
+static void print_expires(FILE *fp, __s32 expires, int hz)
+{
+	if (expires > 0)
+		fprintf(fp, " expires %dsec", expires/hz);
+	else
+		fprintf(fp, " expired %dsec", -expires/hz);
+}
+
 int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 {
 	FILE *fp = (FILE *)arg;
@@ -502,7 +510,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 			if (!hz)
 				hz = get_user_hz();
 			if (ci->rta_expires != 0)
-				fprintf(fp, " expires %dsec", ci->rta_expires/hz);
+				print_expires(fp, ci->rta_expires, hz);
 			if (ci->rta_error != 0)
 				fprintf(fp, " error %d", ci->rta_error);
 			if (show_stats) {
@@ -530,7 +538,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 			if (r->rtm_flags & RTM_F_CLONED)
 				fprintf(fp, "%s    cache ", _SL_);
 			if (ci->rta_expires)
-				fprintf(fp, " expires %dsec", ci->rta_expires/hz);
+				print_expires(fp, ci->rta_expires, hz);
 			if (ci->rta_error != 0)
 				fprintf(fp, " error %d", ci->rta_error);
 			if (show_stats) {
-- 
2.8.2

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-08-12 21:11 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-10 11:14 [iproute PATCH] ip-route: Pretty-print expired routes Phil Sutter
2016-08-11 13:46 ` Edward Cree
2016-08-11 13:54   ` Phil Sutter
2016-08-12 19:58     ` Stephen Hemminger
2016-08-12 21:11       ` Phil Sutter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).