From 469d627747f7fc4b24283f10f82f37b670c878eb Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 10 Jul 2020 21:48:05 -0400 Subject: [PATCH 1/3] zebra: Only note time of first nht registration We were noticing registration time of the last nht time. Let's just store the original time, although I am a bit dubious about the usefulness of this. Signed-off-by: Donald Sharp --- zebra/zapi_msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index 6dd197f010..17114f820c 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -1078,7 +1078,8 @@ static void zread_rnh_register(ZAPI_HANDLER_ARGS) s = msg; - client->nh_reg_time = monotime(NULL); + if (!client->nh_reg_time) + client->nh_reg_time = monotime(NULL); while (l < hdr->length) { STREAM_GETC(s, flags); From bcc519dce53ed9031fc2160a6a9de0df4e894771 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 10 Jul 2020 21:52:54 -0400 Subject: [PATCH 2/3] sharpd: Cleanup help text Help text was a bit inconsistent/wrong. Fix it like you mixed it. Signed-off-by: Donald Sharp --- sharpd/sharp_vty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sharpd/sharp_vty.c b/sharpd/sharp_vty.c index 6a120c8eff..049b8475e4 100644 --- a/sharpd/sharp_vty.c +++ b/sharpd/sharp_vty.c @@ -131,8 +131,8 @@ DEFPY(sharp_nht_data_dump, sharp_nht_data_dump_cmd, "sharp data nexthop", "Sharp routing Protocol\n" - "Nexthop information\n" - "Data Dump\n") + "Data about what is going on\n" + "Nexthop information\n") { sharp_nh_tracker_dump(vty); From 238f69afff5a1d9e643c8a2e4c14db3e18bffb62 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 10 Jul 2020 21:59:23 -0400 Subject: [PATCH 3/3] doc: Update sharp watch command documentation slightly Signed-off-by: Donald Sharp --- doc/user/sharp.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/user/sharp.rst b/doc/user/sharp.rst index 76bdc48dc0..5a27be22b9 100644 --- a/doc/user/sharp.rst +++ b/doc/user/sharp.rst @@ -78,7 +78,8 @@ keyword. At present, no sharp commands will be preserved in the config. The nexthop or import choice chooses the type of nexthop we are asking zebra to watch for us. This choice affects zebra's decision on what matches. Connected tells zebra whether or not that we want the route - matched against to be a static or connected route. The no form of + matched against to be a static or connected route for the nexthop keyword, + for the import keyword connected means exact match. The no form of the command obviously turns this watching off. .. index:: sharp data nexthop