Skip to content

Commit

Permalink
Added protocol to key required to properly remove masquerade/reverse_…
Browse files Browse the repository at this point in the history 
…masq map entries on tcp session termination events
  • Loading branch information
@r-caamano
r-caamano committed Aug 26, 2024
1 parent caa6cc5 commit ffc822c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/zfw_tc_ingress.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1969,13 +1969,15 @@ int bpf_sk_splice(struct __sk_buff *skb){
rk.ifindex = event.ifindex;
rk.__in46_u_dest.ip = tcp_state_key.__in46_u_src.ip;
rk.__in46_u_src.ip = tcp_state_key.__in46_u_dst.ip;
rk.protocol = IPPROTO_TCP;
struct masq_value *rv = get_reverse_masquerade(rk);
if(rv){
struct masq_key mk = {0};
mk.dport = tcph->source;
mk.sport = rv->o_sport;
mk.__in46_u_dest.ip = iph->saddr;
mk.ifindex = event.ifindex;
mk.protocol = IPPROTO_TCP;
del_masq(mk);
}
del_reverse_masq(rk);
Expand All @@ -1999,13 +2001,15 @@ int bpf_sk_splice(struct __sk_buff *skb){
rk.ifindex = event.ifindex;
rk.__in46_u_dest.ip = tcp_state_key.__in46_u_src.ip;
rk.__in46_u_src.ip = tcp_state_key.__in46_u_dst.ip;
rk.protocol = IPPROTO_TCP;
struct masq_value *rv = get_reverse_masquerade(rk);
if(rv){
struct masq_key mk = {0};
mk.dport = tcph->source;
mk.sport = rv->o_sport;
mk.__in46_u_dest.ip = iph->saddr;
mk.ifindex = event.ifindex;
mk.protocol = IPPROTO_TCP;
del_masq(mk);
}
del_reverse_masq(rk);
Expand Down
4 changes: 4 additions & 0 deletions src/zfw_tc_outbound_track.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2431,12 +2431,14 @@ int bpf_sk_splice6(struct __sk_buff *skb){
rk.ifindex = event.ifindex;
rk.__in46_u_dest.ip = tcp_state_key.__in46_u_dst.ip;
rk.__in46_u_src.ip = tcp_state_key.__in46_u_src.ip;
rk.protocol = IPPROTO_TCP;
del_reverse_masq(rk);
struct masq_key mk = {0};
mk.dport = tcph->dest;
mk.sport = tcph->source;
mk.__in46_u_dest.ip = iph->daddr;
mk.ifindex = event.ifindex;
mk.protocol = IPPROTO_TCP;
del_masq(mk);
}
del_tcp(tcp_state_key);
Expand Down Expand Up @@ -2469,12 +2471,14 @@ int bpf_sk_splice6(struct __sk_buff *skb){
rk.ifindex = event.ifindex;
rk.__in46_u_dest.ip = tcp_state_key.__in46_u_dst.ip;
rk.__in46_u_src.ip = tcp_state_key.__in46_u_src.ip;
rk.protocol = IPPROTO_TCP;
del_reverse_masq(rk);
struct masq_key mk = {0};
mk.dport = tcph->dest;
mk.sport = tcph->source;
mk.__in46_u_dest.ip = iph->daddr;
mk.ifindex = event.ifindex;
mk.protocol = IPPROTO_TCP;
del_masq(mk);
}
del_tcp(tcp_state_key);
Expand Down

0 comments on commit ffc822c

Please sign in to comment.