From 53ca2355d024336f0cd199f27923506e9d80b040 Mon Sep 17 00:00:00 2001 From: Peter Jiang <2892084432j@gmail.com> Date: Sat, 15 Jun 2024 15:06:57 -0400 Subject: [PATCH] add port to playit address --- core/src/playitgg/mod.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/playitgg/mod.rs b/core/src/playitgg/mod.rs index 6888bc25..bd2b06ef 100644 --- a/core/src/playitgg/mod.rs +++ b/core/src/playitgg/mod.rs @@ -357,7 +357,6 @@ pub async fn get_tunnels( let tunnels_value = response.get("tunnels"); if let Some(tunnels_value) = tunnels_value { let tunnels = tunnels_value.as_array(); - if let Some(tunnels) = tunnels { let mut res: Vec = vec![]; for tunnel in tunnels { @@ -396,6 +395,7 @@ pub async fn get_tunnels( let local_port_value = origin_data.get("local_port"); let local_ip_value = origin_data.get("local_ip"); let assigned_domain_value = alloc_data.get("assigned_domain"); + let assigned_port_value = alloc_data.get("port_start"); if !(local_port_value.is_some() && local_ip_value.is_some() @@ -410,6 +410,7 @@ pub async fn get_tunnels( let local_port = local_port_value.unwrap().as_i64(); let local_ip = local_ip_value.unwrap().as_str(); let assigned_domain = assigned_domain_value.unwrap().as_str(); + let assigned_port = assigned_port_value.unwrap().as_i64(); if !(local_port.is_some() && local_ip.is_some() && assigned_domain.is_some()) { return Err(Error { @@ -424,7 +425,7 @@ pub async fn get_tunnels( name, tunnel_id: TunnelUuid(id), active, - server_address: assigned_domain.unwrap().to_string(), + server_address: format!("{}:{}", assigned_domain.unwrap(), assigned_port.unwrap()), }); } Ok(Json(res))