summaryrefslogtreecommitdiffstats
path: root/src/OSSupport/TCPLinkImpl.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-01-22 13:00:32 +0100
committerMattes D <github@xoft.cz>2015-01-22 20:13:06 +0100
commitdbf7f13bd414daea5e787da2543df186dc465c34 (patch)
treec6ca36fcd22b422b89222a8c29beb046e70b4de6 /src/OSSupport/TCPLinkImpl.cpp
parentcNetwork: Changed listening API. (diff)
downloadcuberite-dbf7f13bd414daea5e787da2543df186dc465c34.tar
cuberite-dbf7f13bd414daea5e787da2543df186dc465c34.tar.gz
cuberite-dbf7f13bd414daea5e787da2543df186dc465c34.tar.bz2
cuberite-dbf7f13bd414daea5e787da2543df186dc465c34.tar.lz
cuberite-dbf7f13bd414daea5e787da2543df186dc465c34.tar.xz
cuberite-dbf7f13bd414daea5e787da2543df186dc465c34.tar.zst
cuberite-dbf7f13bd414daea5e787da2543df186dc465c34.zip
Diffstat (limited to 'src/OSSupport/TCPLinkImpl.cpp')
-rw-r--r--src/OSSupport/TCPLinkImpl.cpp26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/OSSupport/TCPLinkImpl.cpp b/src/OSSupport/TCPLinkImpl.cpp
index 6f937646f..5d31da22e 100644
--- a/src/OSSupport/TCPLinkImpl.cpp
+++ b/src/OSSupport/TCPLinkImpl.cpp
@@ -20,9 +20,6 @@ cTCPLinkImpl::cTCPLinkImpl(cTCPLink::cCallbacksPtr a_LinkCallbacks):
m_BufferEvent(bufferevent_socket_new(cNetworkSingleton::Get().GetEventBase(), -1, BEV_OPT_CLOSE_ON_FREE)),
m_Server(nullptr)
{
- // Create the LibEvent handle, but don't assign a socket to it yet (will be assigned within Connect() method):
- bufferevent_setcb(m_BufferEvent, ReadCallback, nullptr, EventCallback, this);
- bufferevent_enable(m_BufferEvent, EV_READ | EV_WRITE);
}
@@ -37,10 +34,6 @@ cTCPLinkImpl::cTCPLinkImpl(evutil_socket_t a_Socket, cTCPLink::cCallbacksPtr a_L
// Update the endpoint addresses:
UpdateLocalAddress();
UpdateAddress(a_Address, a_AddrLen, m_RemoteIP, m_RemotePort);
-
- // Create the LibEvent handle:
- bufferevent_setcb(m_BufferEvent, ReadCallback, nullptr, EventCallback, this);
- bufferevent_enable(m_BufferEvent, EV_READ | EV_WRITE);
}
@@ -65,6 +58,8 @@ cTCPLinkImplPtr cTCPLinkImpl::Connect(const AString & a_Host, UInt16 a_Port, cTC
cTCPLinkImplPtr res{new cTCPLinkImpl(a_LinkCallbacks)}; // Cannot use std::make_shared here, constructor is not accessible
res->m_ConnectCallbacks = a_ConnectCallbacks;
cNetworkSingleton::Get().AddLink(res);
+ res->m_Callbacks->OnLinkCreated(res);
+ res->Enable();
// If a_Host is an IP address, schedule a connection immediately:
sockaddr_storage sa;
@@ -107,6 +102,17 @@ cTCPLinkImplPtr cTCPLinkImpl::Connect(const AString & a_Host, UInt16 a_Port, cTC
+void cTCPLinkImpl::Enable(void)
+{
+ // Set the LibEvent callbacks and enable processing:
+ bufferevent_setcb(m_BufferEvent, ReadCallback, nullptr, EventCallback, this);
+ bufferevent_enable(m_BufferEvent, EV_READ | EV_WRITE);
+}
+
+
+
+
+
bool cTCPLinkImpl::Send(const void * a_Data, size_t a_Length)
{
return (bufferevent_write(m_BufferEvent, a_Data, a_Length) == 0);
@@ -160,7 +166,7 @@ void cTCPLinkImpl::ReadCallback(bufferevent * a_BufferEvent, void * a_Self)
size_t length;
while ((length = bufferevent_read(a_BufferEvent, data, sizeof(data))) > 0)
{
- Self->m_Callbacks->OnReceivedData(*Self, data, length);
+ Self->m_Callbacks->OnReceivedData(data, length);
}
}
@@ -189,7 +195,7 @@ void cTCPLinkImpl::EventCallback(bufferevent * a_BufferEvent, short a_What, void
}
else
{
- Self->m_Callbacks->OnError(*Self, err, evutil_socket_error_to_string(err));
+ Self->m_Callbacks->OnError(err, evutil_socket_error_to_string(err));
if (Self->m_Server == nullptr)
{
cNetworkSingleton::Get().RemoveLink(Self);
@@ -219,7 +225,7 @@ void cTCPLinkImpl::EventCallback(bufferevent * a_BufferEvent, short a_What, void
// If the connection has been closed, call the link callback and remove the connection:
if (a_What & BEV_EVENT_EOF)
{
- Self->m_Callbacks->OnRemoteClosed(*Self);
+ Self->m_Callbacks->OnRemoteClosed();
if (Self->m_Server != nullptr)
{
Self->m_Server->RemoveLink(Self);