Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-03-18 23:36:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cast pthread name to char* for apple sdk

Browse source 
Signed-off-by: R4SAS <r4sas@i2pmail.org>
This commit is contained in:
R4SAS 2022-02-11 00:04:36 +03:00
parent 04388325a8
commit ac25649425
1 changed files with 42 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
libi2pd/util.cpp
View file

@ -124,7 +124,7 @@ namespace util
void SetThreadName (const char *name) { void SetThreadName (const char *name) {
#if defined(__APPLE__) #if defined(__APPLE__)
pthread_setname_np(name); pthread_setname_np((char*)name);
#elif defined(__FreeBSD__) || defined(__OpenBSD__) #elif defined(__FreeBSD__) || defined(__OpenBSD__)
pthread_set_name_np(pthread_self(), name); pthread_set_name_np(pthread_self(), name);
#elif defined(__NetBSD__) #elif defined(__NetBSD__)
@ -384,12 +384,13 @@ namespace net
return boost::asio::ip::address::from_string("127.0.0.1"); return boost::asio::ip::address::from_string("127.0.0.1");
#else #else
int af = (ipv6 ? AF_INET6 : AF_INET); int af = (ipv6 ? AF_INET6 : AF_INET);
ifaddrs *addrs, *cur = nullptr; ifaddrs *addrs;
if(getifaddrs(&addrs) == 0) try
{ {
// got ifaddrs ifaddrs *addrs;
cur = addrs; if (!getifaddrs(&addrs))
while(cur) {
for (auto cur = addrs; cur; cur = cur->ifa_next)
{ {
std::string cur_ifname(cur->ifa_name); std::string cur_ifname(cur->ifa_name);
if (cur_ifname == ifname && cur->ifa_addr && cur->ifa_addr->sa_family == af) if (cur_ifname == ifname && cur->ifa_addr && cur->ifa_addr->sa_family == af)
@ -405,9 +406,14 @@ namespace net
std::string cur_ifaddr(addr); std::string cur_ifaddr(addr);
return boost::asio::ip::address::from_string(cur_ifaddr); return boost::asio::ip::address::from_string(cur_ifaddr);
} }
cur = cur->ifa_next;
} }
} }
}
catch (std::exception& ex)
{
LogPrint(eLogError, "NetIface: Exception while searching address using ifaddr: ", ex);
}
if(addrs) freeifaddrs(addrs); if(addrs) freeifaddrs(addrs);
std::string fallback; std::string fallback;
if(ipv6) if(ipv6)
@ -483,12 +489,12 @@ namespace net
FREE(pAddresses); FREE(pAddresses);
return boost::asio::ip::address_v6 (); return boost::asio::ip::address_v6 ();
#else #else
ifaddrs *addrs, *cur = nullptr; ifaddrs *addrs;
auto err = getifaddrs(&addrs); try
if (!err)
{ {
cur = addrs; if (!getifaddrs(&addrs))
while(cur) {
for (auto cur = addrs; cur; cur = cur->ifa_next)
{ {
if (cur->ifa_addr && cur->ifa_addr->sa_family == AF_INET6) if (cur->ifa_addr && cur->ifa_addr->sa_family == AF_INET6)
{ {
@ -501,9 +507,13 @@ namespace net
return boost::asio::ip::address_v6 (bytes); return boost::asio::ip::address_v6 (bytes);
} }
} }
cur = cur->ifa_next;
} }
} }
}
catch (std::exception& ex)
{
LogPrint(eLogError, "NetIface: Exception while searching Yggdrasill address using ifaddr: ", ex);
}
LogPrint(eLogWarning, "NetIface: Interface with Yggdrasil network address not found"); LogPrint(eLogWarning, "NetIface: Interface with Yggdrasil network address not found");
if(addrs) freeifaddrs(addrs); if(addrs) freeifaddrs(addrs);
return boost::asio::ip::address_v6 (); return boost::asio::ip::address_v6 ();