Page MenuHomeFreeBSD
Files F168394016

D58590.id183319.diff
No OneTemporary
Actions

D58590.id183319.diff
View Options

diff --git a/sys/netinet6/in6_mcast.c b/sys/netinet6/in6_mcast.c
--- a/sys/netinet6/in6_mcast.c
+++ b/sys/netinet6/in6_mcast.c
@@ -1924,7 +1924,7 @@
error = EADDRNOTAVAIL;
goto out;
}
- mreq_v4->imr_interface.s_addr = IA_SIN(ia)->sin_addr.s_addr;
+ mreq_v4->imr_interface.s_addr = ia->ia_addr.sin_addr.s_addr;
error = 0;
out:
@@ -1991,12 +1991,11 @@
.sopt_name = IP_ADD_MEMBERSHIP,
.sopt_val = &mreq_v4,
.sopt_valsize = sizeof(mreq_v4),
- .sopt_rights = sopt->sopt_rights,
- .sopt_td = sopt->sopt_td
+ .sopt_rights = sopt->sopt_rights
};
mreq_v4.imr_multiaddr.s_addr =
- mreq.ipv6mr_multiaddr.s6_addr32[3];
+ htonl(mreq.ipv6mr_multiaddr.s6_addr32[3]);
if (mreq.ipv6mr_interface == 0)
mreq_v4.imr_interface.s_addr = INADDR_ANY;
else
@@ -2333,12 +2332,11 @@
.sopt_name = IP_DROP_MEMBERSHIP,
.sopt_val = &mreq_v4,
.sopt_valsize = sizeof(mreq_v4),
- .sopt_rights = sopt->sopt_rights,
- .sopt_td = sopt->sopt_td
+ .sopt_rights = sopt->sopt_rights
};
mreq_v4.imr_multiaddr.s_addr =
- mreq.ipv6mr_multiaddr.s6_addr32[3];
+ htonl(mreq.ipv6mr_multiaddr.s6_addr32[3]);
if (mreq.ipv6mr_interface == 0)
mreq_v4.imr_interface.s_addr = INADDR_ANY;
else

File Metadata

Mime Type
text/plain
Expires
Sat, Aug 29, 12:05 AM (14 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35966522
Default Alt Text
D58590.id183319.diff (1 KB)

Event Timeline