Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Praveen dev #10247

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions README-GROUP-3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
This Group 3 (OSPF Group)

PM - Saro

1. Preethi - Lead
2. Praveen
3. Pavan


8 changes: 6 additions & 2 deletions ospfd/ospf_route.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions ospfd/ospf_vty.c
Original file line number Diff line number Diff line change
Expand Up @@ -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")
{
Expand All @@ -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")
{
Expand Down
4 changes: 2 additions & 2 deletions vtysh/vtysh.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
{
Expand Down