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

[Node] Introduce net_natFix dvar

Browse Source
This commit is contained in:
momo5502 2017-05-31 23:45:30 +02:00
parent d091c6e208
commit 17ae11544d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,7 +261,7 @@ namespace Components
entry->challenge = Utils::Cryptography::Rand::GenerateChallenge(); entry->challenge = Utils::Cryptography::Rand::GenerateChallenge();
Proto::Node::Packet packet; Proto::Node::Packet packet;
packet.set_port(Network::GetPort()); packet.set_port(Node::GetPort());
packet.set_challenge(entry->challenge); packet.set_challenge(entry->challenge);
#if defined(DEBUG) && !defined(DISABLE_NODE_LOG) #if defined(DEBUG) && !defined(DISABLE_NODE_LOG)
@ -389,6 +389,7 @@ namespace Components
// ZoneBuilder doesn't require node stuff // ZoneBuilder doesn't require node stuff
if (ZoneBuilder::IsEnabled()) return; if (ZoneBuilder::IsEnabled()) return;
Dvar::Register<bool>("net_natFix", false, 0, "Fix node registration for certain firewalls/routers");
// Generate our ECDSA key // Generate our ECDSA key
Node::SignatureKey = Utils::Cryptography::ECC::GenerateKey(512); Node::SignatureKey = Utils::Cryptography::ECC::GenerateKey(512);
@ -413,7 +414,7 @@ namespace Components
std::string challenge = Utils::Cryptography::Rand::GenerateChallenge(); std::string challenge = Utils::Cryptography::Rand::GenerateChallenge();
Proto::Node::Packet packet; Proto::Node::Packet packet;
packet.set_port(Network::GetPort()); packet.set_port(Node::GetPort());
packet.set_challenge(challenge); packet.set_challenge(challenge);
packet.set_signature(Utils::Cryptography::ECC::SignMessage(Node::SignatureKey, challenge)); packet.set_signature(Utils::Cryptography::ECC::SignMessage(Node::SignatureKey, challenge));
@ -467,7 +468,7 @@ namespace Components
packet.set_challenge(challenge); packet.set_challenge(challenge);
packet.set_signature(signature); packet.set_signature(signature);
packet.set_publickey(Node::SignatureKey.getPublicKey()); packet.set_publickey(Node::SignatureKey.getPublicKey());
packet.set_port(Network::GetPort()); packet.set_port(Node::GetPort());
entry->lastTime = Game::Sys_Milliseconds(); entry->lastTime = Game::Sys_Milliseconds();
entry->challenge = challenge; entry->challenge = challenge;
@ -953,6 +954,12 @@ namespace Components
} }
} }
unsigned short Node::GetPort()
{
if (Dvar::Var("net_natFix").get<bool>()) return 0;
return Network::GetPort();
}
bool Node::unitTest() bool Node::unitTest()
{ {
printf("Testing ECDSA key..."); printf("Testing ECDSA key...");

2
src/Components/Modules/Node.hpp
View File

@ -90,6 +90,8 @@ namespace Components
static void DeleteInvalidNodes(); static void DeleteInvalidNodes();
static void DeleteInvalidSessions(); static void DeleteInvalidSessions();
static unsigned short GetPort();
static const char* GetStateName(EntryState state); static const char* GetStateName(EntryState state);
}; };
} }