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

netfilter: nf_tables: nat: merge nft_redir protocol specific modules 



before:
 text	   data	    bss	    dec	    hex	filename
 990	    832	      0	   1822	    71e nft_redir.ko
 697	    896	      0	   1593	    639 nft_redir_ipv4.ko
 713	    896	      0	   1609	    649	nft_redir_ipv6.ko

after:
 text	   data	    bss	    dec	    hex	filename
 1910	    960	      0	   2870	    b36	nft_redir.ko

size is reduced, all helpers from nft_redir.ko can be made static.

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

include/net/netfilter/nft_redir.h

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

#ifndef _NFT_REDIR_H_

#define _NFT_REDIR_H_



struct nft_redir {

	enum nft_registers	sreg_proto_min:8;

	enum nft_registers	sreg_proto_max:8;

	u16			flags;

};



extern const struct nla_policy nft_redir_policy[];



int nft_redir_init(const struct nft_ctx *ctx,

		   const struct nft_expr *expr,

		   const struct nlattr * const tb[]);



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



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

		       const struct nft_data **data);



#endif /* _NFT_REDIR_H_ */

net/ipv4/netfilter/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -115,14 +115,6 @@ config NFT_MASQ_IPV4 
	  This is the expression that provides IPv4 masquerading support for

	  nf_tables.



config NFT_REDIR_IPV4

	tristate "IPv4 redirect support for nf_tables"

	depends on NF_TABLES_IPV4

	depends on NFT_REDIR

	select NF_NAT_REDIRECT

	help

	  This is the expression that provides IPv4 redirect 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
@@ -29,7 +29,6 @@ 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_REDIR_IPV4) += nft_redir_ipv4.o

obj-$(CONFIG_NFT_DUP_IPV4) += nft_dup_ipv4.o



# flow table support

net/ipv4/netfilter/nft_redir_ipv4.c

deleted100644 → 0
+0 −82
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/nf_nat.h>

#include <net/netfilter/nf_nat_redirect.h>

#include <net/netfilter/nft_redir.h>



static void nft_redir_ipv4_eval(const struct nft_expr *expr,

				struct nft_regs *regs,

				const struct nft_pktinfo *pkt)

{

	struct nft_redir *priv = nft_expr_priv(expr);

	struct nf_nat_ipv4_multi_range_compat mr;



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

	if (priv->sreg_proto_min) {

		mr.range[0].min.all = (__force __be16)nft_reg_load16(

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

		mr.range[0].max.all = (__force __be16)nft_reg_load16(

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

		mr.range[0].flags |= NF_NAT_RANGE_PROTO_SPECIFIED;

	}



	mr.range[0].flags |= priv->flags;



	regs->verdict.code = nf_nat_redirect_ipv4(pkt->skb, &mr, nft_hook(pkt));

}



static void

nft_redir_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_redir_ipv4_type;

static const struct nft_expr_ops nft_redir_ipv4_ops = {

	.type		= &nft_redir_ipv4_type,

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

	.eval		= nft_redir_ipv4_eval,

	.init		= nft_redir_init,

	.destroy	= nft_redir_ipv4_destroy,

	.dump		= nft_redir_dump,

	.validate	= nft_redir_validate,

};



static struct nft_expr_type nft_redir_ipv4_type __read_mostly = {

	.family		= NFPROTO_IPV4,

	.name		= "redir",

	.ops		= &nft_redir_ipv4_ops,

	.policy		= nft_redir_policy,

	.maxattr	= NFTA_REDIR_MAX,

	.owner		= THIS_MODULE,

};



static int __init nft_redir_ipv4_module_init(void)

{

	return nft_register_expr(&nft_redir_ipv4_type);

}



static void __exit nft_redir_ipv4_module_exit(void)

{

	nft_unregister_expr(&nft_redir_ipv4_type);

}



module_init(nft_redir_ipv4_module_init);

module_exit(nft_redir_ipv4_module_exit);



MODULE_LICENSE("GPL");

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

MODULE_ALIAS_NFT_AF_EXPR(AF_INET, "redir");

net/ipv6/netfilter/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -49,14 +49,6 @@ config NFT_MASQ_IPV6 
	  This is the expression that provides IPv4 masquerading support for

	  nf_tables.



config NFT_REDIR_IPV6

	tristate "IPv6 redirect support for nf_tables"

	depends on NFT_REDIR

	select NF_NAT_REDIRECT

	help

	  This is the expression that provides IPv4 redirect support for

	  nf_tables.



endif # NF_NAT



config NFT_REJECT_IPV6