From cf4a13252d4f2c46d53c5c371907fa00efde0559b8631b1ff20bcc27ea5efade Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Wed, 12 Nov 2025 19:43:04 +0300 Subject: [PATCH] Fix serialisation --- cmd/server/main.go | 30 +++++++++++++----------------- doc/INSTALL | 2 +- internal/version.go | 2 +- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/cmd/server/main.go b/cmd/server/main.go index ac4cbb8..30d387c 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -218,10 +218,9 @@ func newPeer(conn *net.TCPConn) { delete(room.peers, peer.sid) room.peersM.Unlock() PeersM.Unlock() - s := vors.ArgsEncode([]byte(vors.CmdDel), []byte{peer.sid}) room.peersM.RLock() for _, p := range room.peers { - p.tx <- s + p.tx <- vors.ArgsEncode([]byte(vors.CmdDel), []byte{peer.sid}) } room.peersM.RUnlock() }() @@ -269,17 +268,14 @@ func newPeer(conn *net.TCPConn) { } room.peersM.RUnlock() - { - s := vors.ArgsEncode( - []byte(vors.CmdAdd), []byte{peer.sid}, []byte(peer.name), peer.key) - room.peersM.RLock() - for _, p := range room.peers { - if p.sid != peer.sid { - p.tx <- s - } + room.peersM.RLock() + for _, p := range room.peers { + if p.sid != peer.sid { + p.tx <- vors.ArgsEncode([]byte(vors.CmdAdd), + []byte{peer.sid}, []byte(peer.name), peer.key) } - room.peersM.RUnlock() } + room.peersM.RUnlock() seen := time.Now() go func(seen *time.Time) { @@ -315,21 +311,21 @@ func newPeer(conn *net.TCPConn) { peer.tx <- vors.ArgsEncode([]byte(vors.CmdPong)) case vors.CmdMuted: peer.muted = true - s := vors.ArgsEncode([]byte(vors.CmdMuted), []byte{peer.sid}) room.peersM.RLock() for _, p := range room.peers { if p.sid != peer.sid { - p.tx <- s + p.tx <- vors.ArgsEncode( + []byte(vors.CmdMuted), []byte{peer.sid}) } } room.peersM.RUnlock() case vors.CmdUnmuted: peer.muted = false - s := vors.ArgsEncode([]byte(vors.CmdUnmuted), []byte{peer.sid}) room.peersM.RLock() for _, p := range room.peers { if p.sid != peer.sid { - p.tx <- s + p.tx <- vors.ArgsEncode( + []byte(vors.CmdUnmuted), []byte{peer.sid}) } } room.peersM.RUnlock() @@ -338,11 +334,11 @@ func newPeer(conn *net.TCPConn) { logger.Error("wrong len(args)") continue } - s := vors.ArgsEncode([]byte(vors.CmdChat), []byte{peer.sid}, args[1]) room.peersM.RLock() for _, p := range room.peers { if p.sid != peer.sid { - p.tx <- s + p.tx <- vors.ArgsEncode( + []byte(vors.CmdChat), []byte{peer.sid}, args[1]) } } room.peersM.RUnlock() diff --git a/doc/INSTALL b/doc/INSTALL index 325f354..1bd0b49 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -16,7 +16,7 @@ them with -rec and -play options to vors-client. => https://sourceforge.net/projects/sox/ SoX - $ version=6.0.0 + $ version=6.1.0 $ [fetch|wget] http://www.vors.stargrave.org/download/vors-$version.tar.zst $ [fetch|wget] http://www.vors.stargrave.org/download/vors-$version.tar.zst.sig [verify signature] diff --git a/internal/version.go b/internal/version.go index acea42b..c8ce0b3 100644 --- a/internal/version.go +++ b/internal/version.go @@ -3,7 +3,7 @@ package internal import "runtime" const ( - Version = "6.0.0" + Version = "6.1.0" Warranty = `Copyright (C) 2024-2025 Sergey Matveev This program is free software: you can redistribute it and/or modify -- 2.51.0