luckyimnotanigger/tun2proxy
1
0
Fork 0
mirror of https://github.com/tun2proxy/tun2proxy.git synced 2025-05-14 05:52:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

ArgProxy issues

Browse source
This commit is contained in:
ssrlive 2024-02-11 12:36:36 +08:00
parent 5514da71f9
commit 9f60eee2e1
3 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/args.rs
View file

@ -190,6 +190,20 @@ impl Default for ArgProxy {
}
}
impl std::fmt::Display for ArgProxy {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let auth = match &self.credentials {
Some(creds) => format!("{}", creds),
None => "".to_owned(),
};
if auth.is_empty() {
write!(f, "{}://{}", &self.proxy_type, &self.addr)
} else {
write!(f, "{}://{}@{}", &self.proxy_type, auth, &self.addr)
}
}
}
impl ArgProxy {
pub fn from_url(s: &str) -> Result<ArgProxy> {
let e = format!("`{s}` is not a valid proxy URL");
@ -235,12 +249,13 @@ impl ArgProxy {
}
}
#[repr(C)]
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Default)]
pub enum ProxyType {
Http = 0,
Socks4,
#[default]
Socks5,
Http,
}
impl std::fmt::Display for ProxyType {