Skip to content

ospf6d: set adv_router for self-originated external routes #20025

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.

Sign up for GitHub

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

Open
jaredmauch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ospf6d: set adv_router for self-originated external routes #20025

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions ospf6d/ospf6_asbr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,6 +1521,12 @@ void ospf6_asbr_redistribute_add(int type, ifindex_t ifindex,
} else
ospf6_route_add_nexthop(match, ifindex, NULL);

/* Ensure adv_router is set to current router-id for self-originated routes.
* This is needed for proper self-originated route filtering when
* sending routes to zebra, especially if router-id has changed.
*/
match->path.origin.adv_router = ospf6->router_id;
match->path.origin.type = htons(OSPF6_LSTYPE_AS_EXTERNAL);
match->path.origin.id = htonl(info->id);
ospf6_handle_external_lsa_origination(ospf6, match, prefix);

Expand Down Expand Up @@ -1569,6 +1575,13 @@ void ospf6_asbr_redistribute_add(int type, ifindex_t ifindex,
} else
ospf6_route_add_nexthop(route, ifindex, NULL);

/* Set adv_router to current router-id for self-originated routes.
* This is needed for proper self-originated route filtering when
* sending routes to zebra.
*/
route->path.origin.adv_router = ospf6->router_id;
route->path.origin.type = htons(OSPF6_LSTYPE_AS_EXTERNAL);

route = ospf6_route_add(route, ospf6->external_table);
ospf6_handle_external_lsa_origination(ospf6, route, prefix);

Expand Down
Loading