Dreaded_X/siranga
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generate random name if new name is empty

Browse Source
This commit is contained in:
Dreaded_X 2025-04-13 02:00:22 +02:00
parent f7a79c8411
commit 22ea4b4e76
Signed by: Dreaded_X
GPG Key ID: FA5F485356B0D2D4
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/tunnel.rs
View File

@ -86,6 +86,27 @@ impl Tunnels {
}
}
async fn generate_tunnel_name(&mut self, mut tunnel: Tunnel) -> Tunnel {
// NOTE: It is technically possible to become stuck in this loop.
// However, that really only becomes a concern if a (very) high
// number of tunnels is open at the same time.
tunnel.domain = Some(self.domain.clone());
loop {
tunnel.name = get_animal_name().into();
if !self
.tunnels
.read()
.await
.contains_key(&tunnel.get_address().expect("domain is set"))
{
break;
}
trace!(tunnel = tunnel.name, "Already in use, picking new name");
}
tunnel
}
pub async fn create_tunnel(
&mut self,
handle: Handle,
@ -104,21 +125,7 @@ impl Tunnels {
};
if tunnel.name == "localhost" {
// NOTE: It is technically possible to become stuck in this loop.
// However, that really only becomes a concern if a (very) high
// number of tunnels is open at the same time.
loop {
tunnel.name = get_animal_name().into();
if !self
.tunnels
.read()
.await
.contains_key(&tunnel.get_address().expect("domain is set"))
{
break;
}
trace!(tunnel = tunnel.name, "Already in use, picking new name");
}
tunnel = self.generate_tunnel_name(tunnel).await;
};
self.add_tunnel(tunnel).await
@ -156,8 +163,13 @@ impl Tunnels {
pub async fn rename_tunnel(&mut self, tunnel: Tunnel, name: impl Into<String>) -> Tunnel {
let mut tunnel = self.remove_tunnel(tunnel).await;
tunnel.name = name.into();
tunnel.domain = Some(self.domain.clone());
let name: String = name.into();
if name.is_empty() {
tunnel = self.generate_tunnel_name(tunnel).await;
} else {
tunnel.domain = Some(self.domain.clone());
tunnel.name = name;
}
self.add_tunnel(tunnel).await
}