Skip to content

Commit

Permalink
netfilter: nf_nat_snmp_basic: replace ctinfo with dir.
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Taehee Yoo authored and Pablo Neira Ayuso committed Jan 19, 2018
1 parent e29e5dd commit 8b8f081
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions net/ipv4/netfilter/nf_nat_snmp_basic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 8b8f081

Please sign in to comment.