Skip to content

Commit 777bed6

Browse files
committed
feat(client): display name instead of identity
1 parent c46b1f1 commit 777bed6

File tree

7 files changed

+13
-2
lines changed

7 files changed

+13
-2
lines changed

src/client/p2p/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const KEEPALIVE_INTERVAL: Duration = Duration::from_secs(10);
2121
const CONNECTION_TIMEOUT: Duration = Duration::from_secs(15);
2222

2323
struct PeerMeta {
24+
name: String,
2425
/// Unique identifier of the peer (e.g., client name)
2526
identity: String,
2627

@@ -60,6 +61,7 @@ struct PeerMeta {
6061

6162
#[derive(Debug)]
6263
pub struct PeerStatus {
64+
pub name: String,
6365
/// Unique identifier of the peer
6466
pub identity: String,
6567

src/client/p2p/peer.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ impl PeerHandler {
120120
peers.insert(
121121
p.identity.clone(),
122122
PeerMeta {
123+
name: p.name.clone(),
123124
identity: p.identity.clone(),
124125
private_ip: p.private_ip.clone(),
125126
ciders: p.ciders.clone(),
@@ -459,6 +460,7 @@ impl PeerHandler {
459460
let mut result: Vec<PeerStatus> = Vec::new();
460461
for peer in guard.values() {
461462
let status = PeerStatus {
463+
name: peer.name.clone(),
462464
identity: peer.identity.clone(),
463465
ipv6_addr: peer.remote_addr,
464466
ipv6_last_active: peer.last_active,

src/client/prettylog.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pub async fn get_status(relay: &RelayHandler, peer: Option<&PeerHandler>, dev: &
7070
let prefix = if is_last { "└─" } else { "├─" };
7171
let continuation = if is_last { " " } else { "│" };
7272

73-
println!(" {} Peer: {}", prefix, status.identity);
73+
println!(" {} Peer: {}", prefix, status.name);
7474

7575
// IPv6 Direct Connection
7676
let ipv6_state = match (&status.ipv6_addr, &status.ipv6_last_active) {
@@ -144,7 +144,7 @@ pub async fn get_status(relay: &RelayHandler, peer: Option<&PeerHandler>, dev: &
144144
format!("{}s ago", elapsed)
145145
};
146146

147-
println!(" {} {} {} ({})", prefix, status_icon, peer.identity, online_info);
147+
println!(" {} {} {} ({})", prefix, status_icon, peer.name, online_info);
148148
println!(" {} ├─ Private IP: {}", continuation, peer.private_ip);
149149

150150
if !peer.ciders.is_empty() {

src/codec/frame.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ pub struct HandshakeReplyFrame {
169169
/// virtual IP address, and the CIDR ranges it can route to.
170170
#[derive(Debug, Serialize, Deserialize, Clone)]
171171
pub struct PeerDetail {
172+
pub name: String,
173+
172174
/// Unique identifier of the peer
173175
pub identity: String,
174176

src/server/client_manager.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ use std::sync::RwLock;
44

55
#[derive(Debug, Clone, Deserialize, Serialize)]
66
pub struct ClientConfig {
7+
#[serde(default)]
8+
pub name: String,
79
pub cluster: String,
810
pub identity: String,
911
pub private_ip: String,

src/server/conf_agent.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ struct ConnectionUpdateRequest {
1717
/// Client config response from control plane API
1818
#[derive(Deserialize, Debug)]
1919
struct ClientConfigResponse {
20+
name: String,
2021
cluster: String, // Cluster ID as string
2122
identity: String,
2223
private_ip: String,
@@ -173,6 +174,7 @@ impl ConfAgent {
173174
let client_configs: Vec<ClientConfig> = routes
174175
.into_iter()
175176
.map(|r| ClientConfig {
177+
name: r.name,
176178
cluster: r.cluster,
177179
identity: r.identity,
178180
private_ip: r.private_ip,

src/server/server.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ impl Handler {
243243
};
244244

245245
PeerDetail {
246+
name: client.name.clone(),
246247
identity: client.identity.clone(),
247248
private_ip: client.private_ip.clone(),
248249
ciders: client.ciders.clone(),

0 commit comments

Comments
 (0)