diff --git a/common/net/servertalk_client_connection.cpp b/common/net/servertalk_client_connection.cpp index ec0b5bc47..605bac61a 100644 --- a/common/net/servertalk_client_connection.cpp +++ b/common/net/servertalk_client_connection.cpp @@ -72,8 +72,12 @@ void EQ::Net::ServertalkClient::Connect() m_connection->OnRead(std::bind(&EQ::Net::ServertalkClient::ProcessData, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); m_connection->Start(); - SendHello(); + SendHandshake(); m_connecting = false; + + if (m_on_connect_cb) { + m_on_connect_cb(this); + } }); } @@ -83,12 +87,6 @@ void EQ::Net::ServertalkClient::ProcessData(EQ::Net::TCPConnection *c, const uns ProcessReadBuffer(); } -void EQ::Net::ServertalkClient::SendHello() -{ - EQ::Net::DynamicPacket p; - InternalSend(ServertalkClientHello, p); -} - void EQ::Net::ServertalkClient::InternalSend(ServertalkPacketType type, EQ::Net::Packet &p) { if (!m_connection) @@ -133,9 +131,6 @@ void EQ::Net::ServertalkClient::ProcessReadBuffer() if (length == 0) { EQ::Net::DynamicPacket p; switch (type) { - case ServertalkServerHello: - ProcessHello(p); - break; case ServertalkMessage: ProcessMessage(p); break; @@ -144,9 +139,6 @@ void EQ::Net::ServertalkClient::ProcessReadBuffer() else { EQ::Net::StaticPacket p(&m_buffer[current + 5], length); switch (type) { - case ServertalkServerHello: - ProcessHello(p); - break; case ServertalkMessage: ProcessMessage(p); break; @@ -164,25 +156,6 @@ void EQ::Net::ServertalkClient::ProcessReadBuffer() } } -void EQ::Net::ServertalkClient::ProcessHello(EQ::Net::Packet &p) -{ - try { - SendHandshake(); - - if (m_on_connect_cb) { - m_on_connect_cb(this); - } -} - catch (std::exception &ex) { - LogError("Error parsing hello from server: {0}", ex.what()); - m_connection->Disconnect(); - - if (m_on_connect_cb) { - m_on_connect_cb(nullptr); - } - } -} - void EQ::Net::ServertalkClient::ProcessMessage(EQ::Net::Packet &p) { try { diff --git a/common/net/servertalk_client_connection.h b/common/net/servertalk_client_connection.h index 704b48ded..24c42a592 100644 --- a/common/net/servertalk_client_connection.h +++ b/common/net/servertalk_client_connection.h @@ -26,10 +26,8 @@ namespace EQ private: void Connect(); void ProcessData(EQ::Net::TCPConnection *c, const unsigned char *data, size_t length); - void SendHello(); void InternalSend(ServertalkPacketType type, EQ::Net::Packet &p); void ProcessReadBuffer(); - void ProcessHello(EQ::Net::Packet &p); void ProcessMessage(EQ::Net::Packet &p); void SendHandshake(); diff --git a/common/net/servertalk_common.h b/common/net/servertalk_common.h index 4f6ca36a6..e378dae49 100644 --- a/common/net/servertalk_common.h +++ b/common/net/servertalk_common.h @@ -8,8 +8,6 @@ namespace EQ { enum ServertalkPacketType { - ServertalkClientHello = 1, - ServertalkServerHello, ServertalkClientHandshake, ServertalkMessage, }; diff --git a/common/net/servertalk_server_connection.cpp b/common/net/servertalk_server_connection.cpp index 8fa49265e..c72c98279 100644 --- a/common/net/servertalk_server_connection.cpp +++ b/common/net/servertalk_server_connection.cpp @@ -81,11 +81,6 @@ void EQ::Net::ServertalkServerConnection::ProcessReadBuffer() if (length == 0) { EQ::Net::DynamicPacket p; switch (type) { - case ServertalkClientHello: - { - SendHello(); - } - break; case ServertalkClientHandshake: ProcessHandshake(p); break; @@ -97,11 +92,6 @@ void EQ::Net::ServertalkServerConnection::ProcessReadBuffer() else { EQ::Net::StaticPacket p(&m_buffer[current + 5], length); switch (type) { - case ServertalkClientHello: - { - SendHello(); - } - break; case ServertalkClientHandshake: ProcessHandshake(p); break; @@ -127,14 +117,6 @@ void EQ::Net::ServertalkServerConnection::OnDisconnect(TCPConnection *c) m_parent->ConnectionDisconnected(this); } -void EQ::Net::ServertalkServerConnection::SendHello() -{ - EQ::Net::DynamicPacket hello; - hello.PutInt8(0, 0); - - InternalSend(ServertalkServerHello, hello); -} - void EQ::Net::ServertalkServerConnection::InternalSend(ServertalkPacketType type, EQ::Net::Packet &p) { if (!m_connection) diff --git a/common/net/servertalk_server_connection.h b/common/net/servertalk_server_connection.h index f8110f51a..5b78b0ef4 100644 --- a/common/net/servertalk_server_connection.h +++ b/common/net/servertalk_server_connection.h @@ -28,7 +28,6 @@ namespace EQ void OnRead(TCPConnection* c, const unsigned char* data, size_t sz); void ProcessReadBuffer(); void OnDisconnect(TCPConnection* c); - void SendHello(); void InternalSend(ServertalkPacketType type, EQ::Net::Packet &p); void ProcessHandshake(EQ::Net::Packet &p); void ProcessMessage(EQ::Net::Packet &p);