leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merging session and user-provided peer timeouts

Browse source
This commit is contained in:
Igor Katson 2023-11-30 16:26:57 +00:00
parent a0feee27a6
commit 42b1fb09c2
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/librqbit/src/peer_connection.rs
View file

@ -38,7 +38,7 @@ pub enum WriterRequest {
Disconnect, Disconnect,
} }
#[derive(Default, Copy, Clone)] #[derive(Default, Debug, Copy, Clone)]
pub struct PeerConnectionOptions { pub struct PeerConnectionOptions {
pub connect_timeout: Option<Duration>, pub connect_timeout: Option<Duration>,
pub read_write_timeout: Option<Duration>, pub read_write_timeout: Option<Duration>,

26
crates/librqbit/src/session.rs
View file

@ -353,6 +353,22 @@ impl Session {
self.dht.as_ref() self.dht.as_ref()
} }
fn merge_peer_opts(&self, other: Option<PeerConnectionOptions>) -> PeerConnectionOptions {
let other = match other {
Some(o) => o,
None => self.peer_opts,
};
PeerConnectionOptions {
connect_timeout: other.connect_timeout.or(self.peer_opts.connect_timeout),
read_write_timeout: other
.read_write_timeout
.or(self.peer_opts.read_write_timeout),
keep_alive_interval: other
.keep_alive_interval
.or(self.peer_opts.keep_alive_interval),
}
}
async fn populate_from_stored(self: &Arc<Self>) -> anyhow::Result<()> { async fn populate_from_stored(self: &Arc<Self>) -> anyhow::Result<()> {
let mut rdr = match std::fs::File::open(&self.persistence_filename) { let mut rdr = match std::fs::File::open(&self.persistence_filename) {
Ok(f) => BufReader::new(f), Ok(f) => BufReader::new(f),
@ -459,7 +475,7 @@ impl Session {
let opts = opts.unwrap_or_default(); let opts = opts.unwrap_or_default();
let (info_hash, info, dht_rx, trackers, initial_peers) = match add.into() { let (info_hash, info, dht_rx, trackers, initial_peers) = match add {
AddTorrent::Url(magnet) if magnet.starts_with("magnet:") => { AddTorrent::Url(magnet) if magnet.starts_with("magnet:") => {
let Magnet { let Magnet {
info_hash, info_hash,
@ -488,7 +504,7 @@ impl Session {
self.peer_id, self.peer_id,
info_hash, info_hash,
dht_rx, dht_rx,
Some(self.peer_opts), Some(self.merge_peer_opts(opts.peer_opts)),
) )
.await .await
{ {
@ -650,11 +666,13 @@ impl Session {
builder.force_tracker_interval(interval); builder.force_tracker_interval(interval);
} }
if let Some(t) = opts.peer_opts.unwrap_or(self.peer_opts).connect_timeout { let peer_opts = self.merge_peer_opts(opts.peer_opts);
if let Some(t) = peer_opts.connect_timeout {
builder.peer_connect_timeout(t); builder.peer_connect_timeout(t);
} }
if let Some(t) = opts.peer_opts.unwrap_or(self.peer_opts).read_write_timeout { if let Some(t) = peer_opts.read_write_timeout {
builder.peer_read_write_timeout(t); builder.peer_read_write_timeout(t);
} }