bericyb/sshpong
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 5 Releases Wiki Activity

error fix

Browse Source
This commit is contained in:
Beric Bearnson 2024-10-24 21:39:23 -06:00
parent a8e6adfb04
commit 441a973453
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/lobby/lobby.go
View File

@ -314,10 +314,10 @@ func (l *Lobby) InitialConnectionHandler(conn net.Conn) (Client, []byte, error)
if err != nil { if err != nil {
slog.Debug("error unmarshalling name message:", "error", err.Error(), "message", msg[1:nb]) slog.Debug("error unmarshalling name message:", "error", err.Error(), "message", msg[1:nb])
msgOut, err := Marshal(ErrorData{ msgOut, merr := Marshal(ErrorData{
Message: "incorrectly formatted username in name message", Message: "incorrectly formatted username in name message",
}, Error) }, Error)
if err != nil { if merr != nil {
slog.Error("error marshalling error message for incorrectly formatted username") slog.Error("error marshalling error message for incorrectly formatted username")
} }
return Client{}, msgOut, err return Client{}, msgOut, err
@ -326,13 +326,13 @@ func (l *Lobby) InitialConnectionHandler(conn net.Conn) (Client, []byte, error)
_, ok := l.lobbyMembers.Load(n.Name) _, ok := l.lobbyMembers.Load(n.Name)
fmt.Println("past that") fmt.Println("past that")
if ok { if ok {
msg, err := Marshal(ErrorData{ msg, merr := Marshal(ErrorData{
Message: "Sorry that name is already taken, please try a different name", Message: "Sorry that name is already taken, please try a different name",
}, Error) }, Error)
if err != nil { if merr != nil {
slog.Error("error marshalling error on name already taken msg") slog.Error("error marshalling error on name already taken msg")
} }
return Client{}, msg, err return Client{}, msg, fmt.Errorf("unoriginal name :p")
} }
h, err := Marshal(ConnectData{ h, err := Marshal(ConnectData{
From: n.Name, From: n.Name,