From d4a0ff62697db5a5dc719cc628a217da713461d7 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 28 Dec 2021 20:15:28 +0100 Subject: [PATCH] renamed SendMessageToClient to EncodeWebMessage --- serverCommunication/web.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/serverCommunication/web.go b/serverCommunication/web.go index 9367ff2..3f69f32 100644 --- a/serverCommunication/web.go +++ b/serverCommunication/web.go @@ -85,7 +85,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in connForDest := getConnForDest(dest, uuid) // get conn for mobile if connForDest != nil { // mobile is connected - raw = kraProtocol.SendMessageToClient(kraProtocol.StatusReply, cmdID, cmdNumber, args) + raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusReply, cmdID, cmdNumber, args) err = client.SendBinaryMessage(connForDest, raw) @@ -93,7 +93,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in logger.WebVoice.Warnln("write:", err) } } else { // mobile not connected - raw = kraProtocol.SendMessageToClient(kraProtocol.StatusSend, 58299, cmdNumber, "") + raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusSend, 58299, cmdNumber, "") err = client.SendBinaryMessage(conn, raw) @@ -106,7 +106,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in if status == kraProtocol.StatusGet { logger.Web.Debugln("status get reply") - raw = kraProtocol.SendMessageToClient(kraProtocol.StatusReply, cmdID, cmdNumber, resArgs) + raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusReply, cmdID, cmdNumber, resArgs) err = client.SendBinaryMessage(conn, raw) @@ -120,7 +120,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in connForDest := getConnForDest(dest, uuid) // get conn for voice if connForDest != nil { // voice connected - raw = kraProtocol.SendMessageToClient(kraProtocol.StatusSend, cmdID, cmdNumber, args) + raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusSend, cmdID, cmdNumber, args) err = client.SendBinaryMessage(connForDest, raw) @@ -128,7 +128,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in logger.WebMobile.Warnln("write:", err) } } else { // voice not connected - raw = kraProtocol.SendMessageToClient(kraProtocol.StatusSend, 5456, cmdNumber, "") + raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusSend, 5456, cmdNumber, "") err = client.SendBinaryMessage(conn, raw) @@ -140,7 +140,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in resArgs := mobileCommandHandler(cmdNumber) if status == kraProtocol.StatusGet { - raw = kraProtocol.SendMessageToClient(kraProtocol.StatusReply, cmdID, cmdNumber, resArgs) + raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusReply, cmdID, cmdNumber, resArgs) err = client.SendBinaryMessage(conn, raw) @@ -149,7 +149,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in } } } else { // err dest unknown - raw = kraProtocol.SendMessageToClient(kraProtocol.StatusErrTryAgain, cmdID, cmdNumber, "") + raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusErrTryAgain, cmdID, cmdNumber, "") err = client.SendBinaryMessage(conn, raw)