ARCHIVE/hpcore
1
0
Fork 0
mirror of https://github.com/EvernodeXRPL/hpcore.git synced 2026-04-29 15:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expire inactive sessions. (#150)

Browse Source
This commit is contained in:
Savinda Senevirathne
2020-11-13 15:28:40 +05:30
committed by GitHub
parent 2e2a11b908
commit 8d5cb670ce
3 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/comm/comm_server.hpp
View File

@@ -84,6 +84,9 @@ namespace comm
// Cleanup any sessions that needs closure.
for (auto itr = sessions.begin(); itr != sessions.end();)
{
// Check whether the connection expired according to last activity time rules.
itr->check_last_activity_rules();
if (itr->state == SESSION_STATE::MUST_CLOSE)
itr->close(true);

23
src/comm/comm_session.cpp
View File

@@ -9,6 +9,8 @@
namespace comm
{
constexpr uint32_t INTERVALMS = 60000;
constexpr uint16_t INACTIVE_TIMEOUT = 120; // Time threshold for verified inactive connections in seconds.
constexpr uint16_t UNVERIFIED_INACTIVE_TIMEOUT = 5; // Time threshold for unverified inactive connections in seconds.
comm_session::comm_session(
std::string_view host_address, hpws::client &&hpws_client, const bool is_inbound, const uint64_t (&metric_thresholds)[4])
@@ -38,6 +40,7 @@ namespace comm
reader_thread = std::thread(&comm_session::reader_loop, this);
writer_thread = std::thread(&comm_session::process_outbound_msg_queue, this);
state = SESSION_STATE::ACTIVE;
last_activity_timestamp = util::get_epoch_milliseconds();
}
}
@@ -59,6 +62,9 @@ namespace comm
}
else
{
// Update last activity timestamp since this session received a message.
last_activity_timestamp = util::get_epoch_milliseconds();
// Enqueue the message for processing.
std::string_view data = std::get<std::string_view>(read_result);
std::vector<char> msg(data.size());
@@ -124,6 +130,9 @@ namespace comm
if (state == SESSION_STATE::CLOSED)
return -1;
// Updating last activity timestamp since this session is sending a message.
last_activity_timestamp = util::get_epoch_milliseconds();
// Passing the ownership of message to the queue.
out_msg_queue.enqueue(std::string(message));
return 0;
@@ -274,6 +283,20 @@ namespace comm
}
}
/**
* Check whether the connection expires according to last activity time rules and then mark for closure.
*/
void comm_session::check_last_activity_rules()
{
const uint16_t timeout_seconds = (challenge_status == CHALLENGE_STATUS::CHALLENGE_VERIFIED ? INACTIVE_TIMEOUT : UNVERIFIED_INACTIVE_TIMEOUT);
if (util::get_epoch_milliseconds() - last_activity_timestamp >= (timeout_seconds * 1000))
{
LOG_DEBUG << "Closing " << display_name() << " connection due to inactivity.";
mark_for_closure();
}
}
void comm_session::handle_connect()
{
}

2
src/comm/comm_session.hpp
View File

@@ -52,6 +52,7 @@ namespace comm
std::string issued_challenge;
SESSION_STATE state = SESSION_STATE::NONE;
CHALLENGE_STATUS challenge_status = CHALLENGE_STATUS::NOT_ISSUED;
uint64_t last_activity_timestamp; // Keep track of the last activity timestamp in milliseconds.
comm_session(
std::string_view host_address, hpws::client &&hpws_client, const bool is_inbound, const uint64_t (&metric_thresholds)[4]);
@@ -61,6 +62,7 @@ namespace comm
int send(std::string_view message);
int process_outbound_message(std::string_view message);
void process_outbound_msg_queue();
void check_last_activity_rules();
void mark_for_closure();
void close(const bool invoke_handler = true);
virtual const std::string display_name();