Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Remove some node debug output

Browse Source
This commit is contained in:
momo5502 2016-03-05 23:33:33 +01:00
parent e27d452c66
commit de882dee07
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/protobuf vendored

@ -1 +1 @@
Subproject commit e70f9256af79af6092eae4ce22a61b1b6651f37d Subproject commit 9242d9b7f431e40d119faef8b583d945362ef04c

27
src/Components/Modules/Node.cpp
View File

@ -219,7 +219,9 @@ namespace Components
} }
else else
{ {
#ifdef DEBUG
Logger::Print("Sending session request to %s\n", entry->address.GetString()); Logger::Print("Sending session request to %s\n", entry->address.GetString());
#endif
Network::SendCommand(entry->address, "sessionRequest"); Network::SendCommand(entry->address, "sessionRequest");
} }
} }
@ -438,7 +440,9 @@ namespace Components
Node::NodeEntry* entry = Node::FindNode(address); Node::NodeEntry* entry = Node::FindNode(address);
if (!entry || entry->state != Node::STATE_NEGOTIATING) return; if (!entry || entry->state != Node::STATE_NEGOTIATING) return;
#ifdef DEBUG
Logger::Print("Received acknowledgment from %s\n", address.GetString()); Logger::Print("Received acknowledgment from %s\n", address.GetString());
#endif
Proto::Node::Packet packet; Proto::Node::Packet packet;
if (!packet.ParseFromString(data)) return; if (!packet.ParseFromString(data)) return;
@ -456,8 +460,10 @@ namespace Components
entry->state = Node::STATE_VALID; entry->state = Node::STATE_VALID;
entry->registered = true; entry->registered = true;
#ifdef DEBUG
Logger::Print("Signature from %s for challenge '%s' is valid!\n", address.GetString(), entry->challenge.data()); Logger::Print("Signature from %s for challenge '%s' is valid!\n", address.GetString(), entry->challenge.data());
Logger::Print("Node %s registered\n", address.GetString()); Logger::Print("Node %s registered\n", address.GetString());
#endif
} }
else else
{ {
@ -519,7 +525,9 @@ namespace Components
entry->registered = false; entry->registered = false;
entry->state = Node::STATE_INVALID; entry->state = Node::STATE_INVALID;
#ifdef DEBUG
Logger::Print("Node %s unregistered\n", address.GetString()); Logger::Print("Node %s unregistered\n", address.GetString());
#endif
} }
else else
{ {
@ -541,7 +549,9 @@ namespace Components
Node::ClientSession* session = Node::FindSession(address); Node::ClientSession* session = Node::FindSession(address);
if (!session) return; // Registering template session failed, odd... if (!session) return; // Registering template session failed, odd...
#ifdef DEBUG
Logger::Print("Client %s is requesting a new session\n", address.GetString()); Logger::Print("Client %s is requesting a new session\n", address.GetString());
#endif
// Initialize session data // Initialize session data
session->challenge = Utils::VA("%X", Utils::Cryptography::Rand::GenerateInt()); session->challenge = Utils::VA("%X", Utils::Cryptography::Rand::GenerateInt());
@ -559,7 +569,9 @@ namespace Components
if (session->challenge == data) if (session->challenge == data)
{ {
#ifdef DEBUG
Logger::Print("Session for %s validated.\n", address.GetString()); Logger::Print("Session for %s validated.\n", address.GetString());
#endif
session->valid = true; session->valid = true;
Network::SendCommand(address, "sessionAcknowledge"); Network::SendCommand(address, "sessionAcknowledge");
} }
@ -577,7 +589,9 @@ namespace Components
Node::NodeEntry* entry = Node::FindNode(address); Node::NodeEntry* entry = Node::FindNode(address);
if (!entry) return; if (!entry) return;
#ifdef DEBUG
Logger::Print("Session initialization received. Synchronizing...\n", address.GetString()); Logger::Print("Session initialization received. Synchronizing...\n", address.GetString());
#endif
entry->lastTime = Game::Com_Milliseconds(); entry->lastTime = Game::Com_Milliseconds();
Network::SendCommand(address, "sessionSynchronize", data); Network::SendCommand(address, "sessionSynchronize", data);
@ -592,7 +606,9 @@ namespace Components
entry->registered = true; entry->registered = true;
entry->lastTime = Game::Com_Milliseconds(); entry->lastTime = Game::Com_Milliseconds();
#ifdef DEBUG
Logger::Print("Session acknowledged, synchronizing node list...\n", address.GetString()); Logger::Print("Session acknowledged, synchronizing node list...\n", address.GetString());
#endif
Network::SendCommand(address, "nodeListRequest"); Network::SendCommand(address, "nodeListRequest");
Node::SendNodeList(address); Node::SendNodeList(address);
}); });
@ -699,6 +715,17 @@ namespace Components
} }
}); });
Command::Add("syncnodes", [] (Command::Params params)
{
Logger::Print("Resetting node states...\n");
for (auto &node : Node::Nodes)
{
node.state = Node::STATE_UNKNOWN;
node.registered = false;
}
});
// Install frame handlers // Install frame handlers
QuickPatch::OnFrame(Node::FrameHandler); QuickPatch::OnFrame(Node::FrameHandler);
} }