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

gui use frontend-lib, fix memory leak (#467)

Browse Source
This commit is contained in:
Sijie.Sun
2024-11-10 23:03:40 +08:00
committed by GitHub
parent 88e6de9d7e
commit 4fc3ff8ce8
30 changed files with 868 additions and 2181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
easytier/src/launcher.rs
View File

@@ -31,7 +31,7 @@ pub struct Event {
struct EasyTierData {
events: RwLock<VecDeque<Event>>,
node_info: RwLock<MyNodeInfo>,
my_node_info: RwLock<MyNodeInfo>,
routes: RwLock<Vec<Route>>,
peers: RwLock<Vec<PeerInfo>>,
tun_fd: Arc<RwLock<Option<i32>>>,
@@ -46,7 +46,7 @@ impl Default for EasyTierData {
Self {
event_subscriber: RwLock::new(tx),
events: RwLock::new(VecDeque::new()),
node_info: RwLock::new(MyNodeInfo::default()),
my_node_info: RwLock::new(MyNodeInfo::default()),
routes: RwLock::new(Vec::new()),
peers: RwLock::new(Vec::new()),
tun_fd: Arc::new(RwLock::new(None)),
@@ -162,7 +162,7 @@ impl EasyTierLauncher {
global_ctx_c.get_flags().dev_name.clone();
let node_info = MyNodeInfo {
virtual_ipv4: global_ctx_c.get_ipv4().map(|x| x.address().into()),
virtual_ipv4: global_ctx_c.get_ipv4().map(|ip| ip.into()),
hostname: global_ctx_c.get_hostname(),
version: EASYTIER_VERSION.to_string(),
ips: Some(global_ctx_c.get_ip_collector().collect_ip_addrs().await),
@@ -180,7 +180,7 @@ impl EasyTierLauncher {
.await,
),
};
*data_c.node_info.write().unwrap() = node_info.clone();
*data_c.my_node_info.write().unwrap() = node_info.clone();
*data_c.routes.write().unwrap() = peer_mgr_c.list_routes().await;
*data_c.peers.write().unwrap() = PeerManagerRpcService::new(peer_mgr_c.clone())
.list_peers()
@@ -282,7 +282,7 @@ impl EasyTierLauncher {
}
pub fn get_node_info(&self) -> MyNodeInfo {
self.data.node_info.read().unwrap().clone()
self.data.my_node_info.read().unwrap().clone()
}
pub fn get_routes(&self) -> Vec<Route> {
@@ -352,7 +352,6 @@ impl NetworkInstance {
.iter()
.map(|e| serde_json::to_string(e).unwrap())
.collect(),
node_info: Some(launcher.get_node_info()),
routes,
peers,
peer_route_pairs,

13
easytier/src/proto/web.proto
View File

@@ -43,7 +43,7 @@ message NetworkConfig {
}
message MyNodeInfo {
common.Ipv4Addr virtual_ipv4 = 1;
common.Ipv4Inet virtual_ipv4 = 1;
string hostname = 2;
string version = 3;
peer_rpc.GetIpListResponse ips = 4;
@@ -56,12 +56,11 @@ message NetworkInstanceRunningInfo {
string dev_name = 1;
MyNodeInfo my_node_info = 2;
repeated string events = 3;
MyNodeInfo node_info = 4;
repeated cli.Route routes = 5;
repeated cli.PeerInfo peers = 6;
repeated cli.PeerRoutePair peer_route_pairs = 7;
bool running = 8;
optional string error_msg = 9;
repeated cli.Route routes = 4;
repeated cli.PeerInfo peers = 5;
repeated cli.PeerRoutePair peer_route_pairs = 6;
bool running = 7;
optional string error_msg = 8;
}
message NetworkInstanceRunningInfoMap {