Skip to content

Commit

Permalink
[NETNS][DCCPV6]: Make per-net socket lookup.
Browse files Browse the repository at this point in the history
The inet6_lookup family of functions requires a net to lookup
a socket in, so give a proper one to them.

No more things to do for dccpv6, since routing is OK and the
ipv4-like transport layer filtering is not done for ipv6.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Apr 14, 2008
1 parent 334527d commit 671a1c7
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions net/dccp/ipv6.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
int err;
__u64 seq;

sk = inet6_lookup(&init_net, &dccp_hashinfo, &hdr->daddr, dh->dccph_dport,
sk = inet6_lookup(dev_net(skb->dev), &dccp_hashinfo,
&hdr->daddr, dh->dccph_dport,
&hdr->saddr, dh->dccph_sport, inet6_iif(skb));

if (sk == NULL) {
Expand Down Expand Up @@ -359,7 +360,7 @@ static struct sock *dccp_v6_hnd_req(struct sock *sk,struct sk_buff *skb)
if (req != NULL)
return dccp_check_req(sk, skb, req, prev);

nsk = __inet6_lookup_established(&init_net, &dccp_hashinfo,
nsk = __inet6_lookup_established(sock_net(sk), &dccp_hashinfo,
&iph->saddr, dh->dccph_sport,
&iph->daddr, ntohs(dh->dccph_dport),
inet6_iif(skb));
Expand Down Expand Up @@ -790,8 +791,8 @@ static int dccp_v6_rcv(struct sk_buff *skb)

/* Step 2:
* Look up flow ID in table and get corresponding socket */
sk = __inet6_lookup(&init_net, &dccp_hashinfo, &ipv6_hdr(skb)->saddr,
dh->dccph_sport,
sk = __inet6_lookup(dev_net(skb->dst->dev), &dccp_hashinfo,
&ipv6_hdr(skb)->saddr, dh->dccph_sport,
&ipv6_hdr(skb)->daddr, ntohs(dh->dccph_dport),
inet6_iif(skb));
/*
Expand Down

0 comments on commit 671a1c7

Please sign in to comment.