stephenseo/UDPConnection
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages 1 Wiki Activity Actions

Fix setting trigger-send flag

Browse source 
Fix trigger-send flag related bug where send time of packets were
inconsistent.
Also fix UDPC_client_initiate_connection not immediately sending connection
packet.
This commit is contained in:
Stephen Seo 2019-09-18 11:42:16 +09:00
parent 2bc6eeffe9
commit fefbfc8d70
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cpp_impl/src/UDPConnection.cpp
View file

@ -140,9 +140,10 @@ mutex()
void UDPC::Context::update_impl() { void UDPC::Context::update_impl() {
const auto now = std::chrono::steady_clock::now(); const auto now = std::chrono::steady_clock::now();
std::chrono::steady_clock::duration dt = now - lastUpdated;
std::chrono::steady_clock::duration temp_dt_fs;
lastUpdated = now; lastUpdated = now;
std::chrono::steady_clock::duration temp_dt_fs;
{ {
// check timed out, check good/bad mode with rtt, remove timed out // check timed out, check good/bad mode with rtt, remove timed out
std::vector<UDPC_ConnectionId> removed; std::vector<UDPC_ConnectionId> removed;
@ -160,8 +161,8 @@ void UDPC::Context::update_impl() {
} }
// check good/bad mode // check good/bad mode
iter->second.toggleTimer += temp_dt_fs; iter->second.toggleTimer += dt;
iter->second.toggledTimer += temp_dt_fs; iter->second.toggledTimer += dt;
if(iter->second.flags.test(1) && !iter->second.flags.test(2)) { if(iter->second.flags.test(1) && !iter->second.flags.test(2)) {
// good mode, bad rtt // good mode, bad rtt
log( log(
@ -203,7 +204,7 @@ void UDPC::Context::update_impl() {
iter->second.toggledTimer = std::chrono::steady_clock::duration::zero(); iter->second.toggledTimer = std::chrono::steady_clock::duration::zero();
} }
iter->second.timer += temp_dt_fs; iter->second.timer += dt;
if(iter->second.flags.test(1)) { if(iter->second.flags.test(1)) {
if(iter->second.timer >= UDPC::GOOD_MODE_SEND_RATE) { if(iter->second.timer >= UDPC::GOOD_MODE_SEND_RATE) {
iter->second.timer -= UDPC::GOOD_MODE_SEND_RATE; iter->second.timer -= UDPC::GOOD_MODE_SEND_RATE;
@ -741,7 +742,7 @@ void UDPC::Context::update_impl() {
} else if(bytes == 20) { } else if(bytes == 20) {
log( log(
UDPC_LoggingType::VERBOSE, UDPC_LoggingType::VERBOSE,
"Received packet has no payload"); "Received packet has no payload (probably heartbeat packet)");
} }
} }
@ -974,6 +975,7 @@ void UDPC_client_initiate_connection(UDPC_HContext ctx, UDPC_ConnectionId connec
std::lock_guard<std::mutex> lock(c->mutex); std::lock_guard<std::mutex> lock(c->mutex);
UDPC::ConnectionData newCon(false, c, connectionId.addr, connectionId.port); UDPC::ConnectionData newCon(false, c, connectionId.addr, connectionId.port);
newCon.sent = std::chrono::steady_clock::now() - UDPC::INIT_PKT_INTERVAL_DT;
if(c->conMap.find(connectionId) == c->conMap.end()) { if(c->conMap.find(connectionId) == c->conMap.end()) {
c->conMap.insert(std::make_pair(connectionId, std::move(newCon))); c->conMap.insert(std::make_pair(connectionId, std::move(newCon)));