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

Kmesh: repair kmesh manager not effect in sockops on oe 23.03 #301

Merged
merged 1 commit into from
May 8, 2024
Merged

Kmesh: repair kmesh manager not effect in sockops on oe 23.03 #301

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
6 changes: 5 additions & 1 deletion bpf/kmesh/workload/sockops_tuple.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,19 @@ static inline bool conn_from_cni_sim_add(struct bpf_sock_ops *skops)
#if !OE_23_03
return ((bpf_ntohl(skops->remote_ip4) == 1) && (bpf_ntohl(skops->remote_port) == 0x3a1));
#else
return ((bpf_ntohl(skops->remote_ip4) == 1) && (bpf_ntohl(skops->remote_port) == 0xa1030000));
return ((bpf_ntohl(skops->remote_ip4) == 1) && (bpf_ntohl(skops->remote_port) == 0x3a10000));
Copy link
Member

Choose a reason for hiding this comment

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

Is this only OE2303 behaves like this? And how about the other os releases?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, this is a bug in OE2303. However, OE2303 has only a half-year maintenance period. Now OE2303 is no longer updated. Therefore, we need to determine the OE2303 policy and whether to continue the maintenance support.

Copy link
Member

Choose a reason for hiding this comment

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

Good to know. We can discuss on community meeting.

But this fix makes sense

#endif
}

static inline bool conn_from_cni_sim_delete(struct bpf_sock_ops *skops)
{
// cni sim connect 0.0.0.1:930(0x3a2)
// 0x3a2 is the specific port handled by the cni for disable Kmesh
#if !OE_23_03
return ((bpf_ntohl(skops->remote_ip4) == 1) && (bpf_ntohl(skops->remote_port) == 0x3a2));
#else
return ((bpf_ntohl(skops->remote_ip4) == 1) && (bpf_ntohl(skops->remote_port) == 0x3a20000));
#endif
}

static inline bool ipv4_mapped_addr(__u32 ip6[4])
Expand Down
Loading