Commit a9ce849e authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_tables: nat: merge nft_masq protocol specific modules 



The family specific masq modules are way too small to warrant
an extra module, just place all of them in nft_masq.

before:
  text	   data	    bss	    dec	    hex	filename
   1001	    832	      0	   1833	    729	nft_masq.ko
    766	    896	      0	   1662	    67e	nft_masq_ipv4.ko
    764	    896	      0	   1660	    67c	nft_masq_ipv6.ko

after:
   2010	    960	      0	   2970	    b9a	nft_masq.ko

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent c78efc99

include/net/netfilter/nft_masq.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _NFT_MASQ_H_

#define _NFT_MASQ_H_



struct nft_masq {

	u32			flags;

	enum nft_registers      sreg_proto_min:8;

	enum nft_registers      sreg_proto_max:8;

};



extern const struct nla_policy nft_masq_policy[];



int nft_masq_init(const struct nft_ctx *ctx,

		  const struct nft_expr *expr,

		  const struct nlattr * const tb[]);



int nft_masq_dump(struct sk_buff *skb, const struct nft_expr *expr);



int nft_masq_validate(const struct nft_ctx *ctx, const struct nft_expr *expr,

		      const struct nft_data **data);



#endif /* _NFT_MASQ_H_ */

net/ipv4/netfilter/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -106,15 +106,6 @@ config NFT_CHAIN_NAT_IPV4 
	  packet transformations such as the source, destination address and

	  source and destination ports.



config NFT_MASQ_IPV4

	tristate "IPv4 masquerading support for nf_tables"

	depends on NF_TABLES_IPV4

	depends on NFT_MASQ

	select NF_NAT_MASQUERADE

	help

	  This is the expression that provides IPv4 masquerading support for

	  nf_tables.



endif # NF_TABLES



config NF_NAT_SNMP_BASIC

net/ipv4/netfilter/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ obj-$(CONFIG_NFT_CHAIN_ROUTE_IPV4) += nft_chain_route_ipv4.o 
obj-$(CONFIG_NFT_CHAIN_NAT_IPV4) += nft_chain_nat_ipv4.o

obj-$(CONFIG_NFT_REJECT_IPV4) += nft_reject_ipv4.o

obj-$(CONFIG_NFT_FIB_IPV4) += nft_fib_ipv4.o

obj-$(CONFIG_NFT_MASQ_IPV4) += nft_masq_ipv4.o

obj-$(CONFIG_NFT_DUP_IPV4) += nft_dup_ipv4.o



# flow table support

net/ipv4/netfilter/nft_masq_ipv4.c

deleted100644 → 0
+0 −90
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014 Arturo Borrero Gonzalez <arturo@debian.org>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/netlink.h>

#include <linux/netfilter.h>

#include <linux/netfilter/nf_tables.h>

#include <net/netfilter/nf_tables.h>

#include <net/netfilter/nft_masq.h>

#include <net/netfilter/ipv4/nf_nat_masquerade.h>



static void nft_masq_ipv4_eval(const struct nft_expr *expr,

			       struct nft_regs *regs,

			       const struct nft_pktinfo *pkt)

{

	struct nft_masq *priv = nft_expr_priv(expr);

	struct nf_nat_range2 range;



	memset(&range, 0, sizeof(range));

	range.flags = priv->flags;

	if (priv->sreg_proto_min) {

		range.min_proto.all = (__force __be16)nft_reg_load16(

			&regs->data[priv->sreg_proto_min]);

		range.max_proto.all = (__force __be16)nft_reg_load16(

			&regs->data[priv->sreg_proto_max]);

	}

	regs->verdict.code = nf_nat_masquerade_ipv4(pkt->skb, nft_hook(pkt),

						    &range, nft_out(pkt));

}



static void

nft_masq_ipv4_destroy(const struct nft_ctx *ctx, const struct nft_expr *expr)

{

	nf_ct_netns_put(ctx->net, NFPROTO_IPV4);

}



static struct nft_expr_type nft_masq_ipv4_type;

static const struct nft_expr_ops nft_masq_ipv4_ops = {

	.type		= &nft_masq_ipv4_type,

	.size		= NFT_EXPR_SIZE(sizeof(struct nft_masq)),

	.eval		= nft_masq_ipv4_eval,

	.init		= nft_masq_init,

	.destroy	= nft_masq_ipv4_destroy,

	.dump		= nft_masq_dump,

	.validate	= nft_masq_validate,

};



static struct nft_expr_type nft_masq_ipv4_type __read_mostly = {

	.family		= NFPROTO_IPV4,

	.name		= "masq",

	.ops		= &nft_masq_ipv4_ops,

	.policy		= nft_masq_policy,

	.maxattr	= NFTA_MASQ_MAX,

	.owner		= THIS_MODULE,

};



static int __init nft_masq_ipv4_module_init(void)

{

	int ret;



	ret = nft_register_expr(&nft_masq_ipv4_type);

	if (ret < 0)

		return ret;



	ret = nf_nat_masquerade_ipv4_register_notifier();

	if (ret)

		nft_unregister_expr(&nft_masq_ipv4_type);



	return ret;

}



static void __exit nft_masq_ipv4_module_exit(void)

{

	nft_unregister_expr(&nft_masq_ipv4_type);

	nf_nat_masquerade_ipv4_unregister_notifier();

}



module_init(nft_masq_ipv4_module_init);

module_exit(nft_masq_ipv4_module_exit);



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Arturo Borrero Gonzalez <arturo@debian.org");

MODULE_ALIAS_NFT_AF_EXPR(AF_INET, "masq");

net/ipv6/netfilter/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -40,15 +40,6 @@ config NFT_CHAIN_NAT_IPV6 
	  chain type is used to perform Network Address Translation (NAT)

	  packet transformations such as the source, destination address and

	  source and destination ports.



config NFT_MASQ_IPV6

	tristate "IPv6 masquerade support for nf_tables"

	depends on NFT_MASQ

	select NF_NAT_MASQUERADE

	help

	  This is the expression that provides IPv4 masquerading support for

	  nf_tables.



endif # NF_NAT



config NFT_REJECT_IPV6

CRA Git | Maintained and supported by SUSTech CRA and CCSE