diff --git a/serverCommunication/web.go b/serverCommunication/web.go index f8d52c5..29d6672 100644 --- a/serverCommunication/web.go +++ b/serverCommunication/web.go @@ -69,7 +69,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in } } - if dest == DestProxy || dest == DestPlayersCurrentServer { // forwarding message to java / minecraft + if dest == kraProtocol.DestProxy || dest == kraProtocol.DestPlayersCurrentServer { // forwarding message to java / minecraft connForDest := getConnForDest(dest, uuid) raw = kraProtocol.SendMessageToJava(status, cmdID, dest, uuid, cmdNumber, args) @@ -81,7 +81,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in } } else { // web if isVoice { // message from voice - if dest == DestMobile { // forwarding message to mobile + if dest == kraProtocol.DestMobile { // forwarding message to mobile connForDest := getConnForDest(dest, uuid) // get conn for mobile if connForDest != nil { // mobile is connected @@ -101,7 +101,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in logger.WebVoice.Warnln("write:", err) } } - } else if dest == DestBackend { + } else if dest == kraProtocol.DestBackend { resArgs := voiceCommandHandler(cmdNumber, uuid) if status == kraProtocol.StatusGet { @@ -116,7 +116,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in } } } else { // message from mobile - if dest == DestVoice { // forwarding message to voice + if dest == kraProtocol.DestVoice { // forwarding message to voice connForDest := getConnForDest(dest, uuid) // get conn for voice if connForDest != nil { // voice connected @@ -136,7 +136,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in logger.WebMobile.Warnln("write:", err) } } - } else if dest == DestBackend { + } else if dest == kraProtocol.DestBackend { resArgs := mobileCommandHandler(cmdNumber) if status == kraProtocol.StatusGet { diff --git a/servers/web/socketHub.go b/servers/web/socketHub.go index cdb09af..bd49c7b 100644 --- a/servers/web/socketHub.go +++ b/servers/web/socketHub.go @@ -69,13 +69,13 @@ func RunHub() { client.MobileCmdIDs = []int{} logger.Web.Println("delete mobileConn", client) - serverCommunication.SendMessageToServer(serverCommunication.DestProxy, uuid, "1") + serverCommunication.SendMessageToServer(kraProtocol.DestProxy, uuid, "1") } else if client.VoiceConn == connection { client.VoiceConn = nil client.VoiceCmdIDs = []int{} logger.Web.Println("delete voiceConn", client) - serverCommunication.SendMessageToServer(serverCommunication.DestProxy, uuid, "2") + serverCommunication.SendMessageToServer(kraProtocol.DestProxy, uuid, "2") } logger.Web.Println("client after updating", client)