summaryrefslogtreecommitdiffstats
path: root/src/OSSupport/TCPLinkImpl.cpp
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-06-15 11:03:49 +0200
committerLukas Pioch <lukas@zgow.de>2017-06-15 11:03:49 +0200
commit035ecdc9e285ad2fd9ccf51e4ed2ac01b53dc3d1 (patch)
treeb6caede9a35093d3e59c57c8c8c7295dc1c8fbaf /src/OSSupport/TCPLinkImpl.cpp
parentAdded missing 1.12 packet changes (diff)
downloadcuberite-035ecdc9e285ad2fd9ccf51e4ed2ac01b53dc3d1.tar
cuberite-035ecdc9e285ad2fd9ccf51e4ed2ac01b53dc3d1.tar.gz
cuberite-035ecdc9e285ad2fd9ccf51e4ed2ac01b53dc3d1.tar.bz2
cuberite-035ecdc9e285ad2fd9ccf51e4ed2ac01b53dc3d1.tar.lz
cuberite-035ecdc9e285ad2fd9ccf51e4ed2ac01b53dc3d1.tar.xz
cuberite-035ecdc9e285ad2fd9ccf51e4ed2ac01b53dc3d1.tar.zst
cuberite-035ecdc9e285ad2fd9ccf51e4ed2ac01b53dc3d1.zip
Diffstat (limited to '')
-rw-r--r--src/OSSupport/TCPLinkImpl.cpp86
1 files changed, 60 insertions, 26 deletions
diff --git a/src/OSSupport/TCPLinkImpl.cpp b/src/OSSupport/TCPLinkImpl.cpp
index 47be99a48..06eff9b09 100644
--- a/src/OSSupport/TCPLinkImpl.cpp
+++ b/src/OSSupport/TCPLinkImpl.cpp
@@ -70,41 +70,75 @@ cTCPLinkImplPtr cTCPLinkImpl::Connect(const AString & a_Host, UInt16 a_Port, cTC
res->m_Callbacks->OnLinkCreated(res);
res->Enable(res);
- // If a_Host is an IP address, schedule a connection immediately:
- sockaddr_storage sa;
- int salen = static_cast<int>(sizeof(sa));
- if (evutil_parse_sockaddr_port(a_Host.c_str(), reinterpret_cast<sockaddr *>(&sa), &salen) == 0)
+ // Callback to connect after performing lookup:
+ class cHostnameCallback :
+ public cNetwork::cResolveNameCallbacks
{
- // Insert the correct port:
- if (sa.ss_family == AF_INET6)
+ cTCPLinkImplPtr m_Link;
+ UInt16 m_Port;
+ bool m_IsConnecting;
+
+ public:
+
+ cHostnameCallback(cTCPLinkImplPtr a_Link, UInt16 a_ConnectPort):
+ m_Link(std::move(a_Link)),
+ m_Port(a_ConnectPort),
+ m_IsConnecting(false)
{
- reinterpret_cast<sockaddr_in6 *>(&sa)->sin6_port = htons(a_Port);
}
- else
+
+ void DoConnect(const sockaddr * a_IP, int size)
{
- reinterpret_cast<sockaddr_in *>(&sa)->sin_port = htons(a_Port);
+ // Make sure connect is only completed once
+ if (!m_IsConnecting)
+ {
+ int ErrCode = bufferevent_socket_connect(m_Link->m_BufferEvent, a_IP, size);
+ if (ErrCode == 0)
+ {
+ m_IsConnecting = true;
+ }
+ else
+ {
+ m_Link->GetCallbacks()->OnError(ErrCode, evutil_socket_error_to_string(ErrCode));
+ }
+ }
}
- // Queue the connect request:
- if (bufferevent_socket_connect(res->m_BufferEvent, reinterpret_cast<sockaddr *>(&sa), salen) == 0)
+ virtual bool OnNameResolvedV4(const AString & a_Name, const sockaddr_in * a_IP) override
{
- // Success
- return res;
+ sockaddr_in Addr = *a_IP;
+ Addr.sin_port = htons(m_Port);
+ DoConnect(reinterpret_cast<const sockaddr *>(&Addr), sizeof(Addr));
+ return false; // Don't care about recieving ip as string
}
- // Failure
- cNetworkSingleton::Get().RemoveLink(res.get());
- return nullptr;
- }
- // a_Host is a hostname, connect after a lookup:
- if (bufferevent_socket_connect_hostname(res->m_BufferEvent, cNetworkSingleton::Get().GetDNSBase(), AF_UNSPEC, a_Host.c_str(), a_Port) == 0)
- {
- // Success
- return res;
- }
- // Failure
- cNetworkSingleton::Get().RemoveLink(res.get());
- return nullptr;
+ virtual bool OnNameResolvedV6(const AString & a_Name, const sockaddr_in6 * a_IP) override
+ {
+ sockaddr_in6 Addr = *a_IP;
+ Addr.sin6_port = htons(m_Port);
+ DoConnect(reinterpret_cast<const sockaddr *>(&Addr), sizeof(Addr));
+ return false; // Don't care about recieving ip as string
+ }
+
+ virtual void OnError(int a_ErrorCode, const AString & a_ErrorMsg) override
+ {
+ m_Link->GetCallbacks()->OnError(a_ErrorCode, a_ErrorMsg);
+ cNetworkSingleton::Get().RemoveLink(m_Link.get());
+ }
+
+ // Don't need to do anything for these
+ virtual void OnFinished() override
+ {
+ }
+
+ virtual void OnNameResolved(const AString & a_Name, const AString & a_IP) override
+ {
+ }
+ };
+
+ // Schedule the host query
+ cNetwork::HostnameToIP(a_Host, std::make_shared<cHostnameCallback>(res, a_Port));
+ return res;
}