PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-01-19 18:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #656 from jgillich/fix-ec

Browse source 
Fix queueProcessor running on system thread
This commit is contained in:
Fate-JH 2020-12-27 09:55:31 -05:00 committed by GitHub
parent 06b63d8d23 0c7ac8f0a9
commit 18fa6aac98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/scala/net/psforever/actors/net/MiddlewareActor.scala
View file

@ -2,7 +2,6 @@ package net.psforever.actors.net
import java.net.InetSocketAddress
import java.security.{SecureRandom, Security}
import akka.actor.Cancellable
import akka.actor.typed.{ActorRef, ActorTags, Behavior, PostStop, Signal}
import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
@ -34,6 +33,7 @@ import net.psforever.packet.game.{ChangeFireModeMessage, CharacterInfoMessage, K
import scodec.Attempt.{Failure, Successful}
import scodec.bits.{BitVector, ByteVector, HexStringSyntax}
import scodec.interop.akka.EnrichedByteVector
import javax.crypto.spec.SecretKeySpec
import net.psforever.packet.PacketCoding.CryptoCoding
import net.psforever.util.{DiffieHellman, Md5Mac}
@ -42,7 +42,7 @@ import scodec.Attempt
import scala.collection.mutable
import scala.collection.mutable.ListBuffer
import scala.concurrent.ExecutionContextExecutor
import scala.concurrent.{ExecutionContext, ExecutionContextExecutor}
import scala.concurrent.duration._
/** MiddlewareActor sits between the raw UDP socket and the "main" actors (either login or session) and handles
@ -90,6 +90,7 @@ class MiddlewareActor(
import MiddlewareActor._
implicit val ec: ExecutionContextExecutor = context.executionContext
implicit val executor: ExecutionContext = context.executionContext
private[this] val log = org.log4s.getLogger
@ -484,7 +485,7 @@ class MiddlewareActor(
log.info(s"Client indicated a packet is missing prior to slot '$slot' and subslot '$subslot'")
outSlottedMetaPackets.find(_.subslot == subslot - 1) match {
case Some(_packet) => outQueueBundled.enqueue(_packet)
case None => log.warn(s"Client requested unknown subslot '$subslot'")
case None => log.warn(s"Client requested unknown subslot '$subslot'")
}
Behaviors.same
@ -527,7 +528,7 @@ class MiddlewareActor(
def in(packet: Attempt[PlanetSidePacket]): Unit = {
packet match {
case Successful(_packet) => in(_packet)
case Failure(cause) => log.error(cause.message)
case Failure(cause) => log.error(cause.message)
}
}