Merged master into acceptallorigins

This commit is contained in:
Maciej Krzyżanowski 2024-06-03 20:59:26 +00:00
commit efb6a52ef6

View File

@ -679,6 +679,12 @@ func (srvCtx *Context) handleUDP(data []byte, addr net.Addr) {
return return
} }
srvCtx.initiations = slices.DeleteFunc(srvCtx.initiations,
func(i *common.Initiation) bool {
return i.AbAPunchCode == matchedInitation.AbAPunchCode ||
i.AbBPunchCode == matchedInitation.AbAPunchCode
})
err = abA.sendRequest(common.StartChatFinishRequest{ err = abA.sendRequest(common.StartChatFinishRequest{
OtherSideNickname: matchedInitation.AbBNick, OtherSideNickname: matchedInitation.AbBNick,
OtherSideAddress: matchedInitation.AbBAddress, OtherSideAddress: matchedInitation.AbBAddress,