Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 90056
b: refs/heads/master
c: b8ad0cb
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Lezcano authored and David S. Miller committed Mar 7, 2008
1 parent 16b673d commit d6c2e8b
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 39 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e504799276e53045a9b597f24c1b456552482f63
refs/heads/master: b8ad0cbc58f703972e9e37c4e2a8081dd7e6a551
1 change: 1 addition & 0 deletions trunk/include/net/netns/ipv6.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,6 @@ struct netns_ipv6 {
struct sock **icmp_sk;
struct sock *ndisc_sk;
struct sock *tcp_sk;
struct sock *igmp_sk;
};
#endif
116 changes: 78 additions & 38 deletions trunk/net/ipv6/mcast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@ static struct in6_addr mld2_all_mcr = MLD2_ALL_MCR_INIT;
/* Big mc list lock for all the sockets */
static DEFINE_RWLOCK(ipv6_sk_mc_lock);

static struct socket *igmp6_socket;

int __ipv6_dev_mc_dec(struct inet6_dev *idev, struct in6_addr *addr);

static void igmp6_join_group(struct ifmcaddr6 *ma);
Expand Down Expand Up @@ -183,6 +181,7 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, struct in6_addr *addr)
struct net_device *dev = NULL;
struct ipv6_mc_socklist *mc_lst;
struct ipv6_pinfo *np = inet6_sk(sk);
struct net *net = sk->sk_net;
int err;

if (!ipv6_addr_is_multicast(addr))
Expand All @@ -208,14 +207,14 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, struct in6_addr *addr)

if (ifindex == 0) {
struct rt6_info *rt;
rt = rt6_lookup(&init_net, addr, NULL, 0, 0);
rt = rt6_lookup(net, addr, NULL, 0, 0);
if (rt) {
dev = rt->rt6i_dev;
dev_hold(dev);
dst_release(&rt->u.dst);
}
} else
dev = dev_get_by_index(&init_net, ifindex);
dev = dev_get_by_index(net, ifindex);

