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

Commit 6d6a3d3f authored by Paras Singh Jain's avatar Paras Singh Jain Committed by Gerrit - the friendly Code Review server
Browse files

Netfilter: Fixes for NATTYPE module compilation 



These changes allow for proper compilation of the
NATTYPE module.

Change-Id: I0d172ea7ce3280716653cfa551d27639e0032f08
Signed-off-by: default avatarParas Singh Jain <parassin@codeaurora.org>
parent 116b7811

net/ipv4/netfilter/ipt_NATTYPE.c

+13 −14
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct ipt_nattype { 
	unsigned long timeout_value;

	unsigned int nattype_cookie;

	unsigned short proto;		/* Protocol: TCP or UDP */

	struct nf_nat_range range;	/* LAN side source information */

	struct nf_nat_range2 range;	/* LAN side source information */

	unsigned short nat_port;	/* Routed NAT port */

	unsigned int dest_addr;	/* Original egress packets dst addr */

	unsigned short dest_port;/* Original egress packets destination port */
@@ -68,7 +68,8 @@ static void nattype_free(struct ipt_nattype *nte) 
/* netfilter NATTYPE nattype_refresh_timer()

 * Refresh the timer for this object.

 */

bool nattype_refresh_timer(unsigned long nat_type, unsigned long timeout_value)

bool nattype_refresh_timer_impl(unsigned long nat_type,

				unsigned long timeout_value)

{

	struct ipt_nattype *nte = (struct ipt_nattype *)nat_type;
@@ -93,9 +94,9 @@ bool nattype_refresh_timer(unsigned long nat_type, unsigned long timeout_value) 
/* netfilter NATTYPE nattype_timer_timeout()

 * The timer has gone off, self-destruct

 */

static void nattype_timer_timeout(unsigned long in_nattype)

static void nattype_timer_timeout(struct timer_list *t)

{

	struct ipt_nattype *nte = (void *)in_nattype;

	struct ipt_nattype *nte = from_timer(nte, t, timeout);



	/* netfilter NATTYPE

	 * The race with list deletion is solved by ensuring
@@ -259,13 +260,13 @@ static unsigned int nattype_nat(struct sk_buff *skb, 
{

	struct ipt_nattype *nte;



	if (par->hooknum != NF_INET_PRE_ROUTING)

	if (xt_hooknum(par) != NF_INET_PRE_ROUTING)

		return XT_CONTINUE;

	spin_lock_bh(&nattype_lock);

	list_for_each_entry(nte, &nattype_list, list) {

		struct nf_conn *ct;

		enum ip_conntrack_info ctinfo;

		struct nf_nat_range newrange;

		struct nf_nat_range2 newrange;

		unsigned int ret;



		if (!nattype_packet_in_match(nte, skb, par->targinfo))
@@ -326,7 +327,7 @@ static unsigned int nattype_forward(struct sk_buff *skb, 
	u16 nat_port;

	enum ip_conntrack_dir dir;



	if (par->hooknum != NF_INET_POST_ROUTING)

	if (xt_hooknum(par) != NF_INET_POST_ROUTING)

		return XT_CONTINUE;



	/* netfilter
@@ -357,7 +358,7 @@ static unsigned int nattype_forward(struct sk_buff *skb, 
			 * found the entry.

			 */

			if (!nattype_refresh_timer((unsigned long)nte,

						   ct->timeout.expires))

						   ct->timeout))

				break;



			/* netfilter NATTYPE
@@ -412,9 +413,7 @@ static unsigned int nattype_forward(struct sk_buff *skb, 
	/* netfilter NATTYPE

	 * Initialize the self-destruct timer.

	 */

	init_timer(&nte->timeout);

	nte->timeout.data = (unsigned long)nte;

	nte->timeout.function = nattype_timer_timeout;

	timer_setup(&nte->timeout, nattype_timer_timeout, 0);



	/* netfilter NATTYPE

	 * We have created the new nte; however, it might not be unique.
@@ -449,8 +448,8 @@ static unsigned int nattype_forward(struct sk_buff *skb, 
	/* netfilter NATTYPE

	 * Add the new entry to the list.

	 */

	nte->timeout_value = ct->timeout.expires;

	nte->timeout.expires = ct->timeout.expires + jiffies;

	nte->timeout_value = ct->timeout;

	nte->timeout.expires = ct->timeout + jiffies;

	add_timer(&nte->timeout);

	list_add(&nte->list, &nattype_list);

	ct->nattype_entry = (unsigned long)nte;
@@ -502,7 +501,7 @@ static unsigned int nattype_target(struct sk_buff *skb, 
		return XT_CONTINUE;



	DEBUGP("%s: type = %s, mode = %s\n",

	       __func_, types[info->type], modes[info->mode]);

	       __func__, types[info->type], modes[info->mode]);



	switch (info->mode) {

	case MODE_DNAT:

net/netfilter/nf_conntrack_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1818,7 +1818,7 @@ void __nf_ct_refresh_acct(struct nf_conn *ct, 
#if defined(CONFIG_IP_NF_TARGET_NATTYPE_MODULE)

	nattype_ref_timer = rcu_dereference(nattype_refresh_timer);

	if (nattype_ref_timer)

		nattype_ref_timer(ct->nattype_entry, ct->timeout.expires);

		nattype_ref_timer(ct->nattype_entry, ct->timeout);

#endif



acct:

net/netfilter/nf_conntrack_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -1703,7 +1703,7 @@ static int ctnetlink_change_timeout(struct nf_conn *ct, 
#if defined(CONFIG_IP_NF_TARGET_NATTYPE_MODULE)

	nattype_ref_timer = rcu_dereference(nattype_refresh_timer);

	if (nattype_ref_timer)

		nattype_ref_timer(ct->nattype_entry, ct->timeout.expires);

		nattype_ref_timer(ct->nattype_entry, ct->timeout);

#endif

	return 0;

}