TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-11 21:27:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "all: keep UserProfiles a slice instead of a map for longer"

Browse Source 
This reverts commit e5894aba42.

Breaks macOS/iOS build. Reverting per chat with Josh; he'll fix later today.
This commit is contained in:
Brad Fitzpatrick
2020-09-29 21:39:43 -07:00
parent 90b7293b3b
commit c8f257df00
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ipn/ipnstate/ipnstate.go
View File

@@ -112,7 +112,7 @@ func (sb *StatusBuilder) SetSelfStatus(ss *PeerStatus) {
}
// AddUser adds a user profile to the status.
func (sb *StatusBuilder) AddUser(up tailcfg.UserProfile) {
func (sb *StatusBuilder) AddUser(id tailcfg.UserID, up tailcfg.UserProfile) {
sb.mu.Lock()
defer sb.mu.Unlock()
if sb.locked {
@@ -124,7 +124,7 @@ func (sb *StatusBuilder) AddUser(up tailcfg.UserProfile) {
sb.st.User = make(map[tailcfg.UserID]tailcfg.UserProfile)
}
sb.st.User[up.ID] = up
sb.st.User[id] = up
}
// AddIP adds a Tailscale IP address to the status.