Skip to contentSkip to conversation

netfilter: nf_nat_snmp_basic: replace ctinfo with dir.

PATCH In review Taehee Yoo 1 participant 1 message Jan 7, 2018

Subsystems (2)
Networking netfilter
lore
Share & tools
lore

Taehee Yoo

author
#0 lore raw

PATCH v5 3/5 netfilter: nf_nat_snmp_basic: replace ctinfo with dir.

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 <[email protected]>

---

V5 :
- fix sparse error

V4 :
- rename nf_nat_snmp_basic.c to nf_nat_snmp_basic_main.c to fix compile error

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(-)
net/ipv4/netfilter/nf_nat_snmp_basic.c +2 -5
index e5ec946..c8ac57f 100644
@@ -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;
 }
Signature · 1 line
2.9.3