Skip to content

Commit 7ced5db

Browse files
authored
allow server API reference by nickname (#96)
1 parent dca56a0 commit 7ced5db

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

src/cmd/add_client.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,14 @@ func (c addClientCmdConfig) Run() {
143143
}
144144
} else {
145145
// Get leaf server info
146+
ip := net.ParseIP(c.serverAddress)
147+
if ip == nil {
148+
for idx, peer := range baseConfigE2EE.GetPeers() {
149+
if peer.GetNickname() == c.serverAddress {
150+
c.serverAddress = baseConfigE2EE.GetPeers()[idx].GetApiAddr().String()
151+
}
152+
}
153+
}
146154
leafApiAddr, err := netip.ParseAddr(c.serverAddress)
147155
check("invalid server address", err)
148156
leafApiAddrPort := netip.AddrPortFrom(leafApiAddr, uint16(ApiPort))

src/cmd/add_server.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,16 @@ func (c addServerCmdConfig) Run() {
205205
check("failed to set addresses", err)
206206
} else {
207207
// Get leaf server info
208+
ip := net.ParseIP(c.serverAddress)
209+
if ip == nil {
210+
fmt.Println("Server Nickname: "+c.serverAddress)
211+
for idx, peer := range clientConfigE2EE.GetPeers() {
212+
if peer.GetNickname() == c.serverAddress {
213+
c.serverAddress = clientConfigE2EE.GetPeers()[idx].GetApiAddr().String()
214+
}
215+
}
216+
}
217+
fmt.Println("Server API: "+c.serverAddress)
208218
leafApiAddr, err := netip.ParseAddr(c.serverAddress)
209219
check("invalid server address", err)
210220
leafApiAddrPort := netip.AddrPortFrom(leafApiAddr, uint16(ApiPort))

0 commit comments

Comments
 (0)