d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert most of the multicast changes from r353292. This needs a more

Browse Source 
accurate approach.
This commit is contained in:
Gleb Smirnoff 2019-10-09 17:03:20 +00:00
parent 1e4f4e56b9
commit 0732ac0eff
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=353357
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/netinet/in_mcast.c
View File

@ -388,12 +388,14 @@ inm_lookup_locked(struct ifnet *ifp, const struct in_addr ina)
struct in_multi *
inm_lookup(struct ifnet *ifp, const struct in_addr ina)
{
struct epoch_tracker et;
struct in_multi *inm;
IN_MULTI_LIST_LOCK_ASSERT();
NET_EPOCH_ASSERT();
NET_EPOCH_ENTER(et);
inm = inm_lookup_locked(ifp, ina);
NET_EPOCH_EXIT(et);
return (inm);
}
@ -1198,13 +1200,10 @@ int
in_joingroup(struct ifnet *ifp, const struct in_addr *gina,
/*const*/ struct in_mfilter *imf, struct in_multi **pinm)
{
struct epoch_tracker et;
int error;
IN_MULTI_LOCK();
NET_EPOCH_ENTER(et);
error = in_joingroup_locked(ifp, gina, imf, pinm);
NET_EPOCH_EXIT(et);
IN_MULTI_UNLOCK();
return (error);
@ -1227,7 +1226,6 @@ in_joingroup_locked(struct ifnet *ifp, const struct in_addr *gina,
struct in_multi *inm;
int error;
NET_EPOCH_ASSERT();
IN_MULTI_LOCK_ASSERT();
IN_MULTI_LIST_UNLOCK_ASSERT();
@ -1285,14 +1283,11 @@ in_joingroup_locked(struct ifnet *ifp, const struct in_addr *gina,
int
in_leavegroup(struct in_multi *inm, /*const*/ struct in_mfilter *imf)
{
struct epoch_tracker et;
int error;
NET_EPOCH_ENTER(et);
IN_MULTI_LOCK();
error = in_leavegroup_locked(inm, imf);
IN_MULTI_UNLOCK();
NET_EPOCH_EXIT(et);
return (error);
}
@ -1316,7 +1311,6 @@ in_leavegroup_locked(struct in_multi *inm, /*const*/ struct in_mfilter *imf)
struct in_mfilter timf;
int error;
NET_EPOCH_ASSERT();
IN_MULTI_LOCK_ASSERT();
IN_MULTI_LIST_UNLOCK_ASSERT();
@ -1818,11 +1812,15 @@ inp_getmoptions(struct inpcb *inp, struct sockopt *sopt)
if (!in_nullhost(imo->imo_multicast_addr)) {
mreqn.imr_address = imo->imo_multicast_addr;
} else if (ifp != NULL) {
struct epoch_tracker et;
mreqn.imr_ifindex = ifp->if_index;
NET_EPOCH_ENTER(et);
IFP_TO_IA(ifp, ia, &in_ifa_tracker);
if (ia != NULL)
mreqn.imr_address =
IA_SIN(ia)->sin_addr;
NET_EPOCH_EXIT(et);
}
}
INP_WUNLOCK(inp);

3
sys/netinet/ip_output.c
View File

@ -1079,7 +1079,6 @@ int
ip_ctloutput(struct socket *so, struct sockopt *sopt)
{
struct inpcb *inp = sotoinpcb(so);
struct epoch_tracker et;
int error, optval;
#ifdef RSS
uint32_t rss_bucket;
@ -1518,9 +1517,7 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
case IP_MULTICAST_TTL:
case IP_MULTICAST_LOOP:
case IP_MSFILTER:
NET_EPOCH_ENTER(et);
error = inp_getmoptions(inp, sopt);
NET_EPOCH_EXIT(et);
break;
#if defined(IPSEC) || defined(IPSEC_SUPPORT)