suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-16 14:47:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

make tun dependency optional (#142)

Browse Source 
* remove log crates
* remove udp/raw of smoltcp
* make tun as optional dependancy, compile for freebsd works
This commit is contained in:
Sijie.Sun
2024-06-11 09:09:32 +08:00
committed by GitHub
parent 8aa57ebc22
commit 34f832bbad
26 changed files with 310 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
easytier/src/peers/peer_conn.rs
View File

@@ -169,7 +169,7 @@ impl PeerConn {
match self.wait_handshake(&mut need_retry).await {
Ok(rsp) => return Ok(rsp),
Err(e) => {
log::warn!("wait handshake error: {:?}", e);
tracing::warn!("wait handshake error: {:?}", e);
if !need_retry {
return Err(e);
}
@@ -313,7 +313,7 @@ impl PeerConn {
tracing::warn!(?pingpong, "pingpong task exit");
if let Err(e) = close_event_sender.send(conn_id).await {
log::warn!("close event sender error: {:?}", e);
tracing::warn!("close event sender error: {:?}", e);
}
Ok(())

4
easytier/src/peers/peer_manager.rs
View File

@@ -333,7 +333,7 @@ impl PeerManager {
let foreign_client = self.foreign_network_client.clone();
let encryptor = self.encryptor.clone();
self.tasks.lock().await.spawn(async move {
log::trace!("start_peer_recv");
tracing::trace!("start_peer_recv");
while let Some(mut ret) = recv.next().await {
let Some(hdr) = ret.mut_peer_manager_header() else {
tracing::warn!(?ret, "invalid packet, skip");
@@ -572,7 +572,7 @@ impl PeerManager {
}
pub async fn send_msg_ipv4(&self, mut msg: ZCPacket, ipv4_addr: Ipv4Addr) -> Result<(), Error> {
log::trace!(
tracing::trace!(
"do send_msg in peer manager, msg: {:?}, ipv4_addr: {}",
msg,
ipv4_addr

2
easytier/src/peers/peer_map.rs
View File

@@ -83,7 +83,7 @@ impl PeerMap {
peer.send_msg(msg).await?;
}
None => {
log::error!("no peer for dst_peer_id: {}", dst_peer_id);
tracing::error!("no peer for dst_peer_id: {}", dst_peer_id);
return Err(Error::RouteError(Some(format!(
"peer map sengmsg directly no connected dst_peer_id: {}",
dst_peer_id

24
easytier/src/peers/peer_rip_route.rs
View File

@@ -258,14 +258,14 @@ impl BasicRoute {
.clone();
if ret.cost > 6 {
log::error!(
tracing::error!(
"cost too large: {}, may lost connection, remove it",
ret.cost
);
route_table.route_info.remove(&node_id);
}
log::trace!(
tracing::trace!(
"update route info, to: {:?}, gateway: {:?}, cost: {}, peer: {:?}",
node_id,
peer_id,
@@ -292,13 +292,13 @@ impl BasicRoute {
continue;
}
update(neighbor.cost + 1, &neighbor);
log::trace!("route info: {:?}", neighbor);
tracing::trace!("route info: {:?}", neighbor);
}
// add the sender peer to route info
update(1, &packet.myself);
log::trace!("my_id: {:?}, current route table: {:?}", my_id, route_table);
tracing::trace!("my_id: {:?}, current route table: {:?}", my_id, route_table);
}
async fn send_sync_peer_request(
@@ -393,13 +393,13 @@ impl BasicRoute {
match &ret {
Ok(_) => {
log::trace!("send sync peer request to peer: {}", peer);
tracing::trace!("send sync peer request to peer: {}", peer);
}
Err(Error::PeerNoConnectionError(_)) => {
log::trace!("peer {} no connection", peer);
tracing::trace!("peer {} no connection", peer);
}
Err(e) => {
log::error!(
tracing::error!(
"send sync peer request to peer: {} error: {:?}",
peer,
e
@@ -416,10 +416,10 @@ impl BasicRoute {
tokio::select! {
_ = notifier.notified() => {
log::trace!("sync peer request triggered by notifier");
tracing::trace!("sync peer request triggered by notifier");
}
_ = tokio::time::sleep(Duration::from_secs(1)) => {
log::trace!("sync peer request triggered by timeout");
tracing::trace!("sync peer request triggered by timeout");
}
}
}
@@ -454,7 +454,7 @@ impl BasicRoute {
}
for k in need_remove.iter() {
log::warn!("remove expired sync peer: {:?}", k);
tracing::warn!("remove expired sync peer: {:?}", k);
sync_peer_from_remote.remove(k);
}
@@ -565,7 +565,7 @@ impl Route for BasicRoute {
return Some(info.peer_id.clone().into());
}
None => {
log::error!("no route info for dst_peer_id: {}", dst_peer_id);
tracing::error!("no route info for dst_peer_id: {}", dst_peer_id);
return None;
}
}
@@ -612,7 +612,7 @@ impl Route for BasicRoute {
return Some(peer_id);
}
log::info!("no peer id for ipv4: {}", ipv4_addr);
tracing::info!("no peer id for ipv4: {}", ipv4_addr);
return None;
}
}

6
easytier/src/peers/peer_rpc.rs
View File

@@ -302,7 +302,7 @@ impl PeerRpcManager {
);
}
log::info!(
tracing::info!(
"[PEER RPC MGR] register service {} succeed, my_node_id {}",
service_id,
self.tspt.my_peer_id()
@@ -374,7 +374,7 @@ impl PeerRpcManager {
if info.is_req {
if !service_registry.contains_key(&info.service_id) {
log::warn!(
tracing::warn!(
"service {} not found, my_node_id: {}",
info.service_id,
tspt.my_peer_id()
@@ -407,7 +407,7 @@ impl PeerRpcManager {
tracing::error!(error = ?e, "send resp to client failed");
}
} else {
log::warn!("client resp receiver not found, info: {:?}", info);
tracing::warn!("client resp receiver not found, info: {:?}", info);
}
}
}