Skip to content

handling duplicate names #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 1, 2025
Merged

handling duplicate names #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
480e530
handling duplicate nicknames
ntozaks Jul 31, 2025
b515392
error checking
ntozaks Jul 31, 2025
cc25685
exiting wiretap if duplicates
ntozaks Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/cmd/add_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,21 @@ func (c addClientCmdConfig) Run() {
}
} else {
// Get leaf server info
var i int
duplicate := make(map[string]int)
ip := net.ParseIP(c.serverAddress)
if ip == nil {
for idx, peer := range baseConfigE2EE.GetPeers() {
if peer.GetNickname() == c.serverAddress {
c.serverAddress = baseConfigE2EE.GetPeers()[idx].GetApiAddr().String()
duplicate[peer.GetNickname()]++
i = idx
}
}
if duplicate[c.serverAddress] >= 2 {
check("failed to resolve API address", errors.New("there are multiple servers with the nickname "+c.serverAddress))
} else {
c.serverAddress = baseConfigE2EE.GetPeers()[i].GetApiAddr().String()
}
}
leafApiAddr, err := netip.ParseAddr(c.serverAddress)
check("invalid server address", err)
Expand Down
12 changes: 9 additions & 3 deletions src/cmd/add_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,16 +205,22 @@ func (c addServerCmdConfig) Run() {
check("failed to set addresses", err)
} else {
// Get leaf server info
var i int
duplicate := make(map[string]int)
ip := net.ParseIP(c.serverAddress)
if ip == nil {
fmt.Println("Server Nickname: "+c.serverAddress)
for idx, peer := range clientConfigE2EE.GetPeers() {
if peer.GetNickname() == c.serverAddress {
c.serverAddress = clientConfigE2EE.GetPeers()[idx].GetApiAddr().String()
duplicate[peer.GetNickname()]++
i = idx
}
}
if duplicate[c.serverAddress] >= 2 {
check("failed to resolve API address", errors.New("there are multiple servers with the nickname "+c.serverAddress))
} else {
c.serverAddress = clientConfigE2EE.GetPeers()[i].GetApiAddr().String()
}
}
fmt.Println("Server API: "+c.serverAddress)
leafApiAddr, err := netip.ParseAddr(c.serverAddress)
check("invalid server address", err)
leafApiAddrPort := netip.AddrPortFrom(leafApiAddr, uint16(ApiPort))
Expand Down
Loading