Skip to content

fix: add dns resolving for retransmit and auto response #95

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
yeoleobun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add dns resolving for retransmit and auto response #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 54 additions & 3 deletions src/transaction/endpoint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use super::{
};
use crate::{
dialog::DialogId,
rsip_ext::destination_from_request,
transport::{SipAddr, TransportEvent, TransportLayer},
Error, Result, VERSION,
};
Expand Down Expand Up @@ -333,6 +334,28 @@ impl EndpointInner {
}
}

// Note: This function used for determine destination of response message, from via of the request
pub async fn get_destination_from_request(&self, req: &rsip::Request) -> Option<SipAddr> {
let (transport, host_with_port) =
SipConnection::parse_target_from_via(req.via_header().ok()?).ok()?;

let sip_addr = SipAddr {
r#type: Some(transport),
addr: host_with_port,
};

if matches!(sip_addr.addr.host, rsip::Host::Domain(_)) {
return self
.transport_layer
.inner
.domain_resolver
.resolve(&sip_addr)
.await
.ok();
}
Some(sip_addr)
}

// receive message from transport layer
pub async fn on_received_message(
self: &Arc<Self>,
Expand Down Expand Up @@ -377,7 +400,12 @@ impl EndpointInner {
.flatten();

if let Some(last_message) = last_message {
connection.send(last_message, None).await?;
let dest = if !connection.is_reliable() {
self.get_destination_from_request(req).await
} else {
None
};
connection.send(last_message, dest.as_ref()).await?;
return Ok(());
}
}
Expand Down Expand Up @@ -418,11 +446,28 @@ impl EndpointInner {
connection.send(last_message, Some(from)).await?;
return Ok(());
}

let dest = match destination_from_request(&last_req)
.and_then(|uri| SipAddr::try_from(uri).ok())
{
Some(addr)
if matches!(addr.addr.host, rsip::Host::Domain(_)) =>
{
self.transport_layer
.inner
.domain_resolver
.resolve(&addr)
.await
.ok()
}
addr => addr,
};

connection.send(last_message, dest.as_ref()).await?;
}
}
_ => {}
}
connection.send(last_message, None).await?;
return Ok(());
}
}
Expand Down Expand Up @@ -462,7 +507,13 @@ impl EndpointInner {
} else {
resp.into()
};
connection.send(resp, None).await?;

let dest = if !connection.is_reliable() {
self.get_destination_from_request(&request).await
} else {
None
};
connection.send(resp, dest.as_ref()).await?;
return Ok(());
}
rsip::Method::Ack => return Ok(()),
Expand Down