Skip to content

refactor: update sessions map #46

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

Open
harsh-98 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

refactor: update sessions map #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e468d5d
fix: conv is not async and update sessions map
harsh-98 May 13, 2025
cb075d3
fix: for API consistency keep conv async
harsh-98 May 14, 2025
997d6d7
fix: formatting
harsh-98 May 15, 2025
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
5 changes: 3 additions & 2 deletions src/listener.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,9 @@ impl KcpListener {

pub fn poll_accept(&mut self, cx: &mut Context<'_>) -> Poll<KcpResult<(KcpStream, SocketAddr)>> {
self.accept_rx.poll_recv(cx).map(|op_res| {
op_res
.ok_or_else(|| KcpError::IoError(io::Error::new(ErrorKind::Other, "accept channel closed unexpectedly")))
op_res.ok_or_else(|| {
KcpError::IoError(io::Error::new(ErrorKind::Other, "accept channel closed unexpectedly"))
})
})
}

Expand Down
61 changes: 23 additions & 38 deletions src/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::{
collections::{hash_map::Entry, HashMap},
collections::HashMap,
fmt::{self, Debug},
net::SocketAddr,
ops::Deref,
Expand Down Expand Up @@ -324,46 +324,31 @@ impl KcpSessionManager {
peer_addr: SocketAddr,
session_close_notifier: &mpsc::Sender<SocketAddr>,
) -> KcpResult<(Arc<KcpSession>, bool)> {
match self.sessions.entry(peer_addr) {
Entry::Occupied(mut occ) => {
let session = occ.get();

if sn == 0 && session.conv().await != conv {
// This is the first packet received from this peer.
// Recreate a new session for this specific client.

let socket = KcpSocket::new(config, conv, udp.clone(), peer_addr, config.stream)?;
let session = KcpSession::new_shared(
socket,
config.session_expire,
Some((session_close_notifier.clone(), peer_addr)),
);

let old_session = occ.insert(KcpSessionUniq(session.clone()));
let old_conv = old_session.conv().await;
trace!(
"replaced session with conv: {} (old: {}), peer: {}",
conv,
old_conv,
peer_addr
);

Ok((session, true))
} else {
Ok((session.0.clone(), false))
}
}
Entry::Vacant(vac) => {
let socket = KcpSocket::new(config, conv, udp.clone(), peer_addr, config.stream)?;
let session = KcpSession::new_shared(
socket,
config.session_expire,
Some((session_close_notifier.clone(), peer_addr)),
let old_conv_id = if let Some(session) = self.sessions.get(&peer_addr) {
Some(session.conv().await)
} else {
None
};
let update = old_conv_id.is_none() || (sn == 0 && old_conv_id.unwrap() != conv);
if old_conv_id.is_none() || (sn == 0 && old_conv_id.unwrap() != conv) {
let socket = KcpSocket::new(config, conv, udp.clone(), peer_addr, config.stream)?;
let session = KcpSession::new_shared(
socket,
config.session_expire,
Some((session_close_notifier.clone(), peer_addr)),
);
if let Some(old_conv) = old_conv_id {
trace!(
"replaced session with conv: {} (old: {}), peer: {}",
conv,
old_conv,
peer_addr
);
} else {
trace!("created session for conv: {}, peer: {}", conv, peer_addr);
vac.insert(KcpSessionUniq(session.clone()));
Ok((session, true))
}
self.sessions.entry(peer_addr).insert_entry(KcpSessionUniq(session));
}
Ok((self.sessions.get(&peer_addr).unwrap().0.clone(), update))
}
}