Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f76a47c8 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy
Browse files

netfilter: xt_NFQUEUE: consolidate v4/v6 targets into one 



Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent 076f7839

net/netfilter/xt_NFQUEUE.c

+12 −28
Original line number Diff line number Diff line
@@ -49,17 +49,6 @@ static u32 hash_v4(const struct sk_buff *skb) 
	return jhash_2words((__force u32)ipaddr, iph->protocol, jhash_initval);

}



static unsigned int

nfqueue_tg4_v1(struct sk_buff *skb, const struct xt_target_param *par)

{

	const struct xt_NFQ_info_v1 *info = par->targinfo;

	u32 queue = info->queuenum;



	if (info->queues_total > 1)

		queue = hash_v4(skb) % info->queues_total + queue;

	return NF_QUEUE_NR(queue);

}



#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)

static u32 hash_v6(const struct sk_buff *skb)

{
@@ -73,18 +62,24 @@ static u32 hash_v6(const struct sk_buff *skb) 


	return jhash2((__force u32 *)addr, ARRAY_SIZE(addr), jhash_initval);

}

#endif



static unsigned int

nfqueue_tg6_v1(struct sk_buff *skb, const struct xt_target_param *par)

nfqueue_tg_v1(struct sk_buff *skb, const struct xt_target_param *par)

{

	const struct xt_NFQ_info_v1 *info = par->targinfo;

	u32 queue = info->queuenum;



	if (info->queues_total > 1)

	if (info->queues_total > 1) {

		if (par->target->family == NFPROTO_IPV4)

			queue = hash_v4(skb) % info->queues_total + queue;

#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)

		else if (par->target->family == NFPROTO_IPV6)

			queue = hash_v6(skb) % info->queues_total + queue;

#endif

	}

	return NF_QUEUE_NR(queue);

}

#endif



static bool nfqueue_tg_v1_check(const struct xt_tgchk_param *par)

{
@@ -119,23 +114,12 @@ static struct xt_target nfqueue_tg_reg[] __read_mostly = { 
	{

		.name		= "NFQUEUE",

		.revision	= 1,

		.family		= NFPROTO_IPV4,

		.checkentry	= nfqueue_tg_v1_check,

		.target		= nfqueue_tg4_v1,

		.targetsize	= sizeof(struct xt_NFQ_info_v1),

		.me		= THIS_MODULE,

	},

#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)

	{

		.name		= "NFQUEUE",

		.revision	= 1,

		.family		= NFPROTO_IPV6,

		.family		= NFPROTO_UNSPEC,

		.checkentry	= nfqueue_tg_v1_check,

		.target		= nfqueue_tg6_v1,

		.target		= nfqueue_tg_v1,

		.targetsize	= sizeof(struct xt_NFQ_info_v1),

		.me		= THIS_MODULE,

	},

#endif

};



static int __init nfqueue_tg_init(void)