Bug Fix: Failed to connect lidar when multi adapter presented with fi… #18

Merged
jingweiz2017 merged 2 commits from master into master 2019-10-31 08:57:39 +01:00
Showing only changes of commit 74f63da255 - Show all commits
+4 -1
View File
@@ -99,7 +99,8 @@ bool FindLocalIP(const struct sockaddr_in &client_addr, uint32_t &local_ip) {
IP_ADAPTER_INFO *pAdapter = reinterpret_cast<IP_ADAPTER_INFO *>(pAdapterInfo.get()); IP_ADAPTER_INFO *pAdapter = reinterpret_cast<IP_ADAPTER_INFO *>(pAdapterInfo.get());
if (NO_ERROR == dlRetVal && pAdapter != NULL) { if (NO_ERROR == dlRetVal && pAdapter != NULL) {
while (GetAdapterState(pAdapter)) { while (pAdapter != NULL) {
if (GetAdapterState(pAdapter)) {
std::string str_ip = pAdapter->IpAddressList.IpAddress.String; std::string str_ip = pAdapter->IpAddressList.IpAddress.String;
std::string str_mask = pAdapter->IpAddressList.IpMask.String; std::string str_mask = pAdapter->IpAddressList.IpMask.String;
ULONG host_ip = inet_addr(const_cast<char *>(str_ip.c_str())); ULONG host_ip = inet_addr(const_cast<char *>(str_ip.c_str()));
@@ -111,6 +112,8 @@ bool FindLocalIP(const struct sockaddr_in &client_addr, uint32_t &local_ip) {
found = true; found = true;
break; break;
} }
}
pAdapter = pAdapter->Next; pAdapter = pAdapter->Next;
} }
} }