Skip to content

Commit

Permalink
use alias_2char and bs58 to create netns name
Browse files Browse the repository at this point in the history
  • Loading branch information
ak-1 committed Mar 24, 2023
1 parent 2928342 commit 992af9a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
9 changes: 7 additions & 2 deletions src/exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -278,13 +278,18 @@ pub fn exec(command: ExecCommand, uiclient: &dyn UiClient) -> anyhow::Result<()>

let alias = match provider {
VpnProvider::Custom => "c".to_string(),
_ => provider.get_dyn_provider().alias(),
_ => provider.get_dyn_provider().alias_2char(),
};

let ns_name = if let Some(c_ns_name) = custom_netns_name {
c_ns_name
} else {
format!("vopono_{alias}_{server_name}")
let short_name = if server_name.len() > 7 {
bs58::encode(&server_name).into_string()[0..7].to_string()
} else {
server_name.clone()
};
format!("vo_{alias}_{short_name}")
};

let mut ns;
Expand Down
6 changes: 2 additions & 4 deletions vopono_core/src/network/netns.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,8 @@ impl NetworkNamespace {

pub fn add_veth_pair(&mut self) -> anyhow::Result<()> {
// TODO: Handle if name taken?
// Use bs58 here?
let basename = &self.name[((self.name.len() as i32) - 13).max(0) as usize..self.name.len()];
let source = format!("{basename}_s");
let dest = format!("{basename}_d");
let source = format!("{}_s", self.name);
let dest = format!("{}_d", self.name);
self.veth_pair = Some(VethPair::new(source, dest, self)?);
Ok(())
}
Expand Down

0 comments on commit 992af9a

Please sign in to comment.