diff options
Diffstat (limited to 'src/OSSupport/IPLookup.cpp')
| -rw-r--r-- | src/OSSupport/IPLookup.cpp | 71 |
1 files changed, 34 insertions, 37 deletions
diff --git a/src/OSSupport/IPLookup.cpp b/src/OSSupport/IPLookup.cpp index f730110b9..42bf3a92a 100644 --- a/src/OSSupport/IPLookup.cpp +++ b/src/OSSupport/IPLookup.cpp @@ -16,9 +16,8 @@ //////////////////////////////////////////////////////////////////////////////// // cIPLookup: -cIPLookup::cIPLookup(const AString & a_IP, cNetwork::cResolveNameCallbacksPtr a_Callbacks): - m_Callbacks(std::move(a_Callbacks)), - m_IP(a_IP) +cIPLookup::cIPLookup(const AString & a_IP, cNetwork::cResolveNameCallbacksPtr a_Callbacks) : + m_Callbacks(std::move(a_Callbacks)), m_IP(a_IP) { ASSERT(m_Callbacks != nullptr); } @@ -29,36 +28,41 @@ cIPLookup::cIPLookup(const AString & a_IP, cNetwork::cResolveNameCallbacksPtr a_ void cIPLookup::Lookup(const AString & a_IP, cNetwork::cResolveNameCallbacksPtr a_Callbacks) { - cIPLookupPtr Lookup{ new cIPLookup(a_IP, std::move(a_Callbacks)) }; // Cannot use std::make_shared here, constructor is not accessible + cIPLookupPtr Lookup {new cIPLookup(a_IP, std::move(a_Callbacks)) + }; // Cannot use std::make_shared here, constructor is not accessible // Note the Lookup object is owned solely by this lambda which is destroyed after it runs - cNetworkSingleton::Get().GetLookupThread().ScheduleLookup([=]() - { - sockaddr_storage sa; - int salen = sizeof(sa); - memset(&sa, 0, sizeof(sa)); - - int ErrCode = evutil_parse_sockaddr_port(Lookup->m_IP.c_str(), reinterpret_cast<sockaddr *>(&sa), &salen); - - if (ErrCode != 0) + cNetworkSingleton::Get().GetLookupThread().ScheduleLookup( + [=]() { - LOGD("Failed to parse IP address \"%s\".", Lookup->m_IP.c_str()); - Lookup->Callback(ErrCode, nullptr); - return; + sockaddr_storage sa; + int salen = sizeof(sa); + memset(&sa, 0, sizeof(sa)); + + int ErrCode = evutil_parse_sockaddr_port(Lookup->m_IP.c_str(), reinterpret_cast<sockaddr *>(&sa), &salen); + + if (ErrCode != 0) + { + LOGD("Failed to parse IP address \"%s\".", Lookup->m_IP.c_str()); + Lookup->Callback(ErrCode, nullptr); + return; + } + + char Hostname[NI_MAXHOST]; + char ServInfo[NI_MAXSERV]; + + ErrCode = getnameinfo( + reinterpret_cast<sockaddr *>(&sa), + static_cast<socklen_t>(salen), + Hostname, + sizeof(Hostname), + ServInfo, + sizeof(ServInfo), + 0 + ); + Lookup->Callback(ErrCode, Hostname); } - - char Hostname[NI_MAXHOST]; - char ServInfo[NI_MAXSERV]; - - ErrCode = getnameinfo( - reinterpret_cast<sockaddr *>(&sa), - static_cast<socklen_t>(salen), - Hostname, sizeof(Hostname), - ServInfo, sizeof(ServInfo), - 0 - ); - Lookup->Callback(ErrCode, Hostname); - }); + ); } @@ -88,15 +92,8 @@ void cIPLookup::Callback(int a_Result, const char * a_Address) //////////////////////////////////////////////////////////////////////////////// // cNetwork API: -bool cNetwork::IPToHostName( - const AString & a_IP, - cNetwork::cResolveNameCallbacksPtr a_Callbacks -) +bool cNetwork::IPToHostName(const AString & a_IP, cNetwork::cResolveNameCallbacksPtr a_Callbacks) { cIPLookup::Lookup(a_IP, std::move(a_Callbacks)); return true; } - - - - |