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

Support mask for XfrmState's output mark #602

Merged
merged 1 commit into from
Dec 30, 2020

Conversation

pchaigno
Copy link
Contributor

XfrmState currently doesn't allow setting the mask for the output mark. As a result, setting an output mark always clears all bits. This pull request adds support for the mask value.

@pchaigno pchaigno marked this pull request as draft December 13, 2020 22:29
@pchaigno pchaigno force-pushed the outputmark-mask branch 3 times, most recently from 386e5e9 to b600385 Compare December 14, 2020 09:14
@pchaigno pchaigno marked this pull request as ready for review December 14, 2020 09:33
Copy link
Collaborator

@aboch aboch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing this.
A couple of minor comments.

xfrm_state_linux.go Outdated Show resolved Hide resolved
xfrm_state_linux.go Outdated Show resolved Hide resolved
XfrmState currently doesn't allow setting the mask for the output mark.
As a result, setting an output mark always clears all bits. This commit
adds support for the mask value.

Signed-off-by: Paul Chaignon <paul@cilium.io>
@pchaigno
Copy link
Contributor Author

@aboch Thanks for the review! I removed the two unnecessary type convertions.

@pchaigno pchaigno requested a review from aboch December 30, 2020 09:27
@aboch
Copy link
Collaborator

aboch commented Dec 30, 2020

LGTM

@aboch aboch merged commit 7f66fb2 into vishvananda:master Dec 30, 2020
@pchaigno pchaigno deleted the outputmark-mask branch January 4, 2021 12:23
pchaigno added a commit to cilium/cilium that referenced this pull request Jan 4, 2021
Pull the latest version of our netlink lib dependency, which includes
support for setting the mask of XfrmState's output marks [1].

1 - vishvananda/netlink#602
Signed-off-by: Paul Chaignon <paul@cilium.io>
aditighag pushed a commit to cilium/cilium that referenced this pull request Jan 4, 2021
Pull the latest version of our netlink lib dependency, which includes
support for setting the mask of XfrmState's output marks [1].

1 - vishvananda/netlink#602
Signed-off-by: Paul Chaignon <paul@cilium.io>
christarazi pushed a commit to cilium/cilium that referenced this pull request Jan 6, 2021
[ upstream commit 1f91c0f ]

Pull the latest version of our netlink lib dependency, which includes
support for setting the mask of XfrmState's output marks [1].

1 - vishvananda/netlink#602
Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
christarazi pushed a commit to cilium/cilium that referenced this pull request Jan 6, 2021
[ upstream commit 1f91c0f ]

Pull the latest version of our netlink lib dependency, which includes
support for setting the mask of XfrmState's output marks [1].

1 - vishvananda/netlink#602
Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
christarazi pushed a commit to cilium/cilium that referenced this pull request Jan 8, 2021
[ upstream commit 1f91c0f ]

Pull the latest version of our netlink lib dependency, which includes
support for setting the mask of XfrmState's output marks [1].

1 - vishvananda/netlink#602
Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
joestringer pushed a commit to cilium/cilium that referenced this pull request Jan 13, 2021
[ upstream commit 1f91c0f ]

Pull the latest version of our netlink lib dependency, which includes
support for setting the mask of XfrmState's output marks [1].

1 - vishvananda/netlink#602
Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
christarazi pushed a commit to cilium/cilium that referenced this pull request Jan 13, 2021
[ upstream commit 1f91c0f ]

Pull the latest version of our netlink lib dependency, which includes
support for setting the mask of XfrmState's output marks [1].

1 - vishvananda/netlink#602
Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
gandro pushed a commit to cilium/cilium that referenced this pull request Jan 14, 2021
[ upstream commit 1f91c0f ]

Pull the latest version of our netlink lib dependency, which includes
support for setting the mask of XfrmState's output marks [1].

1 - vishvananda/netlink#602
Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants