From 254fd6c74a6706cc5c1b4082d1fd1a53ea10d557 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 18 Mar 2022 23:51:05 +0100 Subject: [PATCH] ack handling --- modules/structs/WebClient.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/structs/WebClient.go b/modules/structs/WebClient.go index 4a43726..c663698 100644 --- a/modules/structs/WebClient.go +++ b/modules/structs/WebClient.go @@ -133,7 +133,6 @@ func getMessageFromReceivedQueueByCmdID(receivedQueueMessages []*ReceivedQueueMe func (webClient *WebClient) RemoveMessageFromVoiceSendQueueByCmdID(cmdID int) { webClient.SendVoiceQueueMessages = removeMessageFromSendQueueByCmdID(webClient.SendVoiceQueueMessages, &webClient.sendVoiceQueueMessagesMu, cmdID) - logger.WebVoice.Warnln("RemoveMessageFromVoiceSendQueueByCmdID list", webClient.SendVoiceQueueMessages) } func (webClient *WebClient) RemoveMessageFromMobileSendQueueByCmdID(cmdID int) { @@ -157,14 +156,14 @@ func removeMessageFromSendQueueByCmdID(queueMessages []*SendQueueMessage, mutex } func (webClient *WebClient) RemoveMessageFromVoiceReceivedQueueByCmdID(cmdID int) { - removeMessageFromReceivedQueueByCmdID(webClient.ReceivedVoiceQueueMessages, &webClient.receivedVoiceQueueMessagesMu, cmdID) + webClient.ReceivedVoiceQueueMessages = removeMessageFromReceivedQueueByCmdID(webClient.ReceivedVoiceQueueMessages, &webClient.receivedVoiceQueueMessagesMu, cmdID) } func (webClient *WebClient) RemoveMessageFromMobileReceivedQueueByCmdID(cmdID int) { - removeMessageFromReceivedQueueByCmdID(webClient.ReceivedMobileQueueMessages, &webClient.receivedMobileQueueMessagesMu, cmdID) + webClient.ReceivedMobileQueueMessages = removeMessageFromReceivedQueueByCmdID(webClient.ReceivedMobileQueueMessages, &webClient.receivedMobileQueueMessagesMu, cmdID) } -func removeMessageFromReceivedQueueByCmdID(queueMessages []*ReceivedQueueMessage, mutex *sync.Mutex, cmdID int) { +func removeMessageFromReceivedQueueByCmdID(queueMessages []*ReceivedQueueMessage, mutex *sync.Mutex, cmdID int) []*ReceivedQueueMessage { mutex.Lock() defer mutex.Unlock() @@ -177,6 +176,8 @@ func removeMessageFromReceivedQueueByCmdID(queueMessages []*ReceivedQueueMessage break } } + + return queueMessages } func (webClient *WebClient) SendBinaryMessage(conn *websocket.Conn, msg []byte) error {