这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: correct mutex handling in NMEA 2000 TCP server #2

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 1 commit into from
May 5, 2025
Merged

fix: correct mutex handling in NMEA 2000 TCP server #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions pkg/network/tcp2000.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,28 +60,29 @@ func (s *TCP2000Server) Stop() error {

// SendPGN sends a NMEA 2000 message to all connected clients
func (s *TCP2000Server) SendPGN(msg pgn.Message) error {
s.Mu.RLock()
defer s.Mu.RUnlock()

frame := formatPGNMessage(msg)

var failedClients []net.Conn

// Read lock for iterating
s.Mu.RLock()
for client := range s.clients {
_, err := client.Write([]byte(frame))
if err != nil {
// Collect failed client
failedClients = append(failedClients, client)
}
}

// Remove failed clients
s.Mu.RUnlock()
s.Mu.Lock()
for _, client := range failedClients {
delete(s.clients, client)
client.Close()

// Write lock for removing failed clients
if len(failedClients) > 0 {
s.Mu.Lock()
for _, client := range failedClients {
delete(s.clients, client)
client.Close()
}
s.Mu.Unlock()
}
s.Mu.Unlock()

return nil
}

Expand Down