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

netfilter: connlabels: move set helper to xt_connlabel 



xt_connlabel is the only user so move it.

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

include/net/netfilter/nf_conntrack_labels.h

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ static inline struct nf_conn_labels *nf_ct_labels_ext_add(struct nf_conn *ct) 
#endif

}



int nf_connlabel_set(struct nf_conn *ct, u16 bit);



int nf_connlabels_replace(struct nf_conn *ct,

			  const u32 *data, const u32 *mask, unsigned int words);

net/netfilter/nf_conntrack_labels.c

+0 −17
Original line number Diff line number Diff line
@@ -16,23 +16,6 @@ 


static spinlock_t nf_connlabels_lock;



int nf_connlabel_set(struct nf_conn *ct, u16 bit)

{

	struct nf_conn_labels *labels = nf_ct_labels_find(ct);



	if (!labels)

		return -ENOSPC;



	if (test_bit(bit, labels->bits))

		return 0;



	if (!test_and_set_bit(bit, labels->bits))

		nf_conntrack_event_cache(IPCT_LABEL, ct);



	return 0;

}

EXPORT_SYMBOL_GPL(nf_connlabel_set);



static int replace_u32(u32 *address, u32 mask, u32 new)

{

	u32 old, tmp;

net/netfilter/xt_connlabel.c

+16 −13
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/module.h>

#include <linux/skbuff.h>

#include <net/netfilter/nf_conntrack.h>

#include <net/netfilter/nf_conntrack_ecache.h>

#include <net/netfilter/nf_conntrack_labels.h>

#include <linux/netfilter/x_tables.h>
@@ -18,21 +19,12 @@ MODULE_DESCRIPTION("Xtables: add/match connection trackling labels"); 
MODULE_ALIAS("ipt_connlabel");

MODULE_ALIAS("ip6t_connlabel");



static bool connlabel_match(const struct nf_conn *ct, u16 bit)

{

	struct nf_conn_labels *labels = nf_ct_labels_find(ct);



	if (!labels)

		return false;



	return test_bit(bit, labels->bits);

}



static bool

connlabel_mt(const struct sk_buff *skb, struct xt_action_param *par)

{

	const struct xt_connlabel_mtinfo *info = par->matchinfo;

	enum ip_conntrack_info ctinfo;

	struct nf_conn_labels *labels;

	struct nf_conn *ct;

	bool invert = info->options & XT_CONNLABEL_OP_INVERT;
@@ -40,10 +32,21 @@ connlabel_mt(const struct sk_buff *skb, struct xt_action_param *par) 
	if (ct == NULL || nf_ct_is_untracked(ct))

		return invert;



	if (info->options & XT_CONNLABEL_OP_SET)

		return (nf_connlabel_set(ct, info->bit) == 0) ^ invert;

	labels = nf_ct_labels_find(ct);

	if (!labels)

		return invert;



	if (test_bit(info->bit, labels->bits))

		return !invert;



	if (info->options & XT_CONNLABEL_OP_SET) {

		if (!test_and_set_bit(info->bit, labels->bits))

			nf_conntrack_event_cache(IPCT_LABEL, ct);



	return connlabel_match(ct, info->bit) ^ invert;

		return !invert;

	}



	return invert;

}



static int connlabel_mt_check(const struct xt_mtchk_param *par)