History

[IPV4]: (INCLUDE,empty)/leave-group equivalence for full-state MSF APIs & errno fix

1) Adds (INCLUDE, empty)/leave-group equivalence to the full-state multicast source filter APIs (IPv4 and IPv6) 2) Fixes an incorrect errno in the IPv6 leave-group (ENOENT should be EADDRNOTAVAIL)

David L Stevens committed 21 years ago

Commit 9951f031 parent 917f2f12 files · +19 −2Browse files

Unified · Split

2 files
  1. net/ipv4/igmp.c +10 −1
  2. net/ipv6/mcast.c +9 −1
net/ipv4/igmp.c+10−1
@@ -1849,13 +1849,14 @@ done: · 1848 unmodified lines
18491849
18501850 int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)
18511851 {
1852− int err;
1852+ int err = 0;
18531853 struct ip_mreqn imr;
18541854 u32 addr = msf->imsf_multiaddr;
18551855 struct ip_mc_socklist *pmc;
18561856 struct in_device *in_dev;
18571857 struct inet_sock *inet = inet_sk(sk);
18581858 struct ip_sf_socklist *newpsl, *psl;
1859+ int leavegroup = 0;
18591860
18601861 if (!MULTICAST(addr))
18611862 return -EINVAL;
@@ -1875,6 +1876,12 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex) · 13 unmodified lines
18751876 goto done;
18761877 }
18771878
1879+ /* special case - (INCLUDE, empty) == LEAVE_GROUP */
1880+ if (msf->imsf_fmode == MCAST_INCLUDE && msf->imsf_numsrc == 0) {
1881+ leavegroup = 1;
1882+ goto done;
1883+ }
1884+
18781885 for (pmc=inet->mc_list; pmc; pmc=pmc->next) {
18791886 if (pmc->multi.imr_multiaddr.s_addr == msf->imsf_multiaddr &&
18801887 pmc->multi.imr_ifindex == imr.imr_ifindex)
@@ -1915,6 +1922,8 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex) · 34 unmodified lines
19151922 err = 0;
19161923 done:
19171924 rtnl_shunlock();
1925+ if (leavegroup)
1926+ err = ip_mc_leave_group(sk, &imr);
19181927 return err;
19191928 }
19201929
net/ipv6/mcast.c+9−1
@@ -281,7 +281,7 @@ int ipv6_sock_mc_drop(struct sock *sk, int ifindex, struct in6_addr *addr) · 280 unmodified lines
281281 }
282282 write_unlock_bh(&ipv6_sk_mc_lock);
283283
284− return -ENOENT;
284+ return -EADDRNOTAVAIL;
285285 }
286286
287287 static struct inet6_dev *ip6_mc_find_dev(struct in6_addr *group, int ifindex)
@@ -492,6 +492,7 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf) · 204 unmodified lines
492492 struct inet6_dev *idev;
493493 struct ipv6_pinfo *inet6 = inet6_sk(sk);
494494 struct ip6_sf_socklist *newpsl, *psl;
495+ int leavegroup = 0;
495496 int i, err;
496497
497498 group = &((struct sockaddr_in6 *)&gsf->gf_group)->sin6_addr;
@@ -508,6 +509,11 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf) · 10 unmodified lines
508509 return -ENODEV;
509510 dev = idev->dev;
510511
512+ if (gsf->gf_fmode == MCAST_INCLUDE && gsf->gf_numsrc == 0) {
513+ leavegroup = 1;
514+ goto done;
515+ }
516+
511517 for (pmc=inet6->ipv6_mc_list; pmc; pmc=pmc->next) {
512518 if (pmc->ifindex != gsf->gf_interface)
513519 continue;
@@ -554,6 +560,8 @@ done: · 40 unmodified lines
554560 read_unlock_bh(&idev->lock);
555561 in6_dev_put(idev);
556562 dev_put(dev);
563+ if (leavegroup)
564+ err = ipv6_sock_mc_drop(sk, gsf->gf_interface, group);
557565 return err;
558566 }
559567

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t