generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-23 16:48:06 +02:00
Code Issues Projects Releases Wiki Activity

fixed GH #245: MulticastSocket::joinGroup(const IPAddress&) not working

Browse Source
This commit is contained in:
Alex Fabijanic
2014-05-29 20:57:19 -05:00
parent ce3ad64e16
commit e44df5a583
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Net/include/Poco/Net/MulticastSocket.h
View File

@@ -114,6 +114,10 @@ public:
void leaveGroup(const IPAddress& groupAddress, const NetworkInterface& interfc); void leaveGroup(const IPAddress& groupAddress, const NetworkInterface& interfc);
/// Leaves the specified multicast group at the given interface. /// Leaves the specified multicast group at the given interface.
private:
static NetworkInterface findFirstInterface(const IPAddress& groupAddress);
/// Returns first multicast-eligible network interface.
}; };

39
Net/src/MulticastSocket.cpp
View File

@@ -193,8 +193,7 @@ unsigned MulticastSocket::getTimeToLive() const
void MulticastSocket::joinGroup(const IPAddress& groupAddress) void MulticastSocket::joinGroup(const IPAddress& groupAddress)
{ {
NetworkInterface intf; joinGroup(groupAddress, findFirstInterface(groupAddress));
joinGroup(groupAddress, intf);
} }
@@ -218,6 +217,42 @@ void MulticastSocket::joinGroup(const IPAddress& groupAddress, const NetworkInte
} }
} }
NetworkInterface MulticastSocket::findFirstInterface(const IPAddress& groupAddress)
{
NetworkInterface::Map m = NetworkInterface::map();
if (groupAddress.family() == IPAddress::IPv4)
{
for (NetworkInterface::Map::const_iterator it = m.begin(); it != m.end(); ++it)
{
if (it->second.supportsIPv4() &&
it->second.firstAddress(IPAddress::IPv4).isUnicast() &&
!it->second.isLoopback() &&
!it->second.isPointToPoint())
{
return it->second;
}
}
}
#ifdef POCO_HAVE_IPv6
else if (groupAddress.family() == IPAddress::IPv6)
{
for (NetworkInterface::Map::const_iterator it = m.begin(); it != m.end(); ++it)
{
if (it->second.supportsIPv6() &&
it->second.firstAddress(IPAddress::IPv6).isUnicast() &&
!it->second.isLoopback() &&
!it->second.isPointToPoint())
{
return it->second;
}
}
}
#endif // POCO_HAVE_IPv6
throw NotFoundException("No multicast-eligible network interface found.");
}
void MulticastSocket::leaveGroup(const IPAddress& groupAddress) void MulticastSocket::leaveGroup(const IPAddress& groupAddress)
{ {