w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve multicast support for multi-homed Windows machines

This commit is contained in:
Bill Somerville 2019-01-14 13:41:40 +00:00
parent a4d496cdb0
commit 5c3f373c96
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MessageServer.cpp
View File

@ -121,6 +121,7 @@ void MessageServer::impl::join_multicast_group ()
#endif #endif
) )
{ {
auto mcast_iface = multicastInterface ();
if (IPv4Protocol == multicast_group_address_.protocol () if (IPv4Protocol == multicast_group_address_.protocol ()
&& IPv4Protocol != localAddress ().protocol ()) && IPv4Protocol != localAddress ().protocol ())
{ {
@ -132,6 +133,11 @@ void MessageServer::impl::join_multicast_group ()
{ {
if (QNetworkInterface::CanMulticast & interface.flags ()) if (QNetworkInterface::CanMulticast & interface.flags ())
{ {
// Windows requires outgoing interface to match
// interface to be joined while joining, at least for
// IPv4 it seems to
setMulticastInterface (interface);
joined |= joinMulticastGroup (multicast_group_address_, interface); joined |= joinMulticastGroup (multicast_group_address_, interface);
} }
} }
@ -139,6 +145,7 @@ void MessageServer::impl::join_multicast_group ()
{ {
multicast_group_address_.clear (); multicast_group_address_.clear ();
} }
setMulticastInterface (mcast_iface);
} }
} }