mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Added android broadcast address support

Browse source
This commit is contained in:
jules 2018-10-23 14:59:53 +01:00
parent 048cfd6a3c
commit a2fcd9b4c1
2 changed files with 53 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

80
modules/juce_core/native/juce_android_Network.cpp
View file

@ -342,15 +342,20 @@ URL::DownloadTask* URL::downloadToFile (const File& targetLocation, String extra
}
//==============================================================================
static void addAddress (const sockaddr_in* addr_in, Array<IPAddress>& result)
static IPAddress makeAddress (const sockaddr_in *addr_in)
{
in_addr_t addr = addr_in->sin_addr.s_addr;
if (addr_in->sin_addr.s_addr == INADDR_NONE)
return {};
if (addr != INADDR_NONE)
result.addIfNotAlreadyThere (IPAddress (ntohl (addr)));
return IPAddress (ntohl (addr_in->sin_addr.s_addr));
}
static void findIPAddresses (int sock, Array<IPAddress>& result)
struct InterfaceInfo
{
IPAddress interfaceAddress, broadcastAddress;
};
static Array<InterfaceInfo> findIPAddresses (int dummySocket)
{
ifconf cfg;
HeapBlock<char> buffer;
@ -364,45 +369,64 @@ static void findIPAddresses (int sock, Array<IPAddress>& result)
cfg.ifc_len = bufferSize;
cfg.ifc_buf = buffer;
if (ioctl (sock, SIOCGIFCONF, &cfg) < 0 && errno != EINVAL)
return;
if (ioctl (dummySocket, SIOCGIFCONF, &cfg) < 0 && errno != EINVAL)
return {};
} while (bufferSize < cfg.ifc_len + 2 * (int) (IFNAMSIZ + sizeof (struct sockaddr_in6)));
#if JUCE_MAC || JUCE_IOS
while (cfg.ifc_len >= (int) (IFNAMSIZ + sizeof (struct sockaddr_in)))
{
if (cfg.ifc_req->ifr_addr.sa_family == AF_INET) // Skip non-internet addresses
addAddress ((const sockaddr_in*) &cfg.ifc_req->ifr_addr, result);
Array<InterfaceInfo> result;
cfg.ifc_len -= IFNAMSIZ + cfg.ifc_req->ifr_addr.sa_len;
cfg.ifc_buf += IFNAMSIZ + cfg.ifc_req->ifr_addr.sa_len;
}
#else
for (size_t i = 0; i < (size_t) cfg.ifc_len / (size_t) sizeof (struct ifreq); ++i)
{
const ifreq& item = cfg.ifc_req[i];
auto& item = cfg.ifc_req[i];
if (item.ifr_addr.sa_family == AF_INET)
addAddress ((const sockaddr_in*) &item.ifr_addr, result);
{
InterfaceInfo i;
i.interfaceAddress = makeAddress ((const sockaddr_in*) &item.ifr_addr);
if (! i.interfaceAddress.isNull())
{
if (ioctl (dummySocket, SIOCGIFBRDADDR, &item) == 0)
i.broadcastAddress = makeAddress ((const sockaddr_in*) &item.ifr_broadaddr);
result.add (i);
}
}
else if (item.ifr_addr.sa_family == AF_INET6)
{
// TODO: IPv6
}
}
#endif
return result;
}
static Array<InterfaceInfo> findIPAddresses()
{
auto dummySocket = socket (AF_INET, SOCK_DGRAM, 0); // a dummy socket to execute the IO control
if (dummySocket < 0)
return {};
auto result = findIPAddresses (dummySocket);
::close (dummySocket);
return result;
}
void IPAddress::findAllAddresses (Array<IPAddress>& result, bool /*includeIPv6*/)
{
const int sock = socket (AF_INET, SOCK_DGRAM, 0); // a dummy socket to execute the IO control
if (sock >= 0)
{
findIPAddresses (sock, result);
::close (sock);
}
for (auto& a : findIPAddresses())
result.add (a.interfaceAddress);
}
IPAddress IPAddress::getInterfaceBroadcastAddress (const IPAddress&)
IPAddress IPAddress::getInterfaceBroadcastAddress (const IPAddress& address)
{
return {}; // TODO
for (auto& a : findIPAddresses())
if (a.interfaceAddress == address)
return a.broadcastAddress;
return {};
}

2
modules/juce_core/native/juce_mac_linux_IPAddress.h
View file

@ -46,7 +46,7 @@ namespace
return IPAddress (arr);
}
static IPAddress makeAddress (const sockaddr_in *addr_in)
static IPAddress makeAddress (const sockaddr_in* addr_in)
{
if (addr_in->sin_addr.s_addr == INADDR_NONE)
return {};