netfilter: nat: remove l4proto->manip_pkt
This removes the last l4proto indirection, the two callers, the l3proto packet mangling helpers for ipv4 and ipv6, now call the nf_nat_l4proto_manip_pkt() helper. nf_nat_proto_{dccp,tcp,sctp,gre,icmp,icmpv6} are left behind, even though they contain no functionality anymore to not clutter this patch. Next patch will remove the empty files and the nf_nat_l4proto struct. nf_nat_proto_udp.c is renamed to nf_nat_proto.c, as it now contains the other nat manip functionality as well, not just udp and udplite. Signed-off-by:Florian Westphal <fw@strlen.de> Signed-off-by:
Pablo Neira Ayuso <pablo@netfilter.org>
Showing
- include/net/netfilter/nf_nat_l4proto.h 7 additions, 8 deletionsinclude/net/netfilter/nf_nat_l4proto.h
- net/ipv4/netfilter/Kconfig 0 additions, 5 deletionsnet/ipv4/netfilter/Kconfig
- net/ipv4/netfilter/nf_nat_l3proto_ipv4.c 2 additions, 2 deletionsnet/ipv4/netfilter/nf_nat_l3proto_ipv4.c
- net/ipv4/netfilter/nf_nat_pptp.c 0 additions, 2 deletionsnet/ipv4/netfilter/nf_nat_pptp.c
- net/ipv4/netfilter/nf_nat_proto_gre.c 0 additions, 41 deletionsnet/ipv4/netfilter/nf_nat_proto_gre.c
- net/ipv4/netfilter/nf_nat_proto_icmp.c 0 additions, 21 deletionsnet/ipv4/netfilter/nf_nat_proto_icmp.c
- net/ipv6/netfilter/nf_nat_l3proto_ipv6.c 2 additions, 2 deletionsnet/ipv6/netfilter/nf_nat_l3proto_ipv6.c
- net/ipv6/netfilter/nf_nat_proto_icmpv6.c 0 additions, 26 deletionsnet/ipv6/netfilter/nf_nat_proto_icmpv6.c
- net/netfilter/Kconfig 0 additions, 15 deletionsnet/netfilter/Kconfig
- net/netfilter/Makefile 1 addition, 1 deletionnet/netfilter/Makefile
- net/netfilter/nf_nat_proto.c 353 additions, 0 deletionsnet/netfilter/nf_nat_proto.c
- net/netfilter/nf_nat_proto_dccp.c 0 additions, 42 deletionsnet/netfilter/nf_nat_proto_dccp.c
- net/netfilter/nf_nat_proto_sctp.c 0 additions, 43 deletionsnet/netfilter/nf_nat_proto_sctp.c
- net/netfilter/nf_nat_proto_tcp.c 0 additions, 44 deletionsnet/netfilter/nf_nat_proto_tcp.c
- net/netfilter/nf_nat_proto_udp.c 0 additions, 94 deletionsnet/netfilter/nf_nat_proto_udp.c
- net/netfilter/nf_nat_proto_unknown.c 0 additions, 11 deletionsnet/netfilter/nf_nat_proto_unknown.c
Loading
Please register or sign in to comment