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.

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

Pbrd extra #2051

Merged
merged 14 commits into from
Apr 20, 2018
Merged

Pbrd extra #2051

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cafec8d
lib, pbrd: Do not allow v6 LL nexthops to be specified without an int…
donaldsharp Mar 28, 2018
ebee2bc
lib: Clean up delete of a nexthop from a nexthop group
donaldsharp Mar 28, 2018
4d96fd9
zebra: Tell rib_process to actually rethink pbr routes.
donaldsharp Mar 30, 2018
2fb7892
pbrd: Prevent attempt at re-install for several scenarios
donaldsharp Mar 30, 2018
9b71ea4
pbrd: Fix installation and deletion in some cases
donaldsharp Apr 6, 2018
37c606f
pbrd, zebra: Fix multiple pbr-policy install
donaldsharp Apr 6, 2018
0f03639
pbrd, zebra: Properly notice rule deletion
donaldsharp Apr 9, 2018
e14f43c
pbrd: move debug vty into pbr_vty.c
qlyoung Apr 3, 2018
56c63ee
pbrd: don't collapse pbr debugs
qlyoung Apr 3, 2018
d02e943
pbrd: Allow pbr-policy add/removal to install/remove rules
donaldsharp Apr 9, 2018
24010e9
pbrd: Fix unused function
donaldsharp Apr 10, 2018
c57bd6b
lib: Store nexthop information independently
donaldsharp Apr 10, 2018
d7b3ad4
pbrd: Use proper decode function for interface
donaldsharp Apr 10, 2018
98cbbae
lib: Handle if up/down and vrf enable/disable events
donaldsharp Apr 10, 2018
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
Prev Previous commit
Next Next commit
lib: Clean up delete of a nexthop from a nexthop group 
The delete was not properly deleting the nexthop from
the nexthop group and it was not properly setting the
nexthop's pointers to NULL.

Ticket: CM-20261
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
  • Loading branch information
@donaldsharp
donaldsharp committed Apr 17, 2018
commit ebee2bc4c5e948f4b6525e0b767679b7b62b7a2f
4 changes: 4 additions & 0 deletions lib/nexthop_group.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ void nexthop_del(struct nexthop_group *nhg, struct nexthop *nh)

if (nexthop->next)
nexthop->next->prev = nexthop->prev;

nh->prev = NULL;
nh->next = NULL;
}

void copy_nexthops(struct nexthop **tnh, struct nexthop *nh,
Expand Down Expand Up @@ -151,6 +154,7 @@ static void nhgc_delete_nexthops(struct nexthop_group_cmd *nhgc)
while (nexthop) {
struct nexthop *next = nexthop_next(nexthop);

nexthop_del(&nhgc->nhg, nexthop);
if (nhg_hooks.del_nexthop)
nhg_hooks.del_nexthop(nhgc, nexthop);

Expand Down