mmr/Livox-SDK
Archived
1
0
Fork 0
Code Issues 105 Pull Requests 11 Actions Packages Projects Releases 9 Wiki Activity

Proposal for the bind interface #38

Open
lasdasdas wants to merge 19 commits from lasdasdas/std_function_bind_interface_proposal into master
pull from: lasdasdas/std_function_bind_interface_proposal
merge into: mmr:master
Conversation 0 Commits 19 Files Changed 1917
+13 -11
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f5eaa30bc8 - Show all commits
sdk_core/src/base/network_util.cpp
+3 -1
View File
@@ -110,7 +110,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()));
@@ -122,6 +123,7 @@ bool FindLocalIp(const struct sockaddr_in &client_addr, uint32_t &local_ip) {
found = true; found = true;
break; break;
} }
}
pAdapter = pAdapter->Next; pAdapter = pAdapter->Next;
} }
} }