Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix core caused by concurrent use of non-thread-safe gethostbyname #1611

Merged
merged 2 commits into from
Jul 19, 2024
Merged

fix core caused by concurrent use of non-thread-safe gethostbyname #1611

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50c2635
fix core caused by concurrent use of non-thread-safe gethostbyname
henryzhx8 Jul 12, 2024
6b8aeb0
polish
henryzhx8 Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 73 additions & 66 deletions core/common/MachineInfoUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,35 @@
// limitations under the License.

#include "MachineInfoUtil.h"

#include <string.h>
#if defined(__linux__)
#include <sys/socket.h>
#include <arpa/inet.h>
#include <sys/ioctl.h>
#include <net/if.h>
#include <ifaddrs.h>
#include <sys/utsname.h>
#include <pwd.h>
#include <net/if.h>
#include <netdb.h>
#include <map>
#include <list>
#include <pwd.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/utsname.h>

#include <algorithm>
#include <list>
#include <map>
#elif defined(_MSC_VER)
#include <WinSock2.h>
#include <Windows.h>
#endif
#include "logger/Logger.h"
#include "StringTools.h"
#include "FileSystemUtil.h"
#include <thread>
#include <curl/curl.h>
#include <rapidjson/stringbuffer.h>
#include <rapidjson/writer.h>

#include <thread>

#include "FileSystemUtil.h"
#include "StringTools.h"
#include "logger/Logger.h"


#if defined(_MSC_VER)
typedef LONG NTSTATUS, *PNTSTATUS;
Expand Down Expand Up @@ -164,10 +168,10 @@ std::string GetHostName() {
return std::string(hostname);
}

