aboutsummaryrefslogtreecommitdiffhomepage
path: root/libs/hbb_common
diff options
context:
space:
mode:
Diffstat (limited to 'libs/hbb_common')
-rw-r--r--libs/hbb_common/build.rs5
-rw-r--r--libs/hbb_common/src/bytes_codec.rs8
-rw-r--r--libs/hbb_common/src/compress.rs7
-rw-r--r--libs/hbb_common/src/config.rs126
-rw-r--r--libs/hbb_common/src/fs.rs181
-rw-r--r--libs/hbb_common/src/lib.rs144
-rw-r--r--libs/hbb_common/src/password_security.rs6
-rw-r--r--libs/hbb_common/src/platform/linux.rs8
-rw-r--r--libs/hbb_common/src/socket_client.rs13
-rw-r--r--libs/hbb_common/src/tcp.rs16
-rw-r--r--libs/hbb_common/src/udp.rs70
11 files changed, 287 insertions, 297 deletions
diff --git a/libs/hbb_common/build.rs b/libs/hbb_common/build.rs
index bff0cfa..fe0d310 100644
--- a/libs/hbb_common/build.rs
+++ b/libs/hbb_common/build.rs
@@ -8,10 +8,7 @@ fn main() {
.out_dir(out_dir)
.inputs(&["protos/rendezvous.proto", "protos/message.proto"])
.include("protos")
- .customize(
- protobuf_codegen::Customize::default()
- .tokio_bytes(true)
- )
+ .customize(protobuf_codegen::Customize::default().tokio_bytes(true))
.run()
.expect("Codegen failed.");
}
diff --git a/libs/hbb_common/src/bytes_codec.rs b/libs/hbb_common/src/bytes_codec.rs
index e029f1c..699aa9b 100644
--- a/libs/hbb_common/src/bytes_codec.rs
+++ b/libs/hbb_common/src/bytes_codec.rs
@@ -15,6 +15,12 @@ enum DecodeState {
Data(usize),
}
+impl Default for BytesCodec {
+ fn default() -> Self {
+ Self::new()
+ }
+}
+
impl BytesCodec {
pub fn new() -> Self {
Self {
@@ -56,7 +62,7 @@ impl BytesCodec {
}
src.advance(head_len);
src.reserve(n);
- return Ok(Some(n));
+ Ok(Some(n))
}
fn decode_data(&self, n: usize, src: &mut BytesMut) -> io::Result<Option<BytesMut>> {
diff --git a/libs/hbb_common/src/compress.rs b/libs/hbb_common/src/compress.rs
index a969ccf..e7668a9 100644
--- a/libs/hbb_common/src/compress.rs
+++ b/libs/hbb_common/src/compress.rs
@@ -32,12 +32,7 @@ pub fn decompress(data: &[u8]) -> Vec<u8> {
const MAX: usize = 1024 * 1024 * 64;
const MIN: usize = 1024 * 1024;
let mut n = 30 * data.len();
- if n > MAX {
- n = MAX;
- }
- if n < MIN {
- n = MIN;
- }
+ n = n.clamp(MIN, MAX);
match d.decompress(data, n) {
Ok(res) => out = res,
Err(err) => {
diff --git a/libs/hbb_common/src/config.rs b/libs/hbb_common/src/config.rs
index 20334ed..943917a 100644
--- a/libs/hbb_common/src/config.rs
+++ b/libs/hbb_common/src/config.rs
@@ -29,7 +29,7 @@ pub const READ_TIMEOUT: u64 = 30_000;
pub const REG_INTERVAL: i64 = 12_000;
pub const COMPRESS_LEVEL: i32 = 3;
const SERIAL: i32 = 3;
-const PASSWORD_ENC_VERSION: &'static str = "00";
+const PASSWORD_ENC_VERSION: &str = "00";
// 128x128
#[cfg(target_os = "macos")] // 128x128 on 160x160 canvas, then shrink to 128, mac looks better with padding
pub const ICON: &str = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAAAyVBMVEUAAAAAcf8Acf8Acf8Acv8Acf8Acf8Acf8Acf8AcP8Acf8Ab/8AcP8Acf////8AaP/z+f/o8v/k7v/5/v/T5f8AYP/u9v/X6f+hx/+Kuv95pP8Aef/B1/+TwP9xoP8BdP/g6P+Irv9ZmP8Bgf/E3f98q/9sn/+01f+Es/9nm/9Jif8hhv8off/M4P+syP+avP86iP/c7f+xy/9yqf9Om/9hk/9Rjv+60P99tv9fpf88lv8yjf8Tgf8deP+kvP8BiP8NeP8hkP80gP8oj2VLAAAADXRSTlMA7o7qLvnaxZ1FOxYPjH9HWgAABHJJREFUeNrtm+tW4jAQgBfwuu7MtIUWsOUiCCioIIgLiqvr+z/UHq/LJKVkmwTcc/r9E2nzlU4mSTP9lpGRkZGR8VX5cZjfL+yCEXYL+/nDH//U/Pd8DgyTy39Xbv7oIAcWyB0cqbW/sweW2NtRaj8H1sgpGOwUIAH7Bkd7YJW9dXFwAJY5WNP/cmCZQnJvzIN18on5LwfWySXlxEPYAIcad8D6PdiHDbCfIFCADVBIENiFDbCbIACKPPXrZ+cP8E6/0znvP4EymgIEravIRcTxu8HxNSJ60a8W0AYECKrlAN+YwAthCd9wm1Ug6wKzIn5SgRduXfwkqDasCjx0XFzi9PV6zwNcIuhcWBOg+ikySq8C9UD4dEKWBCoOcspvAuLHTo9sCDQiFPHotRM48j8G5gVur1FdAN2uaYEuiz7xFsgEJ2RUoMUakXuBTHHoGxQYOBhHjeUBAefEnMAowFhaLBOKuOemBBbxLRQrH2PBCgMvNCPQGMeevTb9zLrPxz2Mo+QbEaijzPUcOOHMQZkKGRAIPem39+bypREMPTkQW/oCfk866zAkiIFG4yIKRE/aAnfiSd0WrORY6pFdXQEqi9mvAQm0RIOSnoCcZ8vJoz3diCnjRk+g8VP4/fuQDJ2Lxr6WwG0gXs9aTpDzW0vgDBlVUpixR8gYk44AD8FrUKHr8JQJGgIDnoDqoALxmWPQSi9AVVzm8gKUuEPGr/QCvptwJkbSYT/TC4S8C96DGjTj86aHtAI0x2WaBIq0eSYYpRa4EsdWVVwWu9O0Aj6f6dyBMnwEraeOgSYu0wZlauzA47QCbT7DgAQSE+hZWoEBF/BBmWOewNMK3BsSqKUW4MGcWqCSVmDkbvkXGKQOwg6PAUO9oL3xXhA20yaiCjuwYygRVQlUOTWTCf2SuNJTxeFjgaHByGuAIvd8ItdPLTDhS7IuqEE1YSKVOgbayLhSFQhMzYh8hwfBs1r7c505YVIQYEdNoKwxK06MJiyrpUFHiF0NAfCQUVHoiRclIXJIR6C2fqG37pBHvcWpgwzvAtYwkR5UGV2e42UISdBJETl3mg8ouo54Rcnti1/vaT+iuUQBt500Cgo4U10BeHSkk57FB0JjWkKRMWgLUA0lLodtImAQdaMiiri3+gIAPZQoutHNsgKF1aaDMhMyIdBf8Th+Bh8MTjGWCpl5Wv43tDmnF+IUVMrcZgRoiAxhtrloYizNkZaAnF5leglbNhj0wYCAbCDvGb0mP4nib7O7ZlcYQ2m1gPtIZgVgGNNMeaVAaWR+57TrqgtUnm3sHQ+kYeE6fufUubG1ez50FXbPnWgBlgSABmN3TTcsRl2yWkHRrwbiunvk/W2+Mg1hPZplPDeXRbZzStFH15s1QIVd3UImP5z/bHpeeQLvRJ7XLFUffQIlCvqlXETQbgN9/rlYABGosv+Vi9m2Xs639YLGrZd0br+odetlvdsvbN56abfd4vbCzv9Q3v/ygoOV21A4OPpfXvH4Ai+5ZGRkZGRkbJA/t/I0QMzoMiEAAAAASUVORK5CYII=
@@ -43,6 +43,7 @@ lazy_static::lazy_static! {
}
type Size = (i32, i32, i32, i32);
+type KeyPair = (Vec<u8>, Vec<u8>);
lazy_static::lazy_static! {
static ref CONFIG: Arc<RwLock<Config>> = Arc::new(RwLock::new(Config::load()));
@@ -54,7 +55,7 @@ lazy_static::lazy_static! {
_ => "",
}.to_owned()));
pub static ref APP_NAME: Arc<RwLock<String>> = Arc::new(RwLock::new("RustDesk".to_owned()));
- static ref KEY_PAIR: Arc<Mutex<Option<(Vec<u8>, Vec<u8>)>>> = Default::default();
+ static ref KEY_PAIR: Arc<Mutex<Option<KeyPair>>> = Default::default();
static ref HW_CODEC_CONFIG: Arc<RwLock<HwCodecConfig>> = Arc::new(RwLock::new(HwCodecConfig::load()));
}
@@ -75,12 +76,12 @@ lazy_static::lazy_static! {
]);
}
-const CHARS: &'static [char] = &[
+const CHARS: &[char] = &[
'2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
];
-const RENDEZVOUS_SERVERS: &'static [&'static str] = &[
+pub const RENDEZVOUS_SERVERS: &[&str] = &[
"rs-ny.rustdesk.com",
"rs-sg.rustdesk.com",
"rs-cn.rustdesk.com",
@@ -131,7 +132,7 @@ pub struct Config {
#[serde(default)]
salt: String,
#[serde(default)]
- key_pair: (Vec<u8>, Vec<u8>), // sk, pk
+ key_pair: KeyPair, // sk, pk
#[serde(default)]
key_confirmed: bool,
#[serde(default)]
@@ -319,7 +320,7 @@ impl Config2 {
pub fn load_path<T: serde::Serialize + serde::de::DeserializeOwned + Default + std::fmt::Debug>(
file: PathBuf,
) -> T {
- let cfg = match confy::load_path(&file) {
+ let cfg = match confy::load_path(file) {
Ok(config) => config,
Err(err) => {
log::error!("Failed to load config: {}", err);
@@ -366,20 +367,16 @@ impl Config {
config.id = id;
id_valid = true;
store |= store2;
- } else {
- if crate::get_modified_time(&Self::file_(""))
- .checked_sub(std::time::Duration::from_secs(30)) // allow modification during installation
- .unwrap_or(crate::get_exe_time())
- < crate::get_exe_time()
- {
- if !config.id.is_empty()
- && config.enc_id.is_empty()
- && !decrypt_str_or_original(&config.id, PASSWORD_ENC_VERSION).1
- {
- id_valid = true;
- store = true;
- }
- }
+ } else if crate::get_modified_time(&Self::file_(""))
+ .checked_sub(std::time::Duration::from_secs(30)) // allow modification during installation
+ .unwrap_or_else(crate::get_exe_time)
+ < crate::get_exe_time()
+ && !config.id.is_empty()
+ && config.enc_id.is_empty()
+ && !decrypt_str_or_original(&config.id, PASSWORD_ENC_VERSION).1
+ {
+ id_valid = true;
+ store = true;
}
if !id_valid {
for _ in 0..3 {
@@ -444,18 +441,18 @@ impl Config {
#[cfg(not(any(target_os = "android", target_os = "ios")))]
{
#[cfg(not(target_os = "macos"))]
- let org = "";
+ let org = "".to_owned();
#[cfg(target_os = "macos")]
let org = ORG.read().unwrap().clone();
// /var/root for root
if let Some(project) =
- directories_next::ProjectDirs::from("", &org, &*APP_NAME.read().unwrap())
+ directories_next::ProjectDirs::from("", &org, &APP_NAME.read().unwrap())
{
let mut path = patch(project.config_dir().to_path_buf());
path.push(p);
return path;
}
- return "".into();
+ "".into()
}
}
@@ -539,9 +536,9 @@ impl Config {
rendezvous_server = Self::get_rendezvous_servers()
.drain(..)
.next()
- .unwrap_or("".to_owned());
+ .unwrap_or_default();
}
- if !rendezvous_server.contains(":") {
+ if !rendezvous_server.contains(':') {
rendezvous_server = format!("{}:{}", rendezvous_server, RENDEZVOUS_PORT);
}
rendezvous_server
@@ -559,8 +556,8 @@ impl Config {
let serial_obsolute = CONFIG2.read().unwrap().serial > SERIAL;
if serial_obsolute {
let ss: Vec<String> = Self::get_option("rendezvous-servers")
- .split(",")
- .filter(|x| x.contains("."))
+ .split(',')
+ .filter(|x| x.contains('.'))
.map(|x| x.to_owned())
.collect();
if !ss.is_empty() {
@@ -580,7 +577,7 @@ impl Config {
let mut delay = i64::MAX;
for (tmp_host, tmp_delay) in ONLINE.lock().unwrap().iter() {
if tmp_delay > &0 && tmp_delay < &delay {
- delay = tmp_delay.clone();
+ delay = *tmp_delay;
host = tmp_host.to_string();
}
}
@@ -647,7 +644,7 @@ impl Config {
for x in &ma.bytes()[2..] {
id = (id << 8) | (*x as u32);
}
- id = id & 0x1FFFFFFF;
+ id &= 0x1FFFFFFF;
Some(id.to_string())
} else {
None
@@ -679,11 +676,7 @@ impl Config {
}
pub fn get_host_key_confirmed(host: &str) -> bool {
- if let Some(true) = CONFIG.read().unwrap().keys_confirmed.get(host) {
- true
- } else {
- false
- }
+ matches!(CONFIG.read().unwrap().keys_confirmed.get(host), Some(true))
}
pub fn set_host_key_confirmed(host: &str, v: bool) {
@@ -695,7 +688,7 @@ impl Config {
config.store();
}
- pub fn get_key_pair() -> (Vec<u8>, Vec<u8>) {
+ pub fn get_key_pair() -> KeyPair {
// lock here to make sure no gen_keypair more than once
// no use of CONFIG directly here to ensure no recursive calling in Config::load because of password dec which calling this function
let mut lock = KEY_PAIR.lock().unwrap();
@@ -714,7 +707,7 @@ impl Config {
});
}
*lock = Some(config.key_pair.clone());
- return config.key_pair;
+ config.key_pair
}
pub fn get_id() -> String {
@@ -849,7 +842,7 @@ impl Config {
let ext = path.extension();
if let Some(ext) = ext {
let ext = format!("{}.toml", ext.to_string_lossy());
- path.with_extension(&ext)
+ path.with_extension(ext)
} else {
path.with_extension("toml")
}
@@ -861,7 +854,7 @@ const PEERS: &str = "peers";
impl PeerConfig {
pub fn load(id: &str) -> PeerConfig {
let _lock = CONFIG.read().unwrap();
- match confy::load_path(&Self::path(id)) {
+ match confy::load_path(Self::path(id)) {
Ok(config) => {
let mut config: PeerConfig = config;
let mut store = false;
@@ -869,16 +862,16 @@ impl PeerConfig {
decrypt_vec_or_original(&config.password, PASSWORD_ENC_VERSION);
config.password = password;
store = store || store2;
- config.options.get_mut("rdp_password").map(|v| {
+ if let Some(v) = config.options.get_mut("rdp_password") {
let (password, _, store2) = decrypt_str_or_original(v, PASSWORD_ENC_VERSION);
*v = password;
store = store || store2;
- });
- config.options.get_mut("os-password").map(|v| {
+ }
+ if let Some(v) = config.options.get_mut("os-password") {
let (password, _, store2) = decrypt_str_or_original(v, PASSWORD_ENC_VERSION);
*v = password;
store = store || store2;
- });
+ }
if store {
config.store(id);
}
@@ -895,34 +888,29 @@ impl PeerConfig {
let _lock = CONFIG.read().unwrap();
let mut config = self.clone();
config.password = encrypt_vec_or_original(&config.password, PASSWORD_ENC_VERSION);
- config
- .options
- .get_mut("rdp_password")
- .map(|v| *v = encrypt_str_or_original(v, PASSWORD_ENC_VERSION));
- config
- .options
- .get_mut("os-password")
- .map(|v| *v = encrypt_str_or_original(v, PASSWORD_ENC_VERSION));
+ if let Some(v) = config.options.get_mut("rdp_password") {
+ *v = encrypt_str_or_original(v, PASSWORD_ENC_VERSION)
+ }
+ if let Some(v) = config.options.get_mut("os-password") {
+ *v = encrypt_str_or_original(v, PASSWORD_ENC_VERSION)
+ };
if let Err(err) = store_path(Self::path(id), config) {
log::error!("Failed to store config: {}", err);
}
}
pub fn remove(id: &str) {
- fs::remove_file(&Self::path(id)).ok();
+ fs::remove_file(Self::path(id)).ok();
}
fn path(id: &str) -> PathBuf {
- let id_encoded: String;
-
//If the id contains invalid chars, encode it
let forbidden_paths = Regex::new(r".*[<>:/\\|\?\*].*").unwrap();
- if forbidden_paths.is_match(id) {
- id_encoded =
- "base64_".to_string() + base64::encode(id, base64::Variant::Original).as_str();
+ let id_encoded = if forbidden_paths.is_match(id) {
+ "base64_".to_string() + base64::encode(id, base64::Variant::Original).as_str()
} else {
- id_encoded = id.to_string();
- }
+ id.to_string()
+ };
let path: PathBuf = [PEERS, id_encoded.as_str()].iter().collect();
Config::with_extension(Config::path(path))
}
@@ -940,26 +928,24 @@ impl PeerConfig {
&& p.extension().map(|p| p.to_str().unwrap_or("")) == Some("toml")
})
.map(|p| {
- let t = crate::get_modified_time(&p);
+ let t = crate::get_modified_time(p);
let id = p
.file_stem()
.map(|p| p.to_str().unwrap_or(""))
.unwrap_or("")
.to_owned();
- let id_decoded_string: String;
- if id.starts_with("base64_") && id.len() != 7 {
+ let id_decoded_string = if id.starts_with("base64_") && id.len() != 7 {
let id_decoded = base64::decode(&id[7..], base64::Variant::Original)
- .unwrap_or(Vec::new());
- id_decoded_string =
- String::from_utf8_lossy(&id_decoded).as_ref().to_owned();
+ .unwrap_or_default();
+ String::from_utf8_lossy(&id_decoded).as_ref().to_owned()
} else {
- id_decoded_string = id;
- }
+ id
+ };
let c = PeerConfig::load(&id_decoded_string);
if c.info.platform.is_empty() {
- fs::remove_file(&p).ok();
+ fs::remove_file(p).ok();
}
(id_decoded_string, t, c)
})
@@ -1149,7 +1135,7 @@ pub struct LanPeers {
impl LanPeers {
pub fn load() -> LanPeers {
let _lock = CONFIG.read().unwrap();
- match confy::load_path(&Config::file_("_lan_peers")) {
+ match confy::load_path(Config::file_("_lan_peers")) {
Ok(peers) => peers,
Err(err) => {
log::error!("Failed to load lan peers: {}", err);
@@ -1158,9 +1144,9 @@ impl LanPeers {
}
}
- pub fn store(peers: &Vec<DiscoveryPeer>) {
+ pub fn store(peers: &[DiscoveryPeer]) {
let f = LanPeers {
- peers: peers.clone(),
+ peers: peers.to_owned(),
};
if let Err(err) = store_path(Config::file_("_lan_peers"), f) {
log::error!("Failed to store lan peers: {}", err);
diff --git a/libs/hbb_common/src/fs.rs b/libs/hbb_common/src/fs.rs
index fec8b86..ea54e11 100644
--- a/libs/hbb_common/src/fs.rs
+++ b/libs/hbb_common/src/fs.rs
@@ -13,13 +13,13 @@ use crate::{
config::{Config, COMPRESS_LEVEL},
};
-pub fn read_dir(path: &PathBuf, include_hidden: bool) -> ResultType<FileDirectory> {
+pub fn read_dir(path: &Path, include_hidden: bool) -> ResultType<FileDirectory> {
let mut dir = FileDirectory {
- path: get_string(&path),
+ path: get_string(path),
..Default::default()
};
#[cfg(windows)]
- if "/" == &get_string(&path) {
+ if "/" == &get_string(path) {
let drives = unsafe { winapi::um::fileapi::GetLogicalDrives() };
for i in 0..32 {
if drives & (1 << i) != 0 {
@@ -36,74 +36,70 @@ pub fn read_dir(path: &PathBuf, include_hidden: bool) -> ResultType<FileDirector
}
return Ok(dir);
}
- for entry in path.read_dir()? {
- if let Ok(entry) = entry {
- let p = entry.path();
- let name = p
- .file_name()
- .map(|p| p.to_str().unwrap_or(""))
- .unwrap_or("")
- .to_owned();
- if name.is_empty() {
- continue;
- }
- let mut is_hidden = false;
- let meta;
- if let Ok(tmp) = std::fs::symlink_metadata(&p) {
- meta = tmp;
- } else {
- continue;
- }
- // docs.microsoft.com/en-us/windows/win32/fileio/file-attribute-constants
- #[cfg(windows)]
- if meta.file_attributes() & 0x2 != 0 {
- is_hidden = true;
- }
- #[cfg(not(windows))]
- if name.find('.').unwrap_or(usize::MAX) == 0 {
- is_hidden = true;
- }
- if is_hidden && !include_hidden {
- continue;
- }
- let (entry_type, size) = {
- if p.is_dir() {
- if meta.file_type().is_symlink() {
- (FileType::DirLink.into(), 0)
- } else {
- (FileType::Dir.into(), 0)
- }
+ for entry in path.read_dir()?.flatten() {
+ let p = entry.path();
+ let name = p
+ .file_name()
+ .map(|p| p.to_str().unwrap_or(""))
+ .unwrap_or("")
+ .to_owned();
+ if name.is_empty() {
+ continue;
+ }
+ let mut is_hidden = false;
+ let meta;
+ if let Ok(tmp) = std::fs::symlink_metadata(&p) {
+ meta = tmp;
+ } else {
+ continue;
+ }
+ // docs.microsoft.com/en-us/windows/win32/fileio/file-attribute-constants
+ #[cfg(windows)]
+ if meta.file_attributes() & 0x2 != 0 {
+ is_hidden = true;
+ }
+ #[cfg(not(windows))]
+ if name.find('.').unwrap_or(usize::MAX) == 0 {
+ is_hidden = true;
+ }
+ if is_hidden && !include_hidden {
+ continue;
+ }
+ let (entry_type, size) = {
+ if p.is_dir() {
+ if meta.file_type().is_symlink() {
+ (FileType::DirLink.into(), 0)
} else {
- if meta.file_type().is_symlink() {
- (FileType::FileLink.into(), 0)
- } else {
- (FileType::File.into(), meta.len())
- }
+ (FileType::Dir.into(), 0)
}
- };
- let modified_time = meta
- .modified()
- .map(|x| {
- x.duration_since(std::time::SystemTime::UNIX_EPOCH)
- .map(|x| x.as_secs())
- .unwrap_or(0)
- })
- .unwrap_or(0) as u64;
- dir.entries.push(FileEntry {
- name: get_file_name(&p),
- entry_type,
- is_hidden,
- size,
- modified_time,
- ..Default::default()
- });
- }
+ } else if meta.file_type().is_symlink() {
+ (FileType::FileLink.into(), 0)
+ } else {
+ (FileType::File.into(), meta.len())
+ }
+ };
+ let modified_time = meta
+ .modified()
+ .map(|x| {
+ x.duration_since(std::time::SystemTime::UNIX_EPOCH)
+ .map(|x| x.as_secs())
+ .unwrap_or(0)
+ })
+ .unwrap_or(0);
+ dir.entries.push(FileEntry {
+ name: get_file_name(&p),
+ entry_type,
+ is_hidden,
+ size,
+ modified_time,
+ ..Default::default()
+ });
}
Ok(dir)
}
#[inline]
-pub fn get_file_name(p: &PathBuf) -> String {
+pub fn get_file_name(p: &Path) -> String {
p.file_name()
.map(|p| p.to_str().unwrap_or(""))
.unwrap_or("")
@@ -111,7 +107,7 @@ pub fn get_file_name(p: &PathBuf) -> String {
}
#[inline]
-pub fn get_string(path: &PathBuf) -> String {
+pub fn get_string(path: &Path) -> String {
path.to_str().unwrap_or("").to_owned()
}
@@ -127,14 +123,14 @@ pub fn get_home_as_string() -> String {
fn read_dir_recursive(
path: &PathBuf,
- prefix: &PathBuf,
+ prefix: &Path,
include_hidden: bool,
) -> ResultType<Vec<FileEntry>> {
let mut files = Vec::new();
if path.is_dir() {
// to-do: symbol link handling, cp the link rather than the content
// to-do: file mode, for unix
- let fd = read_dir(&path, include_hidden)?;
+ let fd = read_dir(path, include_hidden)?;
for entry in fd.entries.iter() {
match entry.entry_type.enum_value() {
Ok(FileType::File) => {
@@ -158,7 +154,7 @@ fn read_dir_recursive(
}
Ok(files)
} else if path.is_file() {
- let (size, modified_time) = if let Ok(meta) = std::fs::metadata(&path) {
+ let (size, modified_time) = if let Ok(meta) = std::fs::metadata(path) {
(
meta.len(),
meta.modified()
@@ -167,7 +163,7 @@ fn read_dir_recursive(
.map(|x| x.as_secs())
.unwrap_or(0)
})
- .unwrap_or(0) as u64,
+ .unwrap_or(0),
)
} else {
(0, 0)
@@ -249,7 +245,7 @@ pub struct RemoveJobMeta {
#[inline]
fn get_ext(name: &str) -> &str {
- if let Some(i) = name.rfind(".") {
+ if let Some(i) = name.rfind('.') {
return &name[i + 1..];
}
""
@@ -270,6 +266,7 @@ fn is_compressed_file(name: &str) -> bool {
}
impl TransferJob {
+ #[allow(clippy::too_many_arguments)]
pub fn new_write(
id: i32,
remote: String,
@@ -281,7 +278,7 @@ impl TransferJob {
enable_overwrite_detection: bool,
) -> Self {
log::info!("new write {}", path);
- let total_size = files.iter().map(|x| x.size as u64).sum();
+ let total_size = files.iter().map(|x| x.size).sum();
Self {
id,
remote,
@@ -307,7 +304,7 @@ impl TransferJob {
) -> ResultType<Self> {
log::info!("new read {}", path);
let files = get_recursive_files(&path, show_hidden)?;
- let total_size = files.iter().map(|x| x.size as u64).sum();
+ let total_size = files.iter().map(|x| x.size).sum();
Ok(Self {
id,
remote,
@@ -363,7 +360,7 @@ impl TransferJob {
let entry = &self.files[file_num];
let path = self.join(&entry.name);
let download_path = format!("{}.download", get_string(&path));
- std::fs::rename(&download_path, &path).ok();
+ std::fs::rename(download_path, &path).ok();
filetime::set_file_mtime(
&path,
filetime::FileTime::from_unix_time(entry.modified_time as _, 0),
@@ -378,7 +375,7 @@ impl TransferJob {
let entry = &self.files[file_num];
let path = self.join(&entry.name);
let download_path = format!("{}.download", get_string(&path));
- std::fs::remove_file(&download_path).ok();
+ std::fs::remove_file(download_path).ok();
}
}
@@ -433,7 +430,7 @@ impl TransferJob {
}
let name = &self.files[file_num].name;
if self.file.is_none() {
- match File::open(self.join(&name)).await {
+ match File::open(self.join(name)).await {
Ok(file) => {
self.file = Some(file);
self.file_confirmed = false;
@@ -447,20 +444,15 @@ impl TransferJob {
}
}
}
- if self.enable_overwrite_detection {
- if !self.file_confirmed() {
- if !self.file_is_waiting() {
- self.send_current_digest(stream).await?;
- self.set_file_is_waiting(true);
- }
- return Ok(None);
+ if self.enable_overwrite_detection && !self.file_confirmed() {
+ if !self.file_is_waiting() {
+ self.send_current_digest(stream).await?;
+ self.set_file_is_waiting(true);
}
+ return Ok(None);
}
const BUF_SIZE: usize = 128 * 1024;
- let mut buf: Vec<u8> = Vec::with_capacity(BUF_SIZE);
- unsafe {
- buf.set_len(BUF_SIZE);
- }
+ let mut buf: Vec<u8> = vec![0; BUF_SIZE];
let mut compressed = false;
let mut offset: usize = 0;
loop {
@@ -582,10 +574,7 @@ impl TransferJob {
#[inline]
pub fn job_completed(&self) -> bool {
// has no error, Condition 2
- if !self.enable_overwrite_detection || (!self.file_confirmed && !self.file_is_waiting) {
- return true;
- }
- return false;
+ !self.enable_overwrite_detection || (!self.file_confirmed && !self.file_is_waiting)
}
/// Get job error message, useful for getting status when job had finished
@@ -660,7 +649,7 @@ pub fn new_dir(id: i32, path: String, files: Vec<FileEntry>) -> Message {
resp.set_dir(FileDirectory {
id,
path,
- entries: files.into(),
+ entries: files,
..Default::default()
});
let mut msg_out = Message::new();
@@ -692,7 +681,7 @@ pub fn new_receive(id: i32, path: String, file_num: i32, files: Vec<FileEntry>)
action.set_receive(FileTransferReceiveRequest {
id,
path,
- files: files.into(),
+ files,
file_num,
..Default::default()
});
@@ -736,8 +725,8 @@ pub fn remove_job(id: i32, jobs: &mut Vec<TransferJob>) {
}
#[inline]
-pub fn get_job(id: i32, jobs: &mut Vec<TransferJob>) -> Option<&mut TransferJob> {
- jobs.iter_mut().filter(|x| x.id() == id).next()
+pub fn get_job(id: i32, jobs: &mut [TransferJob]) -> Option<&mut TransferJob> {
+ jobs.iter_mut().find(|x| x.id() == id)
}
pub async fn handle_read_jobs(
@@ -789,7 +778,7 @@ pub fn remove_all_empty_dir(path: &PathBuf) -> ResultType<()> {
remove_all_empty_dir(&path.join(&entry.name)).ok();
}
Ok(FileType::DirLink) | Ok(FileType::FileLink) => {
- std::fs::remove_file(&path.join(&entry.name)).ok();
+ std::fs::remove_file(path.join(&entry.name)).ok();
}
_ => {}
}
@@ -813,7 +802,7 @@ pub fn create_dir(dir: &str) -> ResultType<()> {
#[inline]
pub fn transform_windows_path(entries: &mut Vec<FileEntry>) {
for entry in entries {
- entry.name = entry.name.replace("\\", "/");
+ entry.name = entry.name.replace('\\', "/");
}
}
diff --git a/libs/hbb_common/src/lib.rs b/libs/hbb_common/src/lib.rs
index e57994f..9e00437 100644
--- a/libs/hbb_common/src/lib.rs
+++ b/libs/hbb_common/src/lib.rs
@@ -96,8 +96,24 @@ pub type ResultType<F, E = anyhow::Error> = anyhow::Result<F, E>;
pub struct AddrMangle();
+#[inline]
+pub fn try_into_v4(addr: SocketAddr) -> SocketAddr {
+ match addr {
+ SocketAddr::V6(v6) if !addr.ip().is_loopback() => {
+ if let Some(v4) = v6.ip().to_ipv4() {
+ SocketAddr::new(IpAddr::V4(v4), addr.port())
+ } else {
+ addr
+ }
+ }
+ _ => addr,
+ }
+}
+
impl AddrMangle {
pub fn encode(addr: SocketAddr) -> Vec<u8> {
+ // not work with [:1]:<port>
+ let addr = try_into_v4(addr);
match addr {
SocketAddr::V4(addr_v4) => {
let tm = (SystemTime::now()
@@ -129,22 +145,20 @@ impl AddrMangle {
}
pub fn decode(bytes: &[u8]) -> SocketAddr {
+ use std::convert::TryInto;
+
if bytes.len() > 16 {
if bytes.len() != 18 {
return Config::get_any_listen_addr(false);
}
- #[allow(invalid_value)]
- let mut tmp: [u8; 2] = unsafe { std::mem::MaybeUninit::uninit().assume_init() };
- tmp.copy_from_slice(&bytes[16..]);
+ let tmp: [u8; 2] = bytes[16..].try_into().unwrap();
let port = u16::from_le_bytes(tmp);
- #[allow(invalid_value)]
- let mut tmp: [u8; 16] = unsafe { std::mem::MaybeUninit::uninit().assume_init() };
- tmp.copy_from_slice(&bytes[..16]);
+ let tmp: [u8; 16] = bytes[..16].try_into().unwrap();
let ip = std::net::Ipv6Addr::from(tmp);
return SocketAddr::new(IpAddr::V6(ip), port);
}
let mut padded = [0u8; 16];
- padded[..bytes.len()].copy_from_slice(&bytes);
+ padded[..bytes.len()].copy_from_slice(bytes);
let number = u128::from_le_bytes(padded);
let tm = (number >> 17) & (u32::max_value() as u128);
let ip = (((number >> 49) - tm) as u32).to_le_bytes();
@@ -158,21 +172,9 @@ impl AddrMangle {
pub fn get_version_from_url(url: &str) -> String {
let n = url.chars().count();
- let a = url
- .chars()
- .rev()
- .enumerate()
- .filter(|(_, x)| x == &'-')
- .next()
- .map(|(i, _)| i);
+ let a = url.chars().rev().position(|x| x == '-');
if let Some(a) = a {
- let b = url
- .chars()
- .rev()
- .enumerate()
- .filter(|(_, x)| x == &'.')
- .next()
- .map(|(i, _)| i);
+ let b = url.chars().rev().position(|x| x == '.');
if let Some(b) = b {
if a > b {
if url
@@ -195,22 +197,30 @@ pub fn get_version_from_url(url: &str) -> String {
}
pub fn gen_version() {
+ if Ok("release".to_owned()) != std::env::var("PROFILE") {
+ return;
+ }
+ println!("cargo:rerun-if-changed=Cargo.toml");
use std::io::prelude::*;
let mut file = File::create("./src/version.rs").unwrap();
- for line in read_lines("Cargo.toml").unwrap() {
- if let Ok(line) = line {
- let ab: Vec<&str> = line.split("=").map(|x| x.trim()).collect();
- if ab.len() == 2 && ab[0] == "version" {
- file.write_all(format!("pub const VERSION: &str = {};\n", ab[1]).as_bytes())
- .ok();
- break;
- }
+ for line in read_lines("Cargo.toml").unwrap().flatten() {
+ let ab: Vec<&str> = line.split('=').map(|x| x.trim()).collect();
+ if ab.len() == 2 && ab[0] == "version" {
+ file.write_all(format!("pub const VERSION: &str = {};\n", ab[1]).as_bytes())
+ .ok();
+ break;
}
}
// generate build date
let build_date = format!("{}", chrono::Local::now().format("%Y-%m-%d %H:%M"));
- file.write_all(format!("pub const BUILD_DATE: &str = \"{}\";", build_date).as_bytes())
- .ok();
+ file.write_all(
+ format!(
+ "#[allow(dead_code)]\npub const BUILD_DATE: &str = \"{}\";",
+ build_date
+ )
+ .as_bytes(),
+ )
+ .ok();
file.sync_all().ok();
}
@@ -230,20 +240,20 @@ pub fn is_valid_custom_id(id: &str) -> bool {
pub fn get_version_number(v: &str) -> i64 {
let mut n = 0;
- for x in v.split(".") {
+ for x in v.split('.') {
n = n * 1000 + x.parse::<i64>().unwrap_or(0);
}
n
}
pub fn get_modified_time(path: &std::path::Path) -> SystemTime {
- std::fs::metadata(&path)
+ std::fs::metadata(path)
.map(|m| m.modified().unwrap_or(UNIX_EPOCH))
.unwrap_or(UNIX_EPOCH)
}
pub fn get_created_time(path: &std::path::Path) -> SystemTime {
- std::fs::metadata(&path)
+ std::fs::metadata(path)
.map(|m| m.created().unwrap_or(UNIX_EPOCH))
.unwrap_or(UNIX_EPOCH)
}
@@ -276,32 +286,6 @@ pub fn get_time() -> i64 {
.unwrap_or(0) as _
}
-#[cfg(test)]
-mod tests {
- use super::*;
- #[test]
- fn test_mangle() {
- let addr = SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(192, 168, 16, 32), 21116));
- assert_eq!(addr, AddrMangle::decode(&AddrMangle::encode(addr)));
-
- let addr = "[2001:db8::1]:8080".parse::<SocketAddr>().unwrap();
- assert_eq!(addr, AddrMangle::decode(&AddrMangle::encode(addr)));
-
- let addr = "[2001:db8:ff::1111]:80".parse::<SocketAddr>().unwrap();
- assert_eq!(addr, AddrMangle::decode(&AddrMangle::encode(addr)));
- }
-
- #[test]
- fn test_allow_err() {
- allow_err!(Err("test err") as Result<(), &str>);
- allow_err!(
- Err("test err with msg") as Result<(), &str>,
- "prompt {}",
- "failed"
- );
- }
-}
-
#[inline]
pub fn is_ipv4_str(id: &str) -> bool {
regex::Regex::new(r"^\d+\.\d+\.\d+\.\d+(:\d+)?$")
@@ -334,10 +318,32 @@ pub fn is_domain_port_str(id: &str) -> bool {
}
#[cfg(test)]
-mod test_lib {
+mod test {
use super::*;
#[test]
+ fn test_mangle() {
+ let addr = SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(192, 168, 16, 32), 21116));
+ assert_eq!(addr, AddrMangle::decode(&AddrMangle::encode(addr)));
+
+ let addr = "[2001:db8::1]:8080".parse::<SocketAddr>().unwrap();
+ assert_eq!(addr, AddrMangle::decode(&AddrMangle::encode(addr)));
+
+ let addr = "[2001:db8:ff::1111]:80".parse::<SocketAddr>().unwrap();
+ assert_eq!(addr, AddrMangle::decode(&AddrMangle::encode(addr)));
+ }
+
+ #[test]
+ fn test_allow_err() {
+ allow_err!(Err("test err") as Result<(), &str>);
+ allow_err!(
+ Err("test err with msg") as Result<(), &str>,
+ "prompt {}",
+ "failed"
+ );
+ }
+
+ #[test]
fn test_ipv6() {
assert_eq!(is_ipv6_str("1:2:3"), true);
assert_eq!(is_ipv6_str("[ab:2:3]:12"), true);
@@ -373,4 +379,20 @@ mod test_lib {
assert_eq!(is_domain_port_str("test.com:0"), true);
assert_eq!(is_domain_port_str("test.com:98989"), true);
}
+
+ #[test]
+ fn test_mangle2() {
+ let addr = "[::ffff:127.0.0.1]:8080".parse().unwrap();
+ let addr_v4 = "127.0.0.1:8080".parse().unwrap();
+ assert_eq!(AddrMangle::decode(&AddrMangle::encode(addr)), addr_v4);
+ assert_eq!(
+ AddrMangle::decode(&AddrMangle::encode("[::127.0.0.1]:8080".parse().unwrap())),
+ addr_v4
+ );
+ assert_eq!(AddrMangle::decode(&AddrMangle::encode(addr_v4)), addr_v4);
+ let addr_v6 = "[ef::fe]:8080".parse().unwrap();
+ assert_eq!(AddrMangle::decode(&AddrMangle::encode(addr_v6)), addr_v6);
+ let addr_v6 = "[::1]:8080".parse().unwrap();
+ assert_eq!(AddrMangle::decode(&AddrMangle::encode(addr_v6)), addr_v6);
+ }
}
diff --git a/libs/hbb_common/src/password_security.rs b/libs/hbb_common/src/password_security.rs
index 6029069..0b66107 100644
--- a/libs/hbb_common/src/password_security.rs
+++ b/libs/hbb_common/src/password_security.rs
@@ -104,7 +104,7 @@ pub fn decrypt_str_or_original(s: &str, current_version: &str) -> (String, bool,
if s.len() > VERSION_LEN {
let version = &s[..VERSION_LEN];
if version == "00" {
- if let Ok(v) = decrypt(&s[VERSION_LEN..].as_bytes()) {
+ if let Ok(v) = decrypt(s[VERSION_LEN..].as_bytes()) {
return (
String::from_utf8_lossy(&v).to_string(),
true,
@@ -149,7 +149,7 @@ pub fn decrypt_vec_or_original(v: &[u8], current_version: &str) -> (Vec<u8>, boo
}
fn encrypt(v: &[u8]) -> Result<String, ()> {
- if v.len() > 0 {
+ if !v.is_empty() {
symmetric_crypt(v, true).map(|v| base64::encode(v, base64::Variant::Original))
} else {
Err(())
@@ -157,7 +157,7 @@ fn encrypt(v: &[u8]) -> Result<String, ()> {
}
fn decrypt(v: &[u8]) -> Result<Vec<u8>, ()> {
- if v.len() > 0 {
+ if !v.is_empty() {
base64::decode(v, base64::Variant::Original).and_then(|v| symmetric_crypt(&v, false))
} else {
Err(())
diff --git a/libs/hbb_common/src/platform/linux.rs b/libs/hbb_common/src/platform/linux.rs
index e824163..716025d 100644
--- a/libs/hbb_common/src/platform/linux.rs
+++ b/libs/hbb_common/src/platform/linux.rs
@@ -32,7 +32,7 @@ pub fn get_display_server() -> String {
// loginctl has not given the expected output. try something else.
if let Ok(sid) = std::env::var("XDG_SESSION_ID") {
// could also execute "cat /proc/self/sessionid"
- session = sid.to_owned();
+ session = sid;
}
if session.is_empty() {
session = run_cmds("cat /proc/self/sessionid".to_owned()).unwrap_or_default();
@@ -63,7 +63,7 @@ fn get_display_server_of_session(session: &str) -> String {
if let Ok(xorg_results) = run_cmds(format!("ps -e | grep \"{}.\\\\+Xorg\"", tty))
// And check if Xorg is running on that tty
{
- if xorg_results.trim_end().to_string() != "" {
+ if xorg_results.trim_end() != "" {
// If it is, manually return "x11", otherwise return tty
return "x11".to_owned();
}
@@ -88,7 +88,7 @@ pub fn get_values_of_seat0(indices: Vec<usize>) -> Vec<String> {
if let Ok(output) = run_loginctl(None) {
for line in String::from_utf8_lossy(&output.stdout).lines() {
if line.contains("seat0") {
- if let Some(sid) = line.split_whitespace().nth(0) {
+ if let Some(sid) = line.split_whitespace().next() {
if is_active(sid) {
return indices
.into_iter()
@@ -103,7 +103,7 @@ pub fn get_values_of_seat0(indices: Vec<usize>) -> Vec<String> {
// some case, there is no seat0 https://github.com/rustdesk/rustdesk/issues/73
if let Ok(output) = run_loginctl(None) {
for line in String::from_utf8_lossy(&output.stdout).lines() {
- if let Some(sid) = line.split_whitespace().nth(0) {
+ if let Some(sid) = line.split_whitespace().next() {
let d = get_display_server_of_session(sid);
if is_active(sid) && d != "tty" {
return indices
diff --git a/libs/hbb_common/src/socket_client.rs b/libs/hbb_common/src/socket_client.rs
index 6f62163..a034b4e 100644
--- a/libs/hbb_common/src/socket_client.rs
+++ b/libs/hbb_common/src/socket_client.rs
@@ -71,7 +71,7 @@ pub trait IsResolvedSocketAddr {
impl IsResolvedSocketAddr for SocketAddr {
fn resolve(&self) -> Option<&SocketAddr> {
- Some(&self)
+ Some(self)
}
}
@@ -120,12 +120,12 @@ pub async fn connect_tcp_local<
if let Some(target) = target.resolve() {
if let Some(local) = local {
if local.is_ipv6() && target.is_ipv4() {
- let target = query_nip_io(&target).await?;
- return Ok(FramedStream::new(target, Some(local), ms_timeout).await?);
+ let target = query_nip_io(target).await?;
+ return FramedStream::new(target, Some(local), ms_timeout).await;
}
}
}
- Ok(FramedStream::new(target, local, ms_timeout).await?)
+ FramedStream::new(target, local, ms_timeout).await
}
#[inline]
@@ -140,15 +140,14 @@ pub fn is_ipv4(target: &TargetAddr<'_>) -> bool {
pub async fn query_nip_io(addr: &SocketAddr) -> ResultType<SocketAddr> {
tokio::net::lookup_host(format!("{}.nip.io:{}", addr.ip(), addr.port()))
.await?
- .filter(|x| x.is_ipv6())
- .next()
+ .find(|x| x.is_ipv6())
.context("Failed to get ipv6 from nip.io")
}
#[inline]
pub fn ipv4_to_ipv6(addr: String, ipv4: bool) -> String {
if !ipv4 && crate::is_ipv4_str(&addr) {
- if let Some(ip) = addr.split(":").next() {
+ if let Some(ip) = addr.split(':').next() {
return addr.replace(ip, &format!("{}.nip.io", ip));
}
}
diff --git a/libs/hbb_common/src/tcp.rs b/libs/hbb_common/src/tcp.rs
index a1322fc..a7ac4eb 100644
--- a/libs/hbb_common/src/tcp.rs
+++ b/libs/hbb_common/src/tcp.rs
@@ -1,4 +1,5 @@
use crate::{bail, bytes_codec::BytesCodec, ResultType};
+use anyhow::Context as AnyhowCtx;
use bytes::{BufMut, Bytes, BytesMut};
use futures::{SinkExt, StreamExt};
use protobuf::Message;
@@ -209,7 +210,7 @@ impl FramedStream {
if let Some(Ok(bytes)) = res.as_mut() {
key.2 += 1;
let nonce = Self::get_nonce(key.2);
- match secretbox::open(&bytes, &nonce, &key.0) {
+ match secretbox::open(bytes, &nonce, &key.0) {
Ok(res) => {
bytes.clear();
bytes.put_slice(&res);
@@ -245,16 +246,17 @@ impl FramedStream {
const DEFAULT_BACKLOG: u32 = 128;
-#[allow(clippy::never_loop)]
pub async fn new_listener<T: ToSocketAddrs>(addr: T, reuse: bool) -> ResultType<TcpListener> {
if !reuse {
Ok(TcpListener::bind(addr).await?)
} else {
- for addr in lookup_host(&addr).await? {
- let socket = new_socket(addr, true)?;
- return Ok(socket.listen(DEFAULT_BACKLOG)?);
- }
- bail!("could not resolve to any address");
+ let addr = lookup_host(&addr)
+ .await?
+ .next()
+ .context("could not resolve to any address")?;
+ new_socket(addr, true)?
+ .listen(DEFAULT_BACKLOG)
+ .map_err(anyhow::Error::msg)
}
}
diff --git a/libs/hbb_common/src/udp.rs b/libs/hbb_common/src/udp.rs
index 38121a4..bb0d071 100644
--- a/libs/hbb_common/src/udp.rs
+++ b/libs/hbb_common/src/udp.rs
@@ -1,11 +1,11 @@
-use crate::{bail, ResultType};
-use anyhow::anyhow;
+use crate::ResultType;
+use anyhow::{anyhow, Context};
use bytes::{Bytes, BytesMut};
use futures::{SinkExt, StreamExt};
use protobuf::Message;
use socket2::{Domain, Socket, Type};
use std::net::SocketAddr;
-use tokio::net::{ToSocketAddrs, UdpSocket};
+use tokio::net::{lookup_host, ToSocketAddrs, UdpSocket};
use tokio_socks::{udp::Socks5UdpFramed, IntoTargetAddr, TargetAddr, ToProxyAddrs};
use tokio_util::{codec::BytesCodec, udp::UdpFramed};
@@ -37,39 +37,31 @@ fn new_socket(addr: SocketAddr, reuse: bool, buf_size: usize) -> Result<Socket,
addr,
socket.recv_buffer_size()
);
+ if addr.is_ipv6() && addr.ip().is_unspecified() && addr.port() > 0 {
+ socket.set_only_v6(false).ok();
+ }
socket.bind(&addr.into())?;
Ok(socket)
}
impl FramedSocket {
pub async fn new<T: ToSocketAddrs>(addr: T) -> ResultType<Self> {
- let socket = UdpSocket::bind(addr).await?;
- Ok(Self::Direct(UdpFramed::new(socket, BytesCodec::new())))
- }
-
- #[allow(clippy::never_loop)]
- pub async fn new_reuse<T: std::net::ToSocketAddrs>(addr: T) -> ResultType<Self> {
- for addr in addr.to_socket_addrs()? {
- let socket = new_socket(addr, true, 0)?.into_udp_socket();
- return Ok(Self::Direct(UdpFramed::new(
- UdpSocket::from_std(socket)?,
- BytesCodec::new(),
- )));
- }
- bail!("could not resolve to any address");
+ Self::new_reuse(addr, false, 0).await
}
- pub async fn new_with_buf_size<T: std::net::ToSocketAddrs>(
+ pub async fn new_reuse<T: ToSocketAddrs>(
addr: T,
+ reuse: bool,
buf_size: usize,
) -> ResultType<Self> {
- for addr in addr.to_socket_addrs()? {
- return Ok(Self::Direct(UdpFramed::new(
- UdpSocket::from_std(new_socket(addr, false, buf_size)?.into_udp_socket())?,
- BytesCodec::new(),
- )));
- }
- bail!("could not resolve to any address");
+ let addr = lookup_host(&addr)
+ .await?
+ .next()
+ .context("could not resolve to any address")?;
+ Ok(Self::Direct(UdpFramed::new(
+ UdpSocket::from_std(new_socket(addr, reuse, buf_size)?.into_udp_socket())?,
+ BytesCodec::new(),
+ )))
}
pub async fn new_proxy<'a, 't, P: ToProxyAddrs, T: ToSocketAddrs>(
@@ -104,11 +96,12 @@ impl FramedSocket {
) -> ResultType<()> {
let addr = addr.into_target_addr()?.to_owned();
let send_data = Bytes::from(msg.write_to_bytes()?);
- let _ = match self {
- Self::Direct(f) => match addr {
- TargetAddr::Ip(addr) => f.send((send_data, addr)).await?,
- _ => {}
- },
+ match self {
+ Self::Direct(f) => {
+ if let TargetAddr::Ip(addr) = addr {
+ f.send((send_data, addr)).await?
+ }
+ }
Self::ProxySocks(f) => f.send((send_data, addr)).await?,
};
Ok(())
@@ -123,11 +116,12 @@ impl FramedSocket {
) -> ResultType<()> {
let addr = addr.into_target_addr()?.to_owned();
- let _ = match self {
- Self::Direct(f) => match addr {
- TargetAddr::Ip(addr) => f.send((Bytes::from(msg), addr)).await?,
- _ => {}
- },
+ match self {
+ Self::Direct(f) => {
+ if let TargetAddr::Ip(addr) = addr {
+ f.send((Bytes::from(msg), addr)).await?
+ }
+ }
Self::ProxySocks(f) => f.send((Bytes::from(msg), addr)).await?,
};
Ok(())
@@ -165,12 +159,12 @@ impl FramedSocket {
}
}
- pub fn is_ipv4(&self) -> bool {
+ pub fn local_addr(&self) -> Option<SocketAddr> {
if let FramedSocket::Direct(x) = self {
if let Ok(v) = x.get_ref().local_addr() {
- return v.is_ipv4();
+ return Some(v);
}
}
- true
+ None
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 18:30:54 +0000