Compare commits
No commits in common. "f9c33b564f6b7f1092ed01874adc0e3aef81dc94" and "2fc246a1fec05bff82ce62bee87b757d79062805" have entirely different histories.
f9c33b564f
...
2fc246a1fe
644
Cargo.lock
generated
Normal file → Executable file
644
Cargo.lock
generated
Normal file → Executable file
File diff suppressed because it is too large
Load Diff
@ -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,7 +28,6 @@ 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]
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
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;
|
||||||
@ -8,9 +9,11 @@ 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]
|
||||||
|
|||||||
@ -7,7 +7,6 @@ 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();
|
||||||
|
|||||||
@ -78,7 +78,7 @@ impl Socket {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if tos != 0 {
|
if tos != 0 {
|
||||||
if let Err(e) = udp.set_tos_v4(tos) {
|
if let Err(e) = udp.set_tos(tos) {
|
||||||
error!("failed to set tos: {}", e.to_string());
|
error!("failed to set tos: {}", e.to_string());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user