3bf195ae60
before:
text data bss dec hex filename
16566 1576 4136 22278 5706 nf_nat.ko
3598 844 0 4442 115a nf_nat_ipv6.ko
3187 844 0 4031 fbf nf_nat_ipv4.ko
after:
text data bss dec hex filename
22948 1612 4136 28696 7018 nf_nat.ko
... with ipv4/v6 nat now provided directly via nf_nat.ko.
Also changes:
ret = nf_nat_ipv4_fn(priv, skb, state);
if (ret != NF_DROP && ret != NF_STOLEN &&
into
if (ret != NF_ACCEPT)
return ret;
everywhere.
The nat hooks never should return anything other than
ACCEPT or DROP (and the latter only in rare error cases).
The original code uses multi-line ANDing including assignment-in-if:
if (ret != NF_DROP && ret != NF_STOLEN &&
!(IPCB(skb)->flags & IPSKB_XFRM_TRANSFORMED) &&
(ct = nf_ct_get(skb, &ctinfo)) != NULL) {
I removed this while moving, breaking those in separate conditionals
and moving the assignments into extra lines.
checkpatch still generates some warnings:
1. Overly long lines (of moved code).
Breaking them is even more ugly. so I kept this as-is.
2. use of extern function declarations in a .c file.
This is necessary evil, we must call
nf_nat_l3proto_register() from the nat core now.
All l3proto related functions are removed later in this series,
those prototypes are then removed as well.
v2: keep empty nf_nat_ipv6_csum_update stub for CONFIG_IPV6=n case.
v3: remove IS_ENABLED(NF_NAT_IPV4/6) tests, NF_NAT_IPVx toggles
are removed here.
v4: also get rid of the assignments in conditionals.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
30 lines
619 B
Plaintext
30 lines
619 B
Plaintext
CONFIG_USER_NS=y
|
|
CONFIG_BPF_SYSCALL=y
|
|
CONFIG_TEST_BPF=m
|
|
CONFIG_NUMA=y
|
|
CONFIG_NET_VRF=y
|
|
CONFIG_NET_L3_MASTER_DEV=y
|
|
CONFIG_IPV6=y
|
|
CONFIG_IPV6_MULTIPLE_TABLES=y
|
|
CONFIG_VETH=y
|
|
CONFIG_INET_XFRM_MODE_TUNNEL=y
|
|
CONFIG_NET_IPVTI=y
|
|
CONFIG_INET6_XFRM_MODE_TUNNEL=y
|
|
CONFIG_IPV6_VTI=y
|
|
CONFIG_DUMMY=y
|
|
CONFIG_BRIDGE=y
|
|
CONFIG_VLAN_8021Q=y
|
|
CONFIG_NETFILTER=y
|
|
CONFIG_NETFILTER_ADVANCED=y
|
|
CONFIG_NF_CONNTRACK=m
|
|
CONFIG_NF_NAT=m
|
|
CONFIG_IP6_NF_IPTABLES=m
|
|
CONFIG_IP_NF_IPTABLES=m
|
|
CONFIG_IP6_NF_NAT=m
|
|
CONFIG_IP_NF_NAT=m
|
|
CONFIG_NF_TABLES=m
|
|
CONFIG_NF_TABLES_IPV6=y
|
|
CONFIG_NF_TABLES_IPV4=y
|
|
CONFIG_NFT_CHAIN_NAT_IPV6=m
|
|
CONFIG_NFT_CHAIN_NAT_IPV4=m
|