Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / sharpd / sharp_vty.c

diff --git a/sharpd/sharp_vty.c b/sharpd/sharp_vty.c
index 77b562d6a61ef69023152b8e865e2ef54ad8737e..ca2212cd87136a0af224f5e7ca3aec2737d794c0 100644 (file)
--- a/sharpd/sharp_vty.c
+++ b/sharpd/sharp_vty.c
@@ -985,6 +985,7 @@ DEFUN (show_sharp_ted,
        struct ls_edge *edge;
        struct ls_subnet *subnet;
        uint64_t key;
+       struct ls_edge_key ekey;
        bool verbose = false;
        bool uj = use_json(argc, argv);
        json_object *json = NULL;
@@ -1035,8 +1036,9 @@ DEFUN (show_sharp_ted,
                                return CMD_WARNING_CONFIG_FAILED;
                        }
                        /* Get the Edge from the Link State Database */
-                       key = ((uint64_t)ip_addr.s_addr) & 0xffffffff;
-                       edge = ls_find_edge_by_key(sg.ted, key);
+                       ekey.family = AF_INET;
+                       IPV4_ADDR_COPY(&ekey.k.addr, &ip_addr);
+                       edge = ls_find_edge_by_key(sg.ted, ekey);
                        if (!edge) {
                                vty_out(vty, "No edge found for ID %pI4\n",
                                        &ip_addr);
@@ -1059,7 +1061,7 @@ DEFUN (show_sharp_ted,
                                return CMD_WARNING_CONFIG_FAILED;
                        }
                        /* Get the Subnet from the Link State Database */
-                       subnet = ls_find_subnet(sg.ted, pref);
+                       subnet = ls_find_subnet(sg.ted, &pref);
                        if (!subnet) {
                                vty_out(vty, "No subnet found for ID %pFX\n",
                                        &pref);
@@ -1245,6 +1247,7 @@ DEFPY (show_sharp_cspf,
        }
        if (path->status != SUCCESS) {
                vty_out(vty, "Path computation failed: %d\n", path->status);
+               cpath_del(path);
                return CMD_SUCCESS;
        }
 
@@ -1260,7 +1263,7 @@ DEFPY (show_sharp_cspf,
                                &edge->attributes->standard.remote6);
        }
        vty_out(vty, "\n");
-
+       cpath_del(path);
        return CMD_SUCCESS;
 }