pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More HC work, almost fully logs in

Browse Source
This commit is contained in:
KimLS 2016-11-19 15:50:22 -08:00
parent c86d4be1ae
commit c77e65c07d
5 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/net/daybreak_connection.cpp
View File

@ -731,6 +731,8 @@ void EQ::Net::DaybreakConnection::ProcessDecodedPacket(const Packet &p)
InternalSend(out); InternalSend(out);
break; break;
} }
case OP_SessionStatResponse:
break;
default: default:
Log.OutF(Logs::Detail, Logs::Netcode, "Unhandled opcode {0:#x}", p.GetInt8(1)); Log.OutF(Logs::Detail, Logs::Netcode, "Unhandled opcode {0:#x}", p.GetInt8(1));
break; break;

2
common/net/daybreak_connection.h
View File

@ -222,7 +222,7 @@ namespace EQ
resend_delay_factor = 1.5; resend_delay_factor = 1.5;
stats_delay_ms = 9000; stats_delay_ms = 9000;
connect_delay_ms = 250; connect_delay_ms = 250;
stale_connection_ms = 30000; stale_connection_ms = 60000;
connect_stale_ms = 5000; connect_stale_ms = 5000;
crc_length = 2; crc_length = 2;
max_packet_size = 512; max_packet_size = 512;

70
hc/eq.cpp
View File

@ -287,41 +287,14 @@ void EverQuest::WorldOnStatusChangeReconnectDisabled(std::shared_ptr<EQ::Net::Da
void EverQuest::WorldOnPacketRecv(std::shared_ptr<EQ::Net::DaybreakConnection> conn, const EQ::Net::Packet & p) void EverQuest::WorldOnPacketRecv(std::shared_ptr<EQ::Net::DaybreakConnection> conn, const EQ::Net::Packet & p)
{ {
Log.OutF(Logs::General, Logs::Headless_Client, "Packet in:\n{0}", p.ToString());
auto opcode = p.GetUInt16(0); auto opcode = p.GetUInt16(0);
switch (opcode) { switch (opcode) {
case 0x7499:
Log.OutF(Logs::General, Logs::Headless_Client, "OP_ApproveWorld");
break;
case 0x7ceb:
Log.OutF(Logs::General, Logs::Headless_Client, "OP_LogServer");
break;
case 0x578f:
Log.OutF(Logs::General, Logs::Headless_Client, "OP_EnterWorld");
break;
case 0x6259:
Log.OutF(Logs::General, Logs::Headless_Client, "OP_PostEnterWorld");
break;
case 0x590d:
Log.OutF(Logs::General, Logs::Headless_Client, "OP_ExpansionInfo");
break;
case 0x507a:
Log.OutF(Logs::General, Logs::Headless_Client, "OP_GuildsList");
break;
case 0x5475:
Log.OutF(Logs::General, Logs::Headless_Client, "OP_SendMaxCharacters");
break;
case 0x7acc:
Log.OutF(Logs::General, Logs::Headless_Client, "OP_SendMembership");
break;
case 0x057b:
Log.OutF(Logs::General, Logs::Headless_Client, "OP_SendMembershipDetails");
break;
case 0x00d2: case 0x00d2:
Log.OutF(Logs::General, Logs::Headless_Client, "OP_SendCharInfo"); WorldProcessCharacterSelect(p);
break; break;
default: default:
Log.OutF(Logs::General, Logs::Headless_Client, "Ignored packet: {0:#x}", opcode); Log.OutF(Logs::General, Logs::Headless_Client, "Unhandled opcode: {0:#x}", opcode);
break;
} }
} }
@ -338,3 +311,40 @@ void EverQuest::WorldSendClientAuth()
m_world_connection->QueuePacket(p); m_world_connection->QueuePacket(p);
} }
void EverQuest::WorldSendEnterWorld(const std::string &character)
{
EQ::Net::DynamicPacket p;
p.PutUInt16(0, 0x578f);
p.PutString(2, character);
p.PutUInt32(66, 0);
p.PutUInt32(70, 0);
m_world_connection->QueuePacket(p);
}
void EverQuest::WorldProcessCharacterSelect(const EQ::Net::Packet &p)
{
auto char_count = p.GetUInt32(2);
size_t idx = 6;
//Log.OutF(Logs::General, Logs::Headless_Client, "{0} characters", char_count);
for (uint32_t i = 0; i < char_count; ++i) {
auto name = p.GetCString(idx);
idx += name.length() + 1;
auto pclass = p.GetUInt8(idx);
auto prace = p.GetUInt32(idx + 1);
auto plevel = p.GetUInt8(idx + 5);
idx += 274;
if (m_character.compare(name) == 0) {
Log.OutF(Logs::General, Logs::Headless_Client, "Found {0}, would attempt to login here.", m_character);
WorldSendEnterWorld(m_character);
return;
}
}
Log.OutF(Logs::General, Logs::Headless_Client, "Could not find {0}, cannot continue to login.", m_character);
}

3
hc/eq.h
View File

@ -54,6 +54,9 @@ private:
void WorldOnPacketRecv(std::shared_ptr<EQ::Net::DaybreakConnection> conn, const EQ::Net::Packet &p); void WorldOnPacketRecv(std::shared_ptr<EQ::Net::DaybreakConnection> conn, const EQ::Net::Packet &p);
void WorldSendClientAuth(); void WorldSendClientAuth();
void WorldSendEnterWorld(const std::string &character);
void WorldProcessCharacterSelect(const EQ::Net::Packet &p);
std::unique_ptr<EQ::Net::DaybreakConnectionManager> m_world_connection_manager; std::unique_ptr<EQ::Net::DaybreakConnectionManager> m_world_connection_manager;
std::shared_ptr<EQ::Net::DaybreakConnection> m_world_connection; std::shared_ptr<EQ::Net::DaybreakConnection> m_world_connection;

1
ucs/clientlist.cpp
View File

@ -469,6 +469,7 @@ static void ProcessCommandIgnore(Client *c, std::string Ignoree) {
Clientlist::Clientlist(int ChatPort) { Clientlist::Clientlist(int ChatPort) {
EQ::Net::EQStreamManagerOptions chat_opts(ChatPort, false, false); EQ::Net::EQStreamManagerOptions chat_opts(ChatPort, false, false);
chat_opts.opcode_size = 1; chat_opts.opcode_size = 1;
chat_opts.daybreak_options.stale_connection_ms = 300000;
chatsf = new EQ::Net::EQStreamManager(chat_opts); chatsf = new EQ::Net::EQStreamManager(chat_opts);
ChatOpMgr = new RegularOpcodeManager; ChatOpMgr = new RegularOpcodeManager;