Skip to content

Refactor keep-alive process logic. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 14, 2024
Merged

Refactor keep-alive process logic. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ void Client::ListenForServerCommands() {

if ( receivedPacket.action == kKeepAlive ) {
// echo keep alive
//NetCommon::TransmitData(receivedPacket, this->m_TCPSocket, TCP, NetCommon::_default, TRUE, this->m_ServerPublicKey, FALSE);
NetCommon::TransmitData(receivedPacket, this->m_TCPSocket, TCP, NetCommon::_default, TRUE, this->m_ServerPublicKey, FALSE);
continue;
}

Expand Down
61 changes: 37 additions & 24 deletions src/ServerInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
#include <fstream>
#include <chrono>

Packet CreateKeepAlivePacket() {
Packet packet;
packet.buffLen = 0;
packet.action = kKeepAlive;

return packet;
}

/*
packet flag description
for printing info about the flag
Expand Down Expand Up @@ -395,18 +403,22 @@ void ServerInterface::OnKeepAliveEcho(long cuid, BYTESTRING receivedEncrypted) {
if ( !client )
return;

Packet keepAlive;
keepAlive.action = RemoteAction::kKeepAlive;
keepAlive.buffLen = 0;
BYTESTRING encryptedSent = LGCrypto::RSAEncrypt(Serialization::SerializeStruct(keepAlive), client->ClientPublicKey, FALSE);
BYTESTRING receivedDecrypted = LGCrypto::RSADecrypt(receivedEncrypted, this->m_SessionKeys.priv, TRUE);
if ( !LGCrypto::GoodDecrypt(receivedDecrypted) ) {
client->KeepAliveSuccess = FALSE;
client->KeepAliveProcess = FALSE;
return;
}

Packet echoed = Serialization::DeserializeToStruct<Packet>(receivedDecrypted);

if ( receivedEncrypted.size() == encryptedSent.size() ) {
if ( echoed.action == kKeepAlive ) {
client->KeepAliveProcess = FALSE;
client->KeepAliveSuccess = TRUE;
return;
}
else {
client->KeepAliveSuccess = FALSE;
}

client->KeepAliveSuccess = FALSE;
}

void ServerInterface::SendKeepAlivePackets(long cuid) {
Expand All @@ -419,12 +431,7 @@ void ServerInterface::SendKeepAlivePackets(long cuid) {

std::cout << "Sending keep-alive packet to " << cuid << "..." << std::endl;

Packet keepAlive;
keepAlive.action = RemoteAction::kKeepAlive;
keepAlive.buffLen = 0;
BYTESTRING encryptedOriginal = LGCrypto::RSAEncrypt(Serialization::SerializeStruct(keepAlive), client->ClientPublicKey, FALSE);

client->KeepAliveProcess = TRUE;
BYTESTRING encryptedOriginal = LGCrypto::RSAEncrypt(Serialization::SerializeStruct(CreateKeepAlivePacket()), client->ClientPublicKey, FALSE);

NetCommon::SetSocketTimeout(client->GetSocket(), ReadConfig().keepAliveTimeoutMs, SO_SNDTIMEO);
BOOL sent = NetCommon::TransmitData(encryptedOriginal, client->GetSocket(), TCP);
Expand All @@ -435,22 +442,28 @@ void ServerInterface::SendKeepAlivePackets(long cuid) {
break;
}

BYTESTRING encryptedReceived;
NetCommon::SetSocketTimeout(client->GetSocket(), 2000, SO_RCVTIMEO);
BOOL recv = NetCommon::ReceiveData(encryptedReceived, client->GetSocket(), TCP);
NetCommon::ResetSocketTimeout(client->GetSocket(), SO_RCVTIMEO);
client->KeepAliveProcess = TRUE;

int timePassedMs = 0;

// sleep for timeout
// while keep alive process is in progress
// and while success is false
do {
Sleep(100);
timePassedMs += 100;
} while ( timePassedMs < ReadConfig().keepAliveTimeoutMs && client->KeepAliveSuccess == FALSE && client->KeepAliveProcess == TRUE );

client->KeepAliveProcess = FALSE;

if ( client->KeepAliveSuccess == TRUE ) {
std::cout << "Successful keep-alive procedure." << std::endl;
Sleep(ReadConfig().keepAliveIntervalMs);
}
else {
std::cout << "failed" << std::endl;
if ( client->KeepAliveSuccess == FALSE ) {
std::cout << "Client failed to respond to keep-alive packet." << std::endl;
RemoveClientFromServer(client);
break;
}

std::cout << "Successful keep-alive procedure." << std::endl;
Sleep(ReadConfig().keepAliveIntervalMs);
} while ( client->Alive );

std::cout << "Removed..." << std::endl;
Expand Down