signalapp/Signal-Calling-Service
signalapp/Signal-Calling-Service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add disconnect reason for clients at the call metadata level

Browse Source
This commit is contained in:
adel-signal 2026-03-05 12:31:56 -08:00 committed by GitHub
parent cf05f187cd
commit 8230400a6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
backend/src/call.rs
View File

@ -582,10 +582,10 @@ impl Call {
}
#[inline(always)]
pub fn drop_client(&self, demux_id: DemuxId, now: Instant) {
pub fn drop_client(&self, demux_id: DemuxId, now: Instant, reason: &str) {
self.inner
.lock()
.drop_client(demux_id, &self.call_info, now);
.drop_client(demux_id, &self.call_info, now, reason);
}
#[inline(always)]
@ -1130,24 +1130,26 @@ impl CallInner {
}
}
fn drop_client(&mut self, demux_id: DemuxId, call_info: &CallInfo, now: Instant) {
fn drop_client(&mut self, demux_id: DemuxId, call_info: &CallInfo, now: Instant, reason: &str) {
time_scope_us!("calling.call.drop_client");
if self.remove_client(demux_id, now).is_some() {
debug!(
"call: {} dropping client {}",
info!(
"call: {} dropping client {} ({})",
call_info.loggable_call_id,
demux_id.as_u32()
demux_id.as_u32(),
reason,
);
} else if let Some(index) = self
.pending_clients
.iter()
.position(|client| client.demux_id == demux_id)
{
debug!(
"call: {} dropping pending client {}",
info!(
"call: {} dropping pending client {} ({})",
call_info.loggable_call_id,
demux_id.as_u32()
demux_id.as_u32(),
reason,
);
self.will_add_or_remove_client(now);
self.pending_clients.swap_remove(index);
@ -1157,9 +1159,10 @@ impl CallInner {
.position(|client| client.demux_id == demux_id)
{
debug!(
"call: {} dropping removed client {}",
"call: {} dropping removed client {} ({})",
call_info.loggable_call_id,
demux_id.as_u32()
demux_id.as_u32(),
reason,
);
self.removed_clients.swap_remove(index);
}
@ -1169,8 +1172,8 @@ impl CallInner {
// Like `drop_client`, but keeps the client around in the `removed_clients` list until they leave.
fn force_remove_client(&mut self, demux_id: DemuxId, call_info: &CallInfo, now: Instant) {
if let Some(client) = self.remove_client(demux_id, now) {
debug!(
"call: {} removing client {}",
info!(
"call: {} dropping client {} (Admin Remove)",
call_info.loggable_call_id,
demux_id.as_u32()
);
@ -1222,8 +1225,8 @@ impl CallInner {
calling_common::drain_filter(&mut self.clients, |client| client.user_id == user_id);
let mut removed_demux_ids = Vec::new();
for removed_client in removed_clients {
debug!(
"call: {} removing blocked {}",
info!(
"call: {} dropping client {} (Admin Block)",
call_info.loggable_call_id,
demux_id.as_u32()
);
@ -1350,12 +1353,7 @@ impl CallInner {
// and just closing the connection is safe.
if proto.leave.is_some() {
// "Leave" is the only message we allow from pending and removed clients.
info!(
"call: {} removing client: {} (via RTP)",
call_info.loggable_call_id,
sender_demux_id.as_u32()
);
self.drop_client(sender_demux_id, call_info, now);
self.drop_client(sender_demux_id, call_info, now, "RTP Leave");
return Err(Error::Leave);
}
@ -5965,7 +5963,7 @@ mod call_tests {
let (rtp_to_send, _outgoing_key_frame_requests) = call.tick(at(300), sys_at(300));
assert_eq!(0, rtp_to_send.len());
call.drop_client(demux_id1, at(400));
call.drop_client(demux_id1, at(400), "test");
let expected_update_payload_just_client2 = create_sfu_to_device(
true,
@ -6108,7 +6106,7 @@ mod call_tests {
rtp_to_send
);
call.drop_client(demux_id2, at(400));
call.drop_client(demux_id2, at(400), "test");
let expected_update_payload_demux1 = create_sfu_to_device(
true,
@ -6460,7 +6458,7 @@ mod call_tests {
rtp_to_send
);
call.drop_client(demux_id2, at(400));
call.drop_client(demux_id2, at(400), "test");
// Clients leaving the "removed" list don't count as participant changes,
// so there's no update for client 1 at this tick.

26
backend/src/sfu.rs
View File

@ -206,12 +206,17 @@ impl Connections {
/// Removes a connection identified by the given connection ID. The removed connection is
/// returned, if it exists. After a connection is removed, it is no longer possible to
/// retrieve it using neither the connection identifier nor the associated ICE username.
fn remove_connection(&self, connection_id: &ConnectionId) -> Option<Arc<Connection>> {
fn remove_connection(
&self,
connection_id: &ConnectionId,
reason: &str,
) -> Option<Arc<Connection>> {
let mut maps = self.synchronized_maps.write();
match maps.by_id.remove(connection_id) {
Some(connection) => {
maps.by_ice_username
.remove(connection.ice_request_username());
info!("Removed connection {connection_id} ({reason})");
Some(connection)
}
None => None,
@ -792,6 +797,7 @@ impl Sfu {
}
/// Remove a client from a call.
#[cfg(test)]
pub fn remove_client_from_call(&self, now: Instant, call_id: CallId, demux_id: DemuxId) {
let loggable_call_id = LoggableCallId::from(&call_id);
let connection_id = ConnectionId::from_call_id_and_demux_id(call_id, demux_id);
@ -807,10 +813,14 @@ impl Sfu {
demux_id.as_u32()
);
call.drop_client(demux_id, now);
call.drop_client(demux_id, now, "Test Remove Client");
}
if self.connections.remove_connection(&connection_id).is_some() {
if self
.connections
.remove_connection(&connection_id, "Test Remove Connection")
.is_some()
{
event!("calling.sfu.close_connection.remove_client_from_call");
}
}
@ -861,7 +871,8 @@ impl Sfu {
Err(call::Error::Leave) => {
incoming_connection.close();
event!("calling.sfu.close_connection.rtp");
self.connections.remove_connection(incoming_connection_id);
self.connections
.remove_connection(incoming_connection_id, "RTP Leave");
return Err(SfuError::Leave);
}
Err(e) => return Err(SfuError::CallError(e)),
@ -1167,10 +1178,10 @@ impl Sfu {
let connection_id = connection.id();
match connection.tick(&mut packets_to_send, now) {
connection::TickOutput::Inactive => {
info!("dropping connection: {}", connection_id);
info!("dropping inactive connection: {}", connection_id);
let call = connection.call();
call.drop_client(connection_id.demux_id, now);
call.drop_client(connection_id.demux_id, now, "Inactive");
if connection.had_selected_candidate() {
event!("calling.sfu.close_connection.inactive");
@ -1178,7 +1189,8 @@ impl Sfu {
event!("calling.sfu.close_connection.no_nominee");
}
self.connections.remove_connection(connection_id);
self.connections
.remove_connection(connection_id, "Inactive");
connection.close();
if let Some(packet_server) = self.packet_server.lock().as_ref() {
packet_server.remove_connection(&connection);