punchnet/sdlan-lib-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix warning

Browse Source
This commit is contained in:
asxalex 2025-02-06 10:50:49 +08:00
parent 3f6da7c65e
commit 6e8f4583d6
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/node.rs
View File

@ -8,7 +8,6 @@ use std::time::Duration;
use tokio::io::AsyncReadExt; use tokio::io::AsyncReadExt;
use tokio::sync::mpsc::Sender; use tokio::sync::mpsc::Sender;
use tokio::sync::oneshot; use tokio::sync::oneshot;
use tokio::time::error::Elapsed;
use tracing::{debug, error}; use tracing::{debug, error};
use crate::pb::{ use crate::pb::{
@ -17,7 +16,7 @@ use crate::pb::{
use crate::tcp::{get_tcp_conn, NatType, PacketType, StunProbeAttr}; use crate::tcp::{get_tcp_conn, NatType, PacketType, StunProbeAttr};
use crate::utils::{PidRecorder, Socket}; use crate::utils::{PidRecorder, Socket};
use sdlan_sn_rs::peer::{is_sdlan_sock_equal, IpSubnet, V6Info}; use sdlan_sn_rs::peer::{IpSubnet, V6Info};
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
@ -573,7 +572,7 @@ impl NodeStats {
use sdlan_sn_rs::peer::SdlanSock; use sdlan_sn_rs::peer::SdlanSock;
use crate::config::{self, MULTICAST_PORT, REGISTER_INTERVAL, REGISTER_SUPER_INTERVAL}; use crate::config::{self, MULTICAST_PORT, REGISTER_SUPER_INTERVAL};
pub struct NodeConfig { pub struct NodeConfig {
// node name // node name
pub name: String, pub name: String,

10
src/network/packet.rs
View File

@ -13,7 +13,6 @@ use crate::{
utils::{send_to_sock, Socket}, utils::{send_to_sock, Socket},
}; };
use etherparse::Ethernet2Header; use etherparse::Ethernet2Header;
use num_enum::TryFromPrimitive;
use prost::Message; use prost::Message;
use sdlan_sn_rs::utils::BROADCAST_MAC; use sdlan_sn_rs::utils::BROADCAST_MAC;
use sdlan_sn_rs::{ use sdlan_sn_rs::{
@ -24,7 +23,6 @@ use sdlan_sn_rs::{
Mac, Result, SDLanError, Mac, Result, SDLanError,
}, },
}; };
use std::sync::Arc;
use tracing::{debug, error, info}; use tracing::{debug, error, info};
@ -548,7 +546,7 @@ pub async fn check_peer_registration_needed(
_v6_info: &Option<V6Info>, _v6_info: &Option<V6Info>,
peer_sock: &SdlanSock, peer_sock: &SdlanSock,
) { ) {
let mut p = eee.known_peers.peers.get(&src_mac); let p = eee.known_peers.peers.get(&src_mac);
let last_seen; let last_seen;
let now; let now;
match p { match p {
@ -601,7 +599,7 @@ async fn check_known_peer_sock_change(
if is_multi_broadcast(&mac) { if is_multi_broadcast(&mac) {
return; return;
} }
let mut delete_from_known_peers = false; let delete_from_known_peers;
let remote_nat; let remote_nat;
match eee.known_peers.peers.get_mut(&mac) { match eee.known_peers.peers.get_mut(&mac) {
Some(p) => { Some(p) => {
@ -1065,7 +1063,7 @@ fn peer_set_p2p_confirmed(eee: &Node, src_mac: Mac, sender_sock: &SdlanSock) {
} }
pub async fn check_query_peer_info(eee: &'static Node, mac: Mac) { pub async fn check_query_peer_info(eee: &'static Node, mac: Mac) {
let scan: Arc<EdgePeer>; // let scan: Arc<EdgePeer>;
let now = get_current_timestamp(); let now = get_current_timestamp();
let last_sent_query; let last_sent_query;
@ -1111,7 +1109,7 @@ pub async fn check_query_peer_info(eee: &'static Node, mac: Mac) {
*/ */
debug!("sending query for {}", mac_to_string(&mac)); debug!("sending query for {}", mac_to_string(&mac));
register_with_local_peers(eee).await; register_with_local_peers(eee).await;
send_query_peer(eee, mac).await; let _ = send_query_peer(eee, mac).await;
} }
} }