From 267c9d43f4879c05f18544db91bcc051400e49ae39c9007df137a827345cbc07 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Fri, 5 Dec 2025 11:05:01 +0300 Subject: [PATCH] Revert "Fix serialisation" This reverts commit cf4a13252d4f2c46d53c5c371907fa00efde0559b8631b1ff20bcc27ea5efade. --- cmd/server/main.go | 30 +++++++++++++++++------------- doc/INSTALL | 2 +- internal/version.go | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/cmd/server/main.go b/cmd/server/main.go index 30d387c..ac4cbb8 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -218,9 +218,10 @@ 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 <- vors.ArgsEncode([]byte(vors.CmdDel), []byte{peer.sid}) + p.tx <- s } room.peersM.RUnlock() }() @@ -268,14 +269,17 @@ func newPeer(conn *net.TCPConn) { } room.peersM.RUnlock() - 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) + { + 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.RUnlock() } - room.peersM.RUnlock() seen := time.Now() go func(seen *time.Time) { @@ -311,21 +315,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 <- vors.ArgsEncode( - []byte(vors.CmdMuted), []byte{peer.sid}) + p.tx <- s } } 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 <- vors.ArgsEncode( - []byte(vors.CmdUnmuted), []byte{peer.sid}) + p.tx <- s } } room.peersM.RUnlock() @@ -334,11 +338,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 <- vors.ArgsEncode( - []byte(vors.CmdChat), []byte{peer.sid}, args[1]) + p.tx <- s } } room.peersM.RUnlock() diff --git a/doc/INSTALL b/doc/INSTALL index 1bd0b49..325f354 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.1.0 + $ version=6.0.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 c8ce0b3..acea42b 100644 --- a/internal/version.go +++ b/internal/version.go @@ -3,7 +3,7 @@ package internal import "runtime" const ( - Version = "6.1.0" + Version = "6.0.0" Warranty = `Copyright (C) 2024-2025 Sergey Matveev This program is free software: you can redistribute it and/or modify -- 2.52.0