Skip to content
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

Remove nonalphanumeric characters from interface name #227

Merged
merged 2 commits into from
Apr 19, 2024
Merged

Remove nonalphanumeric characters from interface name #227

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc9a8ea
Remove nonalphanumeric characters from interface name
j-chmielewski Apr 19, 2024
2317c1e
Add docstring
j-chmielewski Apr 19, 2024
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
12 changes: 3 additions & 9 deletions src-tauri/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use crate::{
appstate::AppState,
commands::{LocationInterfaceDetails, Payload},
database::{
models::location::peer_to_location_stats, models::tunnel::peer_to_tunnel_stats,
models::{location::peer_to_location_stats, tunnel::peer_to_tunnel_stats},
ActiveConnection, Connection, DbPool, Location, Tunnel, TunnelConnection, WireguardKeys,
},
error::Error,
Expand Down Expand Up @@ -119,12 +119,6 @@ pub async fn setup_interface(
}
}

/// Helper function to remove whitespace from location name
#[must_use]
pub fn remove_whitespace(s: &str) -> String {
s.chars().filter(|c| !c.is_whitespace()).collect()
}

fn find_random_free_port() -> Option<u16> {
const MAX_PORT: u16 = 65535;
const MIN_PORT: u16 = 6000;
Expand Down Expand Up @@ -162,11 +156,11 @@ pub fn get_interface_name() -> String {
"utun0".into()
}

/// Strips location name of all non-alphanumeric characters returning usable interface name.
#[cfg(not(target_os = "macos"))]
/// Returns interface name for location
#[must_use]
pub fn get_interface_name(name: &str) -> String {
remove_whitespace(name)
name.chars().filter(|c| c.is_alphanumeric()).collect()
}

fn is_port_free(port: u16) -> bool {
Expand Down
Loading