From df4be57783b5c150fdbc97bf32a025600a603734 Mon Sep 17 00:00:00 2001 From: Sadha Date: Mon, 13 Dec 2021 05:46:18 +0000 Subject: [PATCH 1/6] Group info --- README-GROUP-3.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 README-GROUP-3.md diff --git a/README-GROUP-3.md b/README-GROUP-3.md new file mode 100644 index 000000000000..5c6eb3c69584 --- /dev/null +++ b/README-GROUP-3.md @@ -0,0 +1,7 @@ +This Group 3 (OSPF Group) + +1. Preethi - Lead +2. Praveen +3. Pavan + + From e28060d76c4bcc7c655191874b1a56edd3167863 Mon Sep 17 00:00:00 2001 From: Sadha Date: Mon, 13 Dec 2021 06:06:11 +0000 Subject: [PATCH 2/6] PM update --- README-GROUP-3.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README-GROUP-3.md b/README-GROUP-3.md index 5c6eb3c69584..cc37074ac445 100644 --- a/README-GROUP-3.md +++ b/README-GROUP-3.md @@ -1,5 +1,7 @@ This Group 3 (OSPF Group) +PM - Saro + 1. Preethi - Lead 2. Praveen 3. Pavan From a500446943d9a9ff6a35fe3c023572b3d06d327c Mon Sep 17 00:00:00 2001 From: preethi Date: Mon, 13 Dec 2021 07:17:53 +0000 Subject: [PATCH 3/6] help string changes --- vtysh/vtysh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index b9577ccd8c7b..ceb84aa225f7 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -1913,7 +1913,7 @@ DEFUNSH(VTYSH_RIPNGD, router_ripng, router_ripng_cmd, "router ripng [vrf NAME]", DEFUNSH(VTYSH_OSPFD, router_ospf, router_ospf_cmd, "router ospf [(1-65535)] [vrf NAME]", "Enable a routing process\n" - "Start OSPF configuration\n" + "Open Shortest Path First (OSPF) configuration\n" "Instance ID\n" VRF_CMD_HELP_STR) { From 77b1be8db70833c4b3ffbaf13b875b6d7685ea94 Mon Sep 17 00:00:00 2001 From: Praveen Date: Mon, 13 Dec 2021 11:33:31 +0000 Subject: [PATCH 4/6] help string commit --- vtysh/vtysh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index ceb84aa225f7..08809f8018bf 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -1902,7 +1902,7 @@ DEFUNSH(VTYSH_RIPD, router_rip, router_rip_cmd, "router rip [vrf NAME]", #ifdef HAVE_RIPNGD DEFUNSH(VTYSH_RIPNGD, router_ripng, router_ripng_cmd, "router ripng [vrf NAME]", - ROUTER_STR "RIPng\n" VRF_CMD_HELP_STR) + ROUTER_STR "Routing Information Protocol for IPv6 (RIPng)\n" VRF_CMD_HELP_STR) { vty->node = RIPNG_NODE; return CMD_SUCCESS; From f49d7f562ec23dbbcef872041ad16cc8fb196a0f Mon Sep 17 00:00:00 2001 From: Praveen Date: Wed, 15 Dec 2021 14:47:38 +0000 Subject: [PATCH 5/6] updating --- ospfd/ospf_vty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 6979b341968a..46524e163012 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -2321,7 +2321,7 @@ DEFUN (ospf_timers_lsa_min_arrival, ospf_timers_lsa_min_arrival_cmd, "timers lsa min-arrival (0-600000)", "Adjust routing timers\n" - "OSPF LSA timers\n" + "OSPF Link State Advertisements(LSA) Timers\n" "Minimum delay in receiving new version of a LSA\n" "Delay in milliseconds\n") { @@ -2335,7 +2335,7 @@ DEFUN (no_ospf_timers_lsa_min_arrival, "no timers lsa min-arrival [(0-600000)]", NO_STR "Adjust routing timers\n" - "OSPF LSA timers\n" + "OSPF Link State Advertisements(LSA) Timers\n" "Minimum delay in receiving new version of a LSA\n" "Delay in milliseconds\n") { From 57004bc4b909395a80815c59326df3ced049ee2e Mon Sep 17 00:00:00 2001 From: Praveen Date: Mon, 20 Dec 2021 12:11:38 +0000 Subject: [PATCH 6/6] Add a debug in ospf_route_delete() to print information related to the route entry/entries that are deleted Signed-off-by: Praveen --- ospfd/ospf_route.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ospfd/ospf_route.c b/ospfd/ospf_route.c index 502a4a08c160..08d7700eda11 100644 --- a/ospfd/ospf_route.c +++ b/ospfd/ospf_route.c @@ -106,12 +106,16 @@ void ospf_route_delete(struct ospf *ospf, struct route_table *rt) for (rn = route_top(rt); rn; rn = route_next(rn)) if ((or = rn->info) != NULL) { - if (or->type == OSPF_DESTINATION_NETWORK) + if (or->type == OSPF_DESTINATION_NETWORK){ + zlog_debug("Zebra: Route delete %pFX",(struct prefix_ipv4 *)&rn->p); ospf_zebra_delete( ospf, (struct prefix_ipv4 *)&rn->p, or); - else if (or->type == OSPF_DESTINATION_DISCARD) + } + else if (or->type == OSPF_DESTINATION_DISCARD){ + zlog_debug("Zebra: Route delete %pFX",(struct prefix_ipv4 *)&rn->p); ospf_zebra_delete_discard( ospf, (struct prefix_ipv4 *)&rn->p); + } } }