soruh/centralex
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix ping timings

Browse Source
This commit is contained in:
soruh 2023-02-15 12:24:32 +01:00
parent ca06a02306
commit 0a2d763fbd
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.rs
View File

@ -32,7 +32,7 @@ const CALL_TIMEOUT: Duration = Duration::from_secs(24 * 60 * 60);
const PORT_RETRY_TIME: Duration = Duration::from_secs(15 * 60); const PORT_RETRY_TIME: Duration = Duration::from_secs(15 * 60);
const PORT_OWNERSHIP_TIMEOUT: Duration = Duration::from_secs(1 * 60 * 60); const PORT_OWNERSHIP_TIMEOUT: Duration = Duration::from_secs(1 * 60 * 60);
const PING_TIMEOUT: Duration = Duration::from_secs(30); const PING_TIMEOUT: Duration = Duration::from_secs(30);
const SEND_PING_INTERVAL: Duration = Duration::from_secs(30); const SEND_PING_INTERVAL: Duration = Duration::from_secs(20);
const BIND_IP: &str = "0.0.0.0"; const BIND_IP: &str = "0.0.0.0";
@ -433,6 +433,13 @@ async fn connection_handler(
}; };
}; };
packet.header = Header {
kind: PacketKind::RemConfirm.raw(),
length: 0,
};
packet.data.clear();
packet.send(&mut writer).await?;
#[derive(Debug)] #[derive(Debug)]
enum Result { enum Result {
Caller { Caller {
@ -450,6 +457,8 @@ async fn connection_handler(
let result = loop { let result = loop {
let now = Instant::now(); let now = Instant::now();
// println!("next ping in {:?}s", SEND_PING_INTERVAL.saturating_sub(now.saturating_duration_since(last_ping_sent_at)).as_secs());
// println!("will timeout in in {:?}s", PING_TIMEOUT.saturating_sub(now.saturating_duration_since(last_ping_received_at)).as_secs());
select! { select! {
caller = listener.accept() => { caller = listener.accept() => {
@ -460,14 +469,16 @@ async fn connection_handler(
packet.recv_into(&mut reader).await?; packet.recv_into(&mut reader).await?;
if packet.kind() == PacketKind::Ping { if packet.kind() == PacketKind::Ping {
last_ping_received_at = now; // println!("received ping");
last_ping_received_at = Instant::now();
} else { } else {
break Result::Packet { packet } break Result::Packet { packet }
} }
}, },
_ = sleep(SEND_PING_INTERVAL.saturating_sub(now.saturating_duration_since(last_ping_sent_at))) => { _ = sleep(SEND_PING_INTERVAL.saturating_sub(now.saturating_duration_since(last_ping_sent_at))) => {
// println!("sending ping");
writer.write_all(bytemuck::bytes_of(& Header { kind: PacketKind::Ping.raw(), length: 0 })).await?; writer.write_all(bytemuck::bytes_of(& Header { kind: PacketKind::Ping.raw(), length: 0 })).await?;
last_ping_sent_at = now; last_ping_sent_at = Instant::now();
} }
_ = sleep(PING_TIMEOUT.saturating_sub(now.saturating_duration_since(last_ping_received_at))) => { _ = sleep(PING_TIMEOUT.saturating_sub(now.saturating_duration_since(last_ping_received_at))) => {
writer.write_all(REJECT_TIMEOUT).await?; writer.write_all(REJECT_TIMEOUT).await?;