Compare commits

...

2 Commits

Author SHA1 Message Date
f9c33b564f fix warning and added myactor library 2026-01-15 16:27:18 +08:00
d8c908a0b2 fix merge and add myactor 2026-01-15 16:26:17 +08:00
5 changed files with 382 additions and 277 deletions

650
Cargo.lock generated Executable file → Normal file

File diff suppressed because it is too large Load Diff

View File

@ -13,12 +13,12 @@ futures-util = "0.3.30"
local-ip-address = "0.6.1" local-ip-address = "0.6.1"
num_enum = "0.7.2" num_enum = "0.7.2"
once_cell = "1.19.0" once_cell = "1.19.0"
#openssl-sys = { version = "0.9.111", features = ["vendored"] }
prost = "0.12.6" prost = "0.12.6"
prost-build = "0.12.6" prost-build = "0.12.6"
rand = "0.8.5" rand = "0.8.5"
reqwest = { version = "0.12.24", default_features = false, features = ["json", "rustls-tls"] } reqwest = { version = "0.12.24", default_features = false, features = ["json", "rustls-tls"] }
rsa = "0.9.6" rsa = "0.9.6"
myactor = {git = "https://gitea.s5s8.com/rust/actor-rs.git"}
# sdlan-sn-rs = { git = "ssh://git@git2.asxalex.pw/sdlan-v2/sdlan-rs.git" } # sdlan-sn-rs = { git = "ssh://git@git2.asxalex.pw/sdlan-v2/sdlan-rs.git" }
sdlan-sn-rs = {git = "https://gitea.s5s8.com/punchnet/sdlan-rs.git"} sdlan-sn-rs = {git = "https://gitea.s5s8.com/punchnet/sdlan-rs.git"}
serde = { version = "1.0.228", features = ["derive"] } serde = { version = "1.0.228", features = ["derive"] }
@ -28,6 +28,7 @@ structopt = "0.3.26"
tokio = { version = "1.38.0", features = ["full"] } tokio = { version = "1.38.0", features = ["full"] }
tokio-util = "0.7.11" tokio-util = "0.7.11"
tracing = "0.1.40" tracing = "0.1.40"
myactor = { git = "https://gitea.s5s8.com/rust/actor-rs.git" }
# rolling-file = { path = "../rolling-file" } # rolling-file = { path = "../rolling-file" }
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]

View File

@ -1,6 +1,5 @@
use punchnet::get_base_dir; use punchnet::get_base_dir;
use punchnet::get_edge; use punchnet::get_edge;
use punchnet::get_my_networks;
use punchnet::mod_hostname; use punchnet::mod_hostname;
use punchnet::restore_dns; use punchnet::restore_dns;
use punchnet::run_sdlan; use punchnet::run_sdlan;
@ -9,11 +8,9 @@ use punchnet::CommandLine;
use punchnet::CommandLineInput; use punchnet::CommandLineInput;
use sdlan_sn_rs::log; use sdlan_sn_rs::log;
use sdlan_sn_rs::utils::gen_uuid_u64;
use tracing::error; use tracing::error;
use std::net::ToSocketAddrs; use std::net::ToSocketAddrs;
use std::time::Duration;
use structopt::StructOpt; use structopt::StructOpt;
#[tokio::main] #[tokio::main]

View File

@ -7,6 +7,7 @@ use tracing::{error};
#[allow(unused)] #[allow(unused)]
pub struct PidRecorder(String); pub struct PidRecorder(String);
#[allow(unused)]
impl PidRecorder { impl PidRecorder {
pub fn new(pidfile: &str) -> Self { pub fn new(pidfile: &str) -> Self {
let pid = std::process::id(); let pid = std::process::id();

View File

@ -78,7 +78,7 @@ impl Socket {
} }
} }
if tos != 0 { if tos != 0 {
if let Err(e) = udp.set_tos(tos) { if let Err(e) = udp.set_tos_v4(tos) {
error!("failed to set tos: {}", e.to_string()); error!("failed to set tos: {}", e.to_string());
} }
} }