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

Make xfrm linux-only #917

Merged
merged 1 commit into from
Oct 24, 2023
Merged

Make xfrm linux-only #917

merged 1 commit into from
Oct 24, 2023

Conversation

tklauser
Copy link
Contributor

@tklauser tklauser commented Oct 5, 2023

The xfrm framework is linux-only. Only implement the respective types for GOOS=linux to avoid dependencies to x/sys/unix on non-linux or non-unix platforms. Provide dummy XfrmPolicy and XfrmState types for the globally defined XfrmPolicy* and XfrmState* functions.

@tklauser
Copy link
Contributor Author

tklauser commented Oct 5, 2023

The TestRouteExtraFields failure is not caused by this PR, it's already present on main, see #773 (comment)

@tklauser
Copy link
Contributor Author

tklauser commented Oct 5, 2023

@aboch @vishvananda PTAL

The xfrm framework is linux-only. Only implement the respective types
for GOOS=linux to avoid dependencies to x/sys/unix on non-linux or
non-unix platforms. Provide dummy XfrmPolicy and XfrmState types for the
globally defined XfrmPolicy* and XfrmState* functions.
@tklauser
Copy link
Contributor Author

Rebased to fix the test failures.

@aboch aboch merged commit 77df5d3 into vishvananda:main Oct 24, 2023
2 checks passed
@tklauser tklauser deleted the xfrm-linux-only branch October 25, 2023 08:03
tklauser added a commit to cilium/cilium that referenced this pull request Oct 25, 2023
This pulls in a few fixes (namely
vishvananda/netlink#917) which avoids building
the netlink package on non-linux platforms, simplifying its use for
cross-platform builds e.g.  in cilium-cli which transitively (through
cilium/cilium) vendors the netlink package.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
michi-covalent pushed a commit to cilium/cilium that referenced this pull request Oct 25, 2023
This pulls in a few fixes (namely
vishvananda/netlink#917) which avoids building
the netlink package on non-linux platforms, simplifying its use for
cross-platform builds e.g.  in cilium-cli which transitively (through
cilium/cilium) vendors the netlink package.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
pjablonski123 pushed a commit to pjablonski123/cilium that referenced this pull request Oct 27, 2023
This pulls in a few fixes (namely
vishvananda/netlink#917) which avoids building
the netlink package on non-linux platforms, simplifying its use for
cross-platform builds e.g.  in cilium-cli which transitively (through
cilium/cilium) vendors the netlink package.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
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.

3 participants