std::list<std::string> GetNicIpv4IPList() {
std::unordered_set<std::string> GetNicIpv4IPList() {
henryzhx8 marked this conversation as resolved.
Show resolved Hide resolved
struct ifaddrs* ifAddrStruct = NULL;
void* tmpAddrPtr = NULL;
std::list<std::string> ipList;
std::unordered_set<std::string> ipList;
getifaddrs(&ifAddrStruct);
for (struct ifaddrs* ifa = ifAddrStruct; ifa != NULL; ifa = ifa->ifa_next) {
if (ifa->ifa_addr == NULL) {
Expand All @@ -183,7 +187,7 @@ std::list<std::string> GetNicIpv4IPList() {
if (0 == strcmp("lo", ifa->ifa_name) || ip.empty() || StartWith(ip, "127.")) {
continue;
}
ipList.emplace_back(std::move(ip));
ipList.insert(std::move(ip));
}
}
freeifaddrs(ifAddrStruct);
Expand All @@ -199,64 +203,68 @@ std::string GetHostIpByHostName() {
return "";
}

struct hostent* entry = gethostbyname(hostname.c_str());
if (entry == NULL) {
struct addrinfo hints, *res = nullptr;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET;
int status = getaddrinfo(hostname.c_str(), NULL, &hints, &res);
if (status != 0 || res == nullptr) {
LOG_WARNING(sLogger,
("failed get address info", "will use other methods to obtain ip")("errMsg", gai_strerror(status)));
return "";
}

std::vector<sockaddr_in> addrs;
for (auto p = res; p != nullptr; p = p->ai_next) {
if (p->ai_family == AF_INET) {
addrs.emplace_back(*(struct sockaddr_in*)p->ai_addr);
}
}
freeaddrinfo(res);

std::string firstIp;
char ipStr[INET_ADDRSTRLEN + 1];
ipStr[INET_ADDRSTRLEN] = '\0';
henryzhx8 marked this conversation as resolved.
Show resolved Hide resolved
#if defined(__linux__)
int i = 0;
std::list<std::string> ipList;
ipList = GetNicIpv4IPList();
if (!ipList.empty()) {
int isExistValidIP = 0;
while (entry->h_addr_list[i] != NULL) {
struct in_addr addr;
memcpy(&addr, entry->h_addr_list[i], sizeof(struct in_addr));
auto item = std::find(ipList.begin(), ipList.end(), inet_ntoa(addr));
if (item != ipList.end()) {
isExistValidIP = 1;
break;
}
i++;
auto ipList = GetNicIpv4IPList();
#endif
for (size_t i = 0; i < addrs.size(); ++i) {
auto p = inet_ntop(AF_INET, &addrs[i].sin_addr, ipStr, INET_ADDRSTRLEN);
if (p == nullptr) {
continue;
}
if (0 == isExistValidIP) {
i = 0;
auto tmp = std::string(ipStr);
#if defined(__linux__)
if (ipList.find(tmp) != ipList.end()) {
return tmp;
}
}
struct in_addr* addr = (struct in_addr*)entry->h_addr_list[i];
if (addr == NULL) {
return "";
}
char* ipaddr = inet_ntoa(*addr);
if (ipaddr == NULL) {
return "";
}
return std::string(ipaddr);
#elif defined(_MSC_VER)
std::string ip;
while (*(entry->h_addr_list) != NULL) {
if (AF_INET == entry->h_addrtype) {
// According to RFC 1918 (http://www.faqs.org/rfcs/rfc1918.html), private IP ranges are as bellow:
// 10.0.0.0 - 10.255.255.255 (10/8 prefix)
// 172.16.0.0 - 172.31.255.255 (172.16/12 prefix)
// 192.168.0.0 - 192.168.255.255 (192.168/16 prefix)
// 100.*.*.* , 30.*.*.* - alibaba office network
std::string curIP = inet_ntoa(*(struct in_addr*)*entry->h_addr_list);
ip = curIP;
if (curIP.find("10.") == 0 || curIP.find("100.") == 0 || curIP.find("30.") == 0
|| curIP.find("192.168.") == 0 || curIP.find("172.16.") == 0 || curIP.find("172.17.") == 0
|| curIP.find("172.18.") == 0 || curIP.find("172.19.") == 0 || curIP.find("172.20.") == 0
|| curIP.find("172.21.") == 0 || curIP.find("172.22.") == 0 || curIP.find("172.23.") == 0
|| curIP.find("172.24.") == 0 || curIP.find("172.25.") == 0 || curIP.find("172.26.") == 0
|| curIP.find("172.27.") == 0 || curIP.find("172.28.") == 0 || curIP.find("172.29.") == 0
|| curIP.find("172.30.") == 0 || curIP.find("172.31.") == 0) {
return curIP;
// According to RFC 1918 (http://www.faqs.org/rfcs/rfc1918.html), private IP ranges are as bellow:
// 10.0.0.0 - 10.255.255.255 (10/8 prefix)
// 172.16.0.0 - 172.31.255.255 (172.16/12 prefix)
// 192.168.0.0 - 192.168.255.255 (192.168/16 prefix)
// 100.*.*.* , 30.*.*.* - alibaba office network
if (tmp.find("10.") == 0 || tmp.find("100.") == 0 || tmp.find("30.") == 0 || tmp.find("192.168.") == 0
|| tmp.find("172.16.") == 0 || tmp.find("172.17.") == 0 || tmp.find("172.18.") == 0
|| tmp.find("172.19.") == 0 || tmp.find("172.20.") == 0 || tmp.find("172.21.") == 0
|| tmp.find("172.22.") == 0 || tmp.find("172.23.") == 0 || tmp.find("172.24.") == 0
|| tmp.find("172.25.") == 0 || tmp.find("172.26.") == 0 || tmp.find("172.27.") == 0
|| tmp.find("172.28.") == 0 || tmp.find("172.29.") == 0 || tmp.find("172.30.") == 0
|| tmp.find("172.31.") == 0) {
return tmp;
}
#endif
if (i == 0) {
firstIp = tmp;
#if defined(__linux__)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

宏的嵌套比之前复杂了很多，感觉还是之前linux windows整体分开更清晰些，虽然会多一些外围的循环。

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1、windows是怎么测试的
2、这个问题自己是否能复现，并发是怎么测试的

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. windows目前没有测试，会记一个todo等windows那边能编译后再测试
  2. yitao的机器在特定输入下有大概率复现，lingzhu之前的dns core问题目前看也是这个导致的，两个场景可以复现。代码修复后多次运行没有再出现core。

if (ipList.empty()) {
LOG_INFO(sLogger, ("no entry from getifaddrs", "use first entry from getaddrinfo"));
return firstIp;
}
#endif
}
entry->h_addr_list++;
}
return ip;
#endif
LOG_INFO(sLogger, ("no entry from getaddrinfo matches entry from getifaddrs", "use first entry from getaddrinfo"));
return firstIp;
}

std::string GetHostIpByInterface(const std::string& intf) {
Expand Down Expand Up @@ -314,10 +322,9 @@ std::string GetAnyAvailableIP() {
#if defined(__linux__)
std::string retIP;
char host[NI_MAXHOST];
std::list<std::string> ipList;
ipList = GetNicIpv4IPList();
auto ipList = GetNicIpv4IPList();
if (!ipList.empty()) {
for (std::string ip : ipList) {
for (auto& ip : ipList) {
struct sockaddr_in sa;
sa.sin_family = AF_INET;
sa.sin_port = 0;
Expand Down
Loading