From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 13 Feb 2019 14:27:19 +0000 (-0500)
Subject: sharpd: Add ability to track import-check nexthops
X-Git-Tag: 7.1_pulled~246^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=80d5ff338da6fecbef297db3eb42a98711205fb2;p=mirror%2Ffrr.git

sharpd: Add ability to track import-check nexthops

Add the ability to sharp to track import-check type routes
from the cli.  Update docs too.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/doc/user/sharp.rst b/doc/user/sharp.rst
index a78fac8fc1..ca8f1f512f 100644
--- a/doc/user/sharp.rst
+++ b/doc/user/sharp.rst
@@ -71,10 +71,15 @@ keyword. At present, no sharp commands will be preserved in the config.
    be used for pop and forward operations when the specified label is seen.
 
 .. index:: sharp watch
-.. clicmd:: sharp watch nexthop <A.B.C.D|X:X::X:X>
+.. clicmd:: [no] sharp watch <nexthop|import> <A.B.C.D|X:X::X:X> [connected]
 
    Instruct zebra to monitor and notify sharp when the specified nexthop is
    changed. The notification from zebra is written into the debug log.
+   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
+   the command obviously turns this watching off.
 
 .. index:: sharp data nexthop
 .. clicmd:: sharp data nexthop
diff --git a/sharpd/sharp_vty.c b/sharpd/sharp_vty.c
index 26ce7c73bc..9018cfb359 100644
--- a/sharpd/sharp_vty.c
+++ b/sharpd/sharp_vty.c
@@ -39,14 +39,22 @@
 #endif
 
 DEFPY(watch_nexthop_v6, watch_nexthop_v6_cmd,
-      "sharp watch nexthop X:X::X:X$nhop [connected$connected]",
+      "sharp watch <nexthop$n|import$import> X:X::X:X$nhop [connected$connected]",
       "Sharp routing Protocol\n"
       "Watch for changes\n"
       "Watch for nexthop changes\n"
+      "Watch for import check changes\n"
       "The v6 nexthop to signal for watching\n"
       "Should the route be connected\n")
 {
 	struct prefix p;
+	bool type_import;
+
+
+	if (n)
+		type_import = false;
+	else
+		type_import = true;
 
 	memset(&p, 0, sizeof(p));
 
@@ -55,29 +63,36 @@ DEFPY(watch_nexthop_v6, watch_nexthop_v6_cmd,
 	p.family = AF_INET6;
 
 	sharp_nh_tracker_get(&p);
-	sharp_zebra_nexthop_watch(&p, false, true, !!connected);
+	sharp_zebra_nexthop_watch(&p, type_import, true, !!connected);
 
 	return CMD_SUCCESS;
 }
 
 DEFPY(watch_nexthop_v4, watch_nexthop_v4_cmd,
-      "sharp watch nexthop A.B.C.D$nhop [connected$connected]",
+      "sharp watch <nexthop$n|import$import> A.B.C.D$nhop [connected$connected]",
       "Sharp routing Protocol\n"
       "Watch for changes\n"
       "Watch for nexthop changes\n"
+      "Watch for import check changes\n"
       "The v4 nexthop to signal for watching\n"
       "Should the route be connected\n")
 {
 	struct prefix p;
+	bool type_import;
 
 	memset(&p, 0, sizeof(p));
 
+	if (n)
+		type_import = false;
+	else
+		type_import = true;
+
 	p.prefixlen = 32;
 	p.u.prefix4 = nhop;
 	p.family = AF_INET;
 
 	sharp_nh_tracker_get(&p);
-	sharp_zebra_nexthop_watch(&p, false, true, !!connected);
+	sharp_zebra_nexthop_watch(&p, type_import, true, !!connected);
 
 	return CMD_SUCCESS;
 }