netfilter: merge meta_bridge into nft_meta
It overcomplicates things for no reason. nft_meta_bridge only offers retrieval of bridge port interface name. Because of this being its own module, we had to export all nft_meta functions, which we can then make static again (which even reduces the size of nft_meta -- including bridge port retrieval...): before: text data bss dec hex filename 1838 832 0 2670 a6e net/bridge/netfilter/nft_meta_bridge.ko 6147 936 1 7084 1bac net/netfilter/nft_meta.ko after: 5826 936 1 6763 1a6b net/netfilter/nft_meta.ko Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal
committed by
Pablo Neira Ayuso
Pablo Neira Ayuso
parent
99a0efbeeb
commit
bd2bbdb497
@@ -8,13 +8,6 @@ menuconfig NF_TABLES_BRIDGE
|
||||
bool "Ethernet Bridge nf_tables support"
|
||||
|
||||
if NF_TABLES_BRIDGE
|
||||
|
||||
config NFT_BRIDGE_META
|
||||
tristate "Netfilter nf_table bridge meta support"
|
||||
depends on NFT_META
|
||||
help
|
||||
Add support for bridge dedicated meta key.
|
||||
|
||||
config NFT_BRIDGE_REJECT
|
||||
tristate "Netfilter nf_tables bridge reject support"
|
||||
depends on NFT_REJECT && NFT_REJECT_IPV4 && NFT_REJECT_IPV6
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
# Makefile for the netfilter modules for Link Layer filtering on a bridge.
|
||||
#
|
||||
|
||||
obj-$(CONFIG_NFT_BRIDGE_META) += nft_meta_bridge.o
|
||||
obj-$(CONFIG_NFT_BRIDGE_REJECT) += nft_reject_bridge.o
|
||||
|
||||
# packet logging
|
||||
|
||||
@@ -1,135 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2014 Intel Corporation
|
||||
*
|
||||
* 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_meta.h>
|
||||
|
||||
#include "../br_private.h"
|
||||
|
||||
static void nft_meta_bridge_get_eval(const struct nft_expr *expr,
|
||||
struct nft_regs *regs,
|
||||
const struct nft_pktinfo *pkt)
|
||||
{
|
||||
const struct nft_meta *priv = nft_expr_priv(expr);
|
||||
const struct net_device *in = nft_in(pkt), *out = nft_out(pkt);
|
||||
u32 *dest = ®s->data[priv->dreg];
|
||||
const struct net_bridge_port *p;
|
||||
|
||||
switch (priv->key) {
|
||||
case NFT_META_BRI_IIFNAME:
|
||||
if (in == NULL || (p = br_port_get_rcu(in)) == NULL)
|
||||
goto err;
|
||||
break;
|
||||
case NFT_META_BRI_OIFNAME:
|
||||
if (out == NULL || (p = br_port_get_rcu(out)) == NULL)
|
||||
goto err;
|
||||
break;
|
||||
default:
|
||||
goto out;
|
||||
}
|
||||
|
||||
strncpy((char *)dest, p->br->dev->name, IFNAMSIZ);
|
||||
return;
|
||||
out:
|
||||
return nft_meta_get_eval(expr, regs, pkt);
|
||||
err:
|
||||
regs->verdict.code = NFT_BREAK;
|
||||
}
|
||||
|
||||
static int nft_meta_bridge_get_init(const struct nft_ctx *ctx,
|
||||
const struct nft_expr *expr,
|
||||
const struct nlattr * const tb[])
|
||||
{
|
||||
struct nft_meta *priv = nft_expr_priv(expr);
|
||||
unsigned int len;
|
||||
|
||||
priv->key = ntohl(nla_get_be32(tb[NFTA_META_KEY]));
|
||||
switch (priv->key) {
|
||||
case NFT_META_BRI_IIFNAME:
|
||||
case NFT_META_BRI_OIFNAME:
|
||||
len = IFNAMSIZ;
|
||||
break;
|
||||
default:
|
||||
return nft_meta_get_init(ctx, expr, tb);
|
||||
}
|
||||
|
||||
priv->dreg = nft_parse_register(tb[NFTA_META_DREG]);
|
||||
return nft_validate_register_store(ctx, priv->dreg, NULL,
|
||||
NFT_DATA_VALUE, len);
|
||||
}
|
||||
|
||||
static struct nft_expr_type nft_meta_bridge_type;
|
||||
static const struct nft_expr_ops nft_meta_bridge_get_ops = {
|
||||
.type = &nft_meta_bridge_type,
|
||||
.size = NFT_EXPR_SIZE(sizeof(struct nft_meta)),
|
||||
.eval = nft_meta_bridge_get_eval,
|
||||
.init = nft_meta_bridge_get_init,
|
||||
.dump = nft_meta_get_dump,
|
||||
};
|
||||
|
||||
static const struct nft_expr_ops nft_meta_bridge_set_ops = {
|
||||
.type = &nft_meta_bridge_type,
|
||||
.size = NFT_EXPR_SIZE(sizeof(struct nft_meta)),
|
||||
.eval = nft_meta_set_eval,
|
||||
.init = nft_meta_set_init,
|
||||
.destroy = nft_meta_set_destroy,
|
||||
.dump = nft_meta_set_dump,
|
||||
.validate = nft_meta_set_validate,
|
||||
};
|
||||
|
||||
static const struct nft_expr_ops *
|
||||
nft_meta_bridge_select_ops(const struct nft_ctx *ctx,
|
||||
const struct nlattr * const tb[])
|
||||
{
|
||||
if (tb[NFTA_META_KEY] == NULL)
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
if (tb[NFTA_META_DREG] && tb[NFTA_META_SREG])
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
if (tb[NFTA_META_DREG])
|
||||
return &nft_meta_bridge_get_ops;
|
||||
|
||||
if (tb[NFTA_META_SREG])
|
||||
return &nft_meta_bridge_set_ops;
|
||||
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
||||
static struct nft_expr_type nft_meta_bridge_type __read_mostly = {
|
||||
.family = NFPROTO_BRIDGE,
|
||||
.name = "meta",
|
||||
.select_ops = nft_meta_bridge_select_ops,
|
||||
.policy = nft_meta_policy,
|
||||
.maxattr = NFTA_META_MAX,
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
static int __init nft_meta_bridge_module_init(void)
|
||||
{
|
||||
return nft_register_expr(&nft_meta_bridge_type);
|
||||
}
|
||||
|
||||
static void __exit nft_meta_bridge_module_exit(void)
|
||||
{
|
||||
nft_unregister_expr(&nft_meta_bridge_type);
|
||||
}
|
||||
|
||||
module_init(nft_meta_bridge_module_init);
|
||||
module_exit(nft_meta_bridge_module_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_AUTHOR("Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>");
|
||||
MODULE_ALIAS_NFT_AF_EXPR(AF_BRIDGE, "meta");
|
||||
Reference in New Issue
Block a user