mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-07-11 00:09:18 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix(ebpf): udp problem caused by #221 by accident (#225)

Browse Source
This commit is contained in:
mzz
2023-07-16 23:27:22 +08:00
committed by GitHub
parent b34b5acfe9
commit 936b2a09df
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
control/kern/tproxy.c
View File

@ -368,6 +368,7 @@ get_tuples(const struct __sk_buff *skb, struct tuples *tuples,
const struct tcphdr *tcph, const struct udphdr *udph, __u8 l4proto) { const struct tcphdr *tcph, const struct udphdr *udph, __u8 l4proto) {
__builtin_memset(tuples, 0, sizeof(*tuples)); __builtin_memset(tuples, 0, sizeof(*tuples));
tuples->l4proto = l4proto; tuples->l4proto = l4proto;
if (skb->protocol == bpf_htons(ETH_P_IP)) { if (skb->protocol == bpf_htons(ETH_P_IP)) {
tuples->sip.u6_addr32[2] = bpf_htonl(0x0000ffff); tuples->sip.u6_addr32[2] = bpf_htonl(0x0000ffff);
tuples->sip.u6_addr32[3] = iph->saddr; tuples->sip.u6_addr32[3] = iph->saddr;
@ -684,15 +685,12 @@ parse_transport(const struct __sk_buff *skb, __u32 eth_h_len,
} break; } break;
case IPPROTO_UDP: { case IPPROTO_UDP: {
if ((ret = if ((ret =
bpf_skb_load_bytes(skb, offset, tcph, sizeof(struct tcphdr)))) { bpf_skb_load_bytes(skb, offset, udph, sizeof(struct udphdr)))) {
// Not a complete tcphdr. // Not a complete udphdr.
return -EFAULT; return -EFAULT;
} }
} break; } break;
default: default:
/// EXPECTED: Maybe ICMP, MPLS, etc.
// bpf_printk("IP but not supported packet: protocol is %u",
// iph->protocol);
return 1; return 1;
} }
*ihl = iph->ihl; *ihl = iph->ihl;
@ -710,7 +708,10 @@ parse_transport(const struct __sk_buff *skb, __u32 eth_h_len,
return handle_ipv6_extensions(skb, offset, ipv6h->nexthdr, icmp6h, tcph, return handle_ipv6_extensions(skb, offset, ipv6h->nexthdr, icmp6h, tcph,
udph, ihl, l4proto); udph, ihl, l4proto);
} else { } else {
bpf_printk("unknown link proto: %u", bpf_ntohl(skb->protocol)); /// EXPECTED: Maybe ICMP, MPLS, etc.
// bpf_printk("IP but not supported packet: protocol is %u",
// iph->protocol);
// bpf_printk("unknown link proto: %u", bpf_ntohl(skb->protocol));
return 1; return 1;
} }
} }