if (dev == NULL) {
sock_kfree_s(sk, mc_lst, sizeof(*mc_lst));
Expand Down Expand Up @@ -256,6 +255,7 @@ int ipv6_sock_mc_drop(struct sock *sk, int ifindex, struct in6_addr *addr)
{
struct ipv6_pinfo *np = inet6_sk(sk);
struct ipv6_mc_socklist *mc_lst, **lnk;
struct net *net = sk->sk_net;

write_lock_bh(&ipv6_sk_mc_lock);
for (lnk = &np->ipv6_mc_list; (mc_lst = *lnk) !=NULL ; lnk = &mc_lst->next) {
Expand All @@ -266,7 +266,8 @@ int ipv6_sock_mc_drop(struct sock *sk, int ifindex, struct in6_addr *addr)
*lnk = mc_lst->next;
write_unlock_bh(&ipv6_sk_mc_lock);

if ((dev = dev_get_by_index(&init_net, mc_lst->ifindex)) != NULL) {
dev = dev_get_by_index(net, mc_lst->ifindex);
if (dev != NULL) {
struct inet6_dev *idev = in6_dev_get(dev);

(void) ip6_mc_leave_src(sk, mc_lst, idev);
Expand All @@ -286,22 +287,24 @@ int ipv6_sock_mc_drop(struct sock *sk, int ifindex, struct in6_addr *addr)
return -EADDRNOTAVAIL;
}

static struct inet6_dev *ip6_mc_find_dev(struct in6_addr *group, int ifindex)
static struct inet6_dev *ip6_mc_find_dev(struct net *net,
struct in6_addr *group,
int ifindex)
{
struct net_device *dev = NULL;
struct inet6_dev *idev = NULL;

if (ifindex == 0) {
struct rt6_info *rt;

rt = rt6_lookup(&init_net, group, NULL, 0, 0);
rt = rt6_lookup(net, group, NULL, 0, 0);
if (rt) {
dev = rt->rt6i_dev;
dev_hold(dev);
dst_release(&rt->u.dst);
}
} else
dev = dev_get_by_index(&init_net, ifindex);
dev = dev_get_by_index(net, ifindex);

if (!dev)
return NULL;
Expand All @@ -324,6 +327,7 @@ void ipv6_sock_mc_close(struct sock *sk)
{
struct ipv6_pinfo *np = inet6_sk(sk);
struct ipv6_mc_socklist *mc_lst;
struct net *net = sk->sk_net;

write_lock_bh(&ipv6_sk_mc_lock);
while ((mc_lst = np->ipv6_mc_list) != NULL) {
Expand All @@ -332,7 +336,7 @@ void ipv6_sock_mc_close(struct sock *sk)
np->ipv6_mc_list = mc_lst->next;
write_unlock_bh(&ipv6_sk_mc_lock);

dev = dev_get_by_index(&init_net, mc_lst->ifindex);
dev = dev_get_by_index(net, mc_lst->ifindex);
if (dev) {
struct inet6_dev *idev = in6_dev_get(dev);

Expand Down Expand Up @@ -361,6 +365,7 @@ int ip6_mc_source(int add, int omode, struct sock *sk,
struct inet6_dev *idev;
struct ipv6_pinfo *inet6 = inet6_sk(sk);
struct ip6_sf_socklist *psl;
struct net *net = sk->sk_net;
int i, j, rv;
int leavegroup = 0;
int pmclocked = 0;
Expand All @@ -376,7 +381,7 @@ int ip6_mc_source(int add, int omode, struct sock *sk,
if (!ipv6_addr_is_multicast(group))
return -EINVAL;

idev = ip6_mc_find_dev(group, pgsr->gsr_interface);
idev = ip6_mc_find_dev(net, group, pgsr->gsr_interface);
if (!idev)
return -ENODEV;
dev = idev->dev;
Expand Down Expand Up @@ -500,6 +505,7 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf)
struct inet6_dev *idev;
struct ipv6_pinfo *inet6 = inet6_sk(sk);
struct ip6_sf_socklist *newpsl, *psl;
struct net *net = sk->sk_net;
int leavegroup = 0;
int i, err;

Expand All @@ -511,7 +517,7 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf)
gsf->gf_fmode != MCAST_EXCLUDE)
return -EINVAL;

idev = ip6_mc_find_dev(group, gsf->gf_interface);
idev = ip6_mc_find_dev(net, group, gsf->gf_interface);

if (!idev)
return -ENODEV;
Expand Down Expand Up @@ -592,13 +598,14 @@ int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf,
struct net_device *dev;
struct ipv6_pinfo *inet6 = inet6_sk(sk);
struct ip6_sf_socklist *psl;
struct net *net = sk->sk_net;

group = &((struct sockaddr_in6 *)&gsf->gf_group)->sin6_addr;

if (!ipv6_addr_is_multicast(group))
return -EINVAL;

idev = ip6_mc_find_dev(group, gsf->gf_interface);
idev = ip6_mc_find_dev(net, group, gsf->gf_interface);

if (!idev)
return -ENODEV;
Expand Down Expand Up @@ -1393,7 +1400,8 @@ mld_scount(struct ifmcaddr6 *pmc, int type, int gdeleted, int sdeleted)

static struct sk_buff *mld_newpack(struct net_device *dev, int size)
{
struct sock *sk = igmp6_socket->sk;
struct net *net = dev->nd_net;
struct sock *sk = net->ipv6.igmp_sk;
struct sk_buff *skb;
struct mld2_report *pmr;
struct in6_addr addr_buf;
Expand Down Expand Up @@ -1440,6 +1448,7 @@ static void mld_sendpack(struct sk_buff *skb)
(struct mld2_report *)skb_transport_header(skb);
int payload_len, mldlen;
struct inet6_dev *idev = in6_dev_get(skb->dev);
struct net *net = skb->dev->nd_net;
int err;
struct flowi fl;

Expand All @@ -1459,7 +1468,7 @@ static void mld_sendpack(struct sk_buff *skb)
goto err_out;
}

icmpv6_flow_init(igmp6_socket->sk, &fl, ICMPV6_MLD2_REPORT,
icmpv6_flow_init(net->ipv6.igmp_sk, &fl, ICMPV6_MLD2_REPORT,
&ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr,
skb->dev->ifindex);

Expand Down Expand Up @@ -1753,7 +1762,8 @@ static void mld_send_cr(struct inet6_dev *idev)

static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
{
struct sock *sk = igmp6_socket->sk;
struct net *net = dev->nd_net;
struct sock *sk = net->ipv6.igmp_sk;
struct inet6_dev *idev;
struct sk_buff *skb;
struct icmp6hdr *hdr;
Expand Down Expand Up @@ -1824,7 +1834,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
goto err_out;
}

icmpv6_flow_init(igmp6_socket->sk, &fl, type,
icmpv6_flow_init(sk, &fl, type,
&ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr,
skb->dev->ifindex);

Expand Down Expand Up @@ -2334,6 +2344,7 @@ void ipv6_mc_destroy_dev(struct inet6_dev *idev)

#ifdef CONFIG_PROC_FS
struct igmp6_mc_iter_state {
struct seq_net_private p;
struct net_device *dev;
struct inet6_dev *idev;
};
Expand All @@ -2344,9 +2355,10 @@ static inline struct ifmcaddr6 *igmp6_mc_get_first(struct seq_file *seq)
{
struct ifmcaddr6 *im = NULL;
struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq);
struct net *net = state->p.net;

state->idev = NULL;
for_each_netdev(&init_net, state->dev) {
for_each_netdev(net, state->dev) {
struct inet6_dev *idev;
idev = in6_dev_get(state->dev);
if (!idev)
Expand Down Expand Up @@ -2448,19 +2460,20 @@ static const struct seq_operations igmp6_mc_seq_ops = {

static int igmp6_mc_seq_open(struct inode *inode, struct file *file)
{
return seq_open_private(file, &igmp6_mc_seq_ops,
sizeof(struct igmp6_mc_iter_state));
return seq_open_net(inode, file, &igmp6_mc_seq_ops,
sizeof(struct igmp6_mc_iter_state));
}

static const struct file_operations igmp6_mc_seq_fops = {
.owner = THIS_MODULE,
.open = igmp6_mc_seq_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release_private,
.release = seq_release_net,
};

struct igmp6_mcf_iter_state {
struct seq_net_private p;
struct net_device *dev;
struct inet6_dev *idev;
struct ifmcaddr6 *im;
Expand All @@ -2473,10 +2486,11 @@ static inline struct ip6_sf_list *igmp6_mcf_get_first(struct seq_file *seq)
struct ip6_sf_list *psf = NULL;
struct ifmcaddr6 *im = NULL;
struct igmp6_mcf_iter_state *state = igmp6_mcf_seq_private(seq);
struct net *net = state->p.net;

state->idev = NULL;
state->im = NULL;
for_each_netdev(&init_net, state->dev) {
for_each_netdev(net, state->dev) {
struct inet6_dev *idev;
idev = in6_dev_get(state->dev);
if (unlikely(idev == NULL))
Expand Down Expand Up @@ -2608,56 +2622,82 @@ static const struct seq_operations igmp6_mcf_seq_ops = {

static int igmp6_mcf_seq_open(struct inode *inode, struct file *file)
{
return seq_open_private(file, &igmp6_mcf_seq_ops,
sizeof(struct igmp6_mcf_iter_state));
return seq_open_net(inode, file, &igmp6_mcf_seq_ops,
sizeof(struct igmp6_mcf_iter_state));
}

static const struct file_operations igmp6_mcf_seq_fops = {
.owner = THIS_MODULE,
.open = igmp6_mcf_seq_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release_private,
.release = seq_release_net,
};
#endif

int __init igmp6_init(void)
static int igmp6_net_init(struct net *net)
{
struct ipv6_pinfo *np;
struct socket *sock;
struct sock *sk;
int err;

err = sock_create_kern(PF_INET6, SOCK_RAW, IPPROTO_ICMPV6, &igmp6_socket);
err = sock_create_kern(PF_INET6, SOCK_RAW, IPPROTO_ICMPV6, &sock);
if (err < 0) {
printk(KERN_ERR
"Failed to initialize the IGMP6 control socket (err %d).\n",
err);
igmp6_socket = NULL; /* For safety. */
return err;
goto out;
}

sk = igmp6_socket->sk;
net->ipv6.igmp_sk = sk = sock->sk;
sk_change_net(sk, net);
sk->sk_allocation = GFP_ATOMIC;
sk->sk_prot->unhash(sk);

np = inet6_sk(sk);
np->hop_limit = 1;

#ifdef CONFIG_PROC_FS
proc_net_fops_create(&init_net, "igmp6", S_IRUGO, &igmp6_mc_seq_fops);
proc_net_fops_create(&init_net, "mcfilter6", S_IRUGO, &igmp6_mcf_seq_fops);
err = -ENOMEM;
if (!proc_net_fops_create(net, "igmp6", S_IRUGO, &igmp6_mc_seq_fops))
goto out_sock_create;
if (!proc_net_fops_create(net, "mcfilter6", S_IRUGO,
&igmp6_mcf_seq_fops)) {
proc_net_remove(net, "igmp6");
goto out_sock_create;
}
#endif

return 0;
err = 0;
out:
return err;

out_sock_create:
sk_release_kernel(net->ipv6.igmp_sk);
goto out;
}

void igmp6_cleanup(void)
static void igmp6_net_exit(struct net *net)
{
sock_release(igmp6_socket);
igmp6_socket = NULL; /* for safety */

sk_release_kernel(net->ipv6.igmp_sk);
#ifdef CONFIG_PROC_FS
proc_net_remove(&init_net, "mcfilter6");
proc_net_remove(&init_net, "igmp6");
proc_net_remove(net, "mcfilter6");
proc_net_remove(net, "igmp6");
#endif
}

static struct pernet_operations igmp6_net_ops = {
.init = igmp6_net_init,
.exit = igmp6_net_exit,
};

int __init igmp6_init(void)
{
return register_pernet_subsys(&igmp6_net_ops);
}

void igmp6_cleanup(void)
{
unregister_pernet_subsys(&igmp6_net_ops);
}
3 changes: 3 additions & 0 deletions trunk/net/ipv6/udp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,9 @@ static struct sock *udp_v6_mcast_next(struct sock *sk,
sk_for_each_from(s, node) {
struct inet_sock *inet = inet_sk(s);

if (s->sk_net != sk->sk_net)
continue;

if (s->sk_hash == num && s->sk_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(s);
if (inet->dport) {
Expand Down

0 comments on commit d6c2e8b

Please sign in to comment.