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

Jump to bottom

v1.14: backport IPv6 host and router IP macro fix #28435

Merged
merged 1 commit into from
Oct 6, 2023
Merged

v1.14: backport IPv6 host and router IP macro fix #28435

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 13 additions & 8 deletions bpf/lib/static_data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,19 @@

#define DEFINE_IPV6(NAME, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16) \
DEFINE_U64_I(NAME, 1) = bpf_cpu_to_be64( \
(__u64)(a1) << 56 | (__u64)(a2) << 48 | (__u64)(a3) << 40 | \
(__u64)(a4) << 32 | (a5) << 24 | (a6) << 16 | (a7) << 8 | (a8)); \
(__u64)(__u8)(a1) << 56 | (__u64)(__u8)(a2) << 48 | \
(__u64)(__u8)(a3) << 40 | (__u64)(__u8)(a4) << 32 | \
(__u64)(__u8)(a5) << 24 | (__u64)(__u8)(a6) << 16 | \
(__u64)(__u8)(a7) << 8 | (__u64)(__u8)(a8)); \
DEFINE_U64_I(NAME, 2) = bpf_cpu_to_be64( \
(__u64)(a9) << 56 | (__u64)(a10) << 48 | (__u64)(a11) << 40 | \
(__u64)(a12) << 32 | (a13) << 24 | (a14) << 16 | (a15) << 8 | (a16));

#define DEFINE_MAC(NAME, a1, a2, a3, a4, a5, a6) \
DEFINE_U32_I(NAME, 1) = (a1) << 24 | (a2) << 16 | (a3) << 8 | (a4); \
DEFINE_U32_I(NAME, 2) = (a5) << 8 | (a6)
(__u64)(__u8)(a9) << 56 | (__u64)(__u8)(a10) << 48 | \
(__u64)(__u8)(a11) << 40 | (__u64)(__u8)(a12) << 32 | \
(__u64)(__u8)(a13) << 24 | (__u64)(__u8)(a14) << 16 | \
(__u64)(__u8)(a15) << 8 | (__u64)(__u8)(a16));

#define DEFINE_MAC(NAME, a1, a2, a3, a4, a5, a6) \
DEFINE_U32_I(NAME, 1) = (__u32)(__u8)(a1) << 24 | (__u32)(__u8)(a2) << 16 | \
(__u32)(__u8)(a3) << 8 | (__u32)(__u8)(a4); \
DEFINE_U32_I(NAME, 2) = (__u32)(__u8)(a5) << 8 | (__u32)(__u8)(a6)

#endif /* __LIB_STATIC_DATA_H_ */
19 changes: 12 additions & 7 deletions bpf/tests/config_replacement.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@

#ifndef LXC_IP
#define LXC_IP_1 bpf_cpu_to_be64( \
(__u64)(0xbe) << 56 | (__u64)(0xef) << 48 | (__u64)(0) << 40 | (__u64)(0) << 32 | \
(0) << 24 | (0) << 16 | (0) << 8 | (0x01))
(__u64)(0xbe) << 56 | (__u64)(0xef) << 48 | \
(__u64)(0x00) << 40 | (__u64)(0x00) << 32 | \
(__u64)(0x00) << 24 | (__u64)(0x00) << 16 | \
(__u64)(0x00) << 8 | (__u64)(0x01))
#define LXC_IP_2 bpf_cpu_to_be64( \
(__u64)(0) << 56 | (__u64)(0) << 48 | (__u64)(0) << 40 | (__u64)(0x01) << 32 | \
(0x01) << 24 | (0x65) << 16 | (0x82) << 8 | (0xbc))
(__u64)(0x00) << 56 | (__u64)(0x00) << 48 | \
(__u64)(0x00) << 40 | (__u64)(0x01) << 32 | \
(__u64)(0x01) << 24 | (__u64)(0x65) << 16 | \
(__u64)(0x82) << 8 | (__u64)(0xbc))
#define LXC_IP { { LXC_IP_1, LXC_IP_2 } }
#endif /* LXC_IP */

Expand Down Expand Up @@ -75,9 +79,10 @@

#endif /* ___EP_CONFIG____ */

#define DEFINE_MAC(NAME, a1, a2, a3, a4, a5, a6) \
DEFINE_U32_I(NAME, 1) = (a1) << 24 | (a2) << 16 | (a3) << 8 | (a4); \
DEFINE_U32_I(NAME, 2) = (a5) << 8 | (a6)
#define DEFINE_MAC(NAME, a1, a2, a3, a4, a5, a6) \
DEFINE_U32_I(NAME, 1) = (__u32)(__u8)(a1) << 24 | (__u32)(__u8)(a2) << 16 | \
(__u32)(__u8)(a3) << 8 | (__u32)(__u8)(a4); \
DEFINE_U32_I(NAME, 2) = (__u32)(__u8)(a5) << 8 | (__u32)(__u8)(a6)

#ifndef NODE_MAC
#define NODE_MAC_1 (0xde) << 24 | (0xad) << 16 | (0xbe) << 8 | (0xef)
Expand Down