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

Use proto3

Browse Source
This commit is contained in:
momo5502 2016-02-10 15:38:34 +01:00
parent 75e76226d1
commit 1359c12160
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,7 +231,7 @@ namespace Components
std::string data; std::string data;
Proto::NodePacket packet; Proto::NodePacket packet;
packet.set_challenge(node.challenge); packet.set_challenge(node.challenge);
packet.SerializePartialToString(&data); packet.SerializeToString(&data);
Logger::Print("Sending registration request to %s\n", node.address.GetString()); Logger::Print("Sending registration request to %s\n", node.address.GetString());
Network::SendRaw(node.address, "nodeRegisterRequest\n" + data); Network::SendRaw(node.address, "nodeRegisterRequest\n" + data);
@ -317,7 +317,7 @@ namespace Components
Proto::NodePacket packet; Proto::NodePacket packet;
packet.set_challenge(challenge); packet.set_challenge(challenge);
packet.set_signature(Utils::Cryptography::ECDSA::SignMessage(Node::SignatureKey, challenge)); packet.set_signature(Utils::Cryptography::ECDSA::SignMessage(Node::SignatureKey, challenge));
packet.SerializePartialToString(&data); packet.SerializeToString(&data);
for (auto node : Node::Nodes) for (auto node : Node::Nodes)
{ {
@ -343,7 +343,7 @@ namespace Components
Proto::NodePacket packet; Proto::NodePacket packet;
if (!packet.ParseFromString(data)) return; if (!packet.ParseFromString(data)) return;
if (!packet.has_challenge()) return; if (!packet.challenge().size()) return;
std::string response; std::string response;
std::string signature = Utils::Cryptography::ECDSA::SignMessage(Node::SignatureKey, packet.challenge()); std::string signature = Utils::Cryptography::ECDSA::SignMessage(Node::SignatureKey, packet.challenge());
@ -371,9 +371,9 @@ namespace Components
Proto::NodePacket packet; Proto::NodePacket packet;
if (!packet.ParseFromString(data)) return; if (!packet.ParseFromString(data)) return;
if (!packet.has_challenge()) return; if (!packet.challenge().size()) return;
if (!packet.has_publickey()) return; if (!packet.publickey().size()) return;
if (!packet.has_signature()) return; if (!packet.signature().size()) return;
std::string challenge = packet.challenge(); std::string challenge = packet.challenge();
std::string publicKey = packet.publickey(); std::string publicKey = packet.publickey();
@ -404,7 +404,7 @@ namespace Components
packet.Clear(); packet.Clear();
packet.set_signature(signature); packet.set_signature(signature);
packet.set_publickey(publicKey); packet.set_publickey(publicKey);
packet.SerializePartialToString(&data); packet.SerializeToString(&data);
Network::SendRaw(address, "nodeRegisterAcknowledge\n" + data); Network::SendRaw(address, "nodeRegisterAcknowledge\n" + data);
}); });
@ -419,8 +419,8 @@ namespace Components
Proto::NodePacket packet; Proto::NodePacket packet;
if (!packet.ParseFromString(data)) return; if (!packet.ParseFromString(data)) return;
if (!packet.has_signature()) return; if (!packet.signature().size()) return;
if (!packet.has_publickey()) return; if (!packet.publickey().size()) return;
std::string publicKey = packet.publickey(); std::string publicKey = packet.publickey();
std::string signature = packet.signature(); std::string signature = packet.signature();
@ -485,8 +485,8 @@ namespace Components
Proto::NodePacket packet; Proto::NodePacket packet;
if (!packet.ParseFromString(data)) return; if (!packet.ParseFromString(data)) return;
if (!packet.has_challenge()) return; if (!packet.challenge().size()) return;
if (!packet.has_signature()) return; if (!packet.signature().size()) return;
std::string challenge = packet.challenge(); std::string challenge = packet.challenge();
std::string signature = packet.signature(); std::string signature = packet.signature();

6
tools/proto/node.proto
View File

@ -3,7 +3,7 @@ syntax = "proto3";
package Proto; package Proto;
message NodePacket { message NodePacket {
string challenge = 1; bytes challenge = 1;
string signature = 2; bytes signature = 2;
string publicKey = 3; bytes publicKey = 3;
} }