Fix serialisation

diff --git a/cmd/server/main.go b/cmd/server/main.go
index ac4cbb8ef01a515308bcfc104e82f2192f63dbb55eaa811f5c6084adc95172fe..30d387c562a833d5c69351e1cf6728c82c3a1696812ea5cc38a58032d9201d80 100644 (file)
--- 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 325f35441c63d108cffcc77c06838aa5e018f9684a1e3908ceff55af7efa7c39..1bd0b49a3ae53daeb113deaa57c974d737726a75c4018a81c0f0b9c3031ee3f8 100644 (file)
--- 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\r
 
-    $ 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 acea42bd181801efffa042169a25566f4f2aa327dfe6ab61d710038a4aae4547..c8ce0b348fb225fe16ab75d2d2faf22dde1fff245e5c46bf1ea1559044ad5172 100644 (file)
--- 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