All of lore.kernel.org
 help / color / mirror / Atom feed
From: Taehee Yoo <ap420073@gmail.com>
To: pablo@netfilter.org, fw@strlen.de, netfilter-devel@vger.kernel.org
Cc: ap420073@gmail.com
Subject: [PATCH V3 3/5] netfilter: nf_nat_snmp_basic: replace ctinfo with dir.
Date: Mon, 20 Nov 2017 00:05:57 +0900	[thread overview]
Message-ID: <20171119150559.18125-4-ap420073@gmail.com> (raw)
In-Reply-To: <20171119150559.18125-1-ap420073@gmail.com>

The snmp_translate() receives ctinfo data to get dir value only.
because of caller already has dir value, we just replace ctinfo with dir.

Signed-off-by: Taehee Yoo <ap420073@gmail.com>
---

V3 :
 - be separated by previous patch.

V2 : 
 - Add missing nf_nat_snmp_basic.asn1 file

V1 :
 - Initial patch

 net/ipv4/netfilter/nf_nat_snmp_basic.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
index e5ec946..c8ac57f 100644
--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
@@ -1082,15 +1082,12 @@ static int snmp_parse_mangle(unsigned char *msg,
 /*
  * SNMP translation routine.
  */
-static int snmp_translate(struct nf_conn *ct,
-			  enum ip_conntrack_info ctinfo,
-			  struct sk_buff *skb)
+static int snmp_translate(struct nf_conn *ct, int dir, struct sk_buff *skb)
 {
 	struct iphdr *iph = ip_hdr(skb);
 	struct udphdr *udph = (struct udphdr *)((__be32 *)iph + iph->ihl);
 	u_int16_t udplen = ntohs(udph->len);
 	u_int16_t paylen = udplen - sizeof(struct udphdr);
-	int dir = CTINFO2DIR(ctinfo);
 	struct oct1_map map;
 
 	/*
@@ -1155,7 +1152,7 @@ static int help(struct sk_buff *skb, unsigned int protoff,
 		return NF_DROP;
 
 	spin_lock_bh(&snmp_lock);
-	ret = snmp_translate(ct, ctinfo, skb);
+	ret = snmp_translate(ct, dir, skb);
 	spin_unlock_bh(&snmp_lock);
 	return ret;
 }
-- 
2.9.3


  parent reply	other threads:[~2017-11-19 15:06 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-19 15:05 [PATCH V3 0/5] netfilter: nf_nat_snmp_basic: use ASN.1 decoder Taehee Yoo
2017-11-19 15:05 ` [PATCH V3 1/5] netfilter: nf_nat_snmp_basic: remove useless comment Taehee Yoo
2017-11-19 15:05 ` [PATCH V3 2/5] netfilter: nf_nat_snmp_basic: remove debug parameter Taehee Yoo
2017-11-19 15:05 ` Taehee Yoo [this message]
2017-11-19 15:05 ` [PATCH V3 4/5] netfilter: nf_nat_snmp_basic: use nf_ct_helper_log Taehee Yoo
2017-11-19 15:05 ` [PATCH V3 5/5] netfilter: nf_nat_snmp_basic: use asn1 decoder library Taehee Yoo
2017-12-06  8:15 ` [PATCH V3 0/5] netfilter: nf_nat_snmp_basic: use ASN.1 decoder Pablo Neira Ayuso
2017-12-06  9:06   ` Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171119150559.18125-4-ap420073@gmail.com \
    --to=ap420073@gmail.com \
    --cc=fw@strlen.de \